[qmapshack] 02/08: Imported Upstream version 1.6.2
Bas Couwenberg
sebastic at debian.org
Sun Jul 3 15:09:52 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository qmapshack.
commit 4fe2ba96ac28f602c0e6fd39f0f51b01ab885563
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Jul 3 15:41:23 2016 +0200
Imported Upstream version 1.6.2
---
.hg_archival.txt | 4 +
.hgsub | 1 +
.hgsubstate | 1 +
.hgtags | 43 +
CMakeLists.txt | 27 +-
CMakeLists.txt.user | 250 ---
MacOSX/bundle.sh | 84 +-
MacOSX/env-path.sh | 2 +-
changelog.txt | 27 +
msvc_64/3rdparty.txt | 8 +-
src/CMainWindow.cpp | 85 +-
src/CMainWindow.h | 3 +
src/CMakeLists.txt | 59 +-
src/canvas/CCanvas.cpp | 10 +-
src/canvas/CCanvas.h | 12 +-
src/dem/CDemList.cpp | 23 +-
src/dem/CDemList.h | 2 +
src/dem/IDemList.ui | 2 +-
src/gis/CGisListDB.cpp | 1 +
src/gis/CGisListWks.cpp | 55 +-
src/gis/CGisListWks.h | 2 +
src/gis/CGisWidget.cpp | 21 +-
src/gis/CGisWidget.h | 2 +
src/gis/IGisItem.cpp | 33 +-
src/gis/IGisItem.h | 12 +
src/gis/WptIcons.cpp | 3 +-
src/gis/db/CDBFolderSqlite.cpp | 26 +-
src/gis/db/CDBFolderSqlite.h | 3 +-
src/gis/db/IDB.cpp | 26 +-
src/gis/db/IDB.h | 2 +-
src/gis/db/IDBMysql.cpp | 3 +-
src/gis/db/IDBSqlite.cpp | 4 +-
src/gis/db/IDBSqlite.h | 2 +-
src/gis/fit/CFitProject.cpp | 2 +-
src/gis/gpx/CGpxProject.cpp | 20 +
src/gis/gpx/serialization.cpp | 2 +
src/gis/prj/CDetailsPrj.cpp | 76 +-
src/gis/prj/IGisProject.h | 1 +
src/gis/qms/serialization.cpp | 39 +-
src/gis/rte/CCreateRouteFromWpt.cpp | 10 +-
src/gis/rte/CGisItemRte.cpp | 194 +-
src/gis/rte/CGisItemRte.h | 22 +-
src/gis/rte/CScrOptRte.cpp | 8 +
src/gis/rte/CScrOptRte.h | 1 +
src/gis/rte/IScrOptRte.ui | 14 +
src/gis/rte/router/CRouterRoutino.cpp | 14 +-
src/gis/trk/CDetailsTrk.cpp | 94 +-
src/gis/trk/CDetailsTrk.h | 15 -
src/gis/trk/CGisItemTrk.cpp | 248 ++-
src/gis/trk/CGisItemTrk.h | 78 +-
src/gis/trk/CKnownExtension.cpp | 17 +
src/gis/trk/CKnownExtension.h | 41 +-
src/gis/trk/CPropertyTrk.cpp | 6 +-
src/gis/trk/CPropertyTrk.h | 8 +-
src/gis/trk/CTableTrk.cpp | 208 ++
src/gis/trk/CTableTrk.h | 64 +
src/gis/trk/IDetailsTrk.ui | 23 +-
src/gis/trk/filter/CFilterInvalid.cpp | 2 +-
src/gis/trk/filter/IFilterInvalid.ui | 2 +-
src/gis/trk/filter/filter.cpp | 23 +-
src/helpers/CElevationDialog.cpp | 13 +-
src/helpers/CPositionDialog.cpp | 14 +-
src/helpers/CWptIconDialog.cpp | 1 +
src/helpers/IWptIconDialog.ui | 2 +-
src/icons/32x32/AreaOn.png | Bin 0 -> 1907 bytes
src/icons/32x32/RouteOn.png | Bin 0 -> 1222 bytes
src/icons/32x32/SQLiteNoConn.png | Bin 0 -> 1986 bytes
src/icons/32x32/TrackOn.png | Bin 0 -> 1436 bytes
src/icons/32x32/Waypoint.png | Bin 0 -> 705 bytes
src/icons/32x32/WaypointOn.png | Bin 0 -> 1189 bytes
src/icons/48x48/AreaOn.png | Bin 0 -> 3076 bytes
src/icons/48x48/RouteOn.png | Bin 0 -> 1877 bytes
src/icons/48x48/SQLiteNoConn.png | Bin 0 -> 3352 bytes
src/icons/48x48/TrackOn.png | Bin 0 -> 2205 bytes
src/icons/48x48/Waypoint.png | Bin 0 -> 1089 bytes
src/icons/48x48/WaypointOn.png | Bin 0 -> 1810 bytes
src/icons/AreaOn.svg | 242 +++
src/icons/Route.svg | 12 +-
src/icons/RouteOn.svg | 116 ++
src/icons/SQLiteNoConn.svg | 187 ++
src/icons/Track.svg | 4 +-
src/icons/{Track.svg => TrackOn.svg} | 34 +-
src/icons/Waypoint.svg | 82 +
src/icons/WaypointOn.svg | 101 +
src/icons/hicolor/128x128/apps/QMapShack.png | Bin 0 -> 5461 bytes
src/icons/hicolor/16x16/apps/QMapShack.png | Bin 0 -> 868 bytes
src/icons/hicolor/192x192/apps/QMapShack.png | Bin 0 -> 8793 bytes
src/icons/hicolor/22x22/apps/QMapShack.png | Bin 0 -> 1153 bytes
src/icons/hicolor/24x24/apps/QMapShack.png | Bin 0 -> 1239 bytes
src/icons/hicolor/256x256/apps/QMapShack.png | Bin 0 -> 12480 bytes
src/icons/hicolor/32x32/apps/QMapShack.png | Bin 0 -> 1178 bytes
src/icons/hicolor/36x36/apps/QMapShack.png | Bin 0 -> 1316 bytes
src/icons/hicolor/40x40/apps/QMapShack.png | Bin 0 -> 1443 bytes
src/icons/hicolor/42x42/apps/QMapShack.png | Bin 0 -> 1530 bytes
src/icons/hicolor/48x48/apps/QMapShack.png | Bin 0 -> 1738 bytes
src/icons/hicolor/512x512/apps/QMapShack.png | Bin 0 -> 19731 bytes
src/icons/hicolor/64x64/apps/QMapShack.png | Bin 0 -> 2323 bytes
src/icons/hicolor/72x72/apps/QMapShack.png | Bin 0 -> 2709 bytes
src/icons/hicolor/80x80/apps/QMapShack.png | Bin 0 -> 3161 bytes
src/icons/hicolor/8x8/apps/QMapShack.png | Bin 0 -> 551 bytes
src/icons/hicolor/96x96/apps/QMapShack.png | Bin 0 -> 3908 bytes
src/icons/hicolor/scalable/apps/QMapShack.svg | 2117 ++++++++++++++++++++
src/locale/qmapshack.ts | 704 ++++---
src/locale/qmapshack_cs.ts | 748 ++++---
src/locale/qmapshack_de.ts | 886 ++++----
src/locale/qmapshack_es.ts | 724 ++++---
src/locale/qmapshack_fr.ts | 728 ++++---
src/locale/qmapshack_nl.ts | 728 ++++---
src/main.cpp | 3 +
src/map/CMapDraw.cpp | 11 +-
src/map/CMapIMG.cpp | 8 +-
src/map/CMapItem.cpp | 54 +-
src/map/CMapJNX.cpp | 24 +-
src/map/CMapList.cpp | 36 +-
src/map/CMapList.h | 2 +
src/map/CMapMAP.h | 6 +-
src/map/CMapPropSetup.cpp | 19 +-
src/map/CMapTMS.cpp | 17 +-
src/map/CMapTMS.h | 6 +-
src/map/CMapWMTS.h | 4 +-
src/map/IMap.cpp | 24 +-
src/map/IMap.h | 53 +-
src/map/IMapList.ui | 2 +-
src/map/OpenStreetMap.tms | 2 +-
src/map/cache/CDiskCache.cpp | 71 +-
src/map/cache/CDiskCache.h | 26 +-
src/map/cache/IDiskCache.h | 41 -
src/mouse/CMouseEditArea.cpp | 10 +-
src/mouse/CMouseEditRte.cpp | 13 +-
src/mouse/CMouseEditTrk.cpp | 13 +-
src/mouse/CMouseSelect.cpp | 23 +-
src/mouse/IScrOptSelect.ui | 14 +-
src/mouse/line/IMouseEditLine.cpp | 15 +-
src/plot/CPlotAxis.cpp | 2 +-
src/plot/IPlot.cpp | 4 +-
src/print/CPrintDialog.h | 15 +-
src/qlgt/CQmsDb.cpp | 3 +-
src/resources.qrc | 10 +
src/setup/CAppSetupMac.cpp | 8 +-
src/setup/IAppSetup.cpp | 2 +-
src/tool/CMapVrtBuilder.cpp | 2 +-
src/widgets/CTextEditWidget.cpp | 67 +-
src/widgets/CTextEditWidget.h | 8 +-
src/widgets/ITextEditWidget.ui | 48 +-
test/OSX_uitest/qmstestcase.py | 273 +++
test/OSX_uitest/suite.py | 59 +
test/OSX_uitest/testdatabase.py | 56 +
test/OSX_uitest/testmaps.py | 125 ++
test/OSX_uitest/testroute.py | 229 +++
test/OSX_uitest/testtools.py | 108 +
test/OSX_uitest/uiautomator.py | 502 +++++
test/OSX_uitest/uitest.cfg | 15 +
.../unittest/CFitProject.cpp | 18 +-
{src/test => test/unittest}/CGisItemTrk.cpp | 4 +-
{src/test => test/unittest}/CGpxProject.cpp | 5 +-
{src/test => test/unittest}/CKnownExtension.cpp | 4 +-
test/unittest/CMakeLists.txt | 90 +
{src/test => test/unittest}/CQmsProject.cpp | 4 +-
{src/test => test/unittest}/CSlfReader.cpp | 2 +-
{src/test => test/unittest}/TestHelper.cpp | 2 +-
{src/test => test/unittest}/TestHelper.h | 2 +-
test/unittest/input/fit/2015-05-07-22-03-17.fit | Bin 0 -> 54979 bytes
.../unittest/input/fit/2015-05-07-22-03-17.fit.xml | 17 +-
.../input/fit/2016-03-12_15-16-50_4_20.fit | Bin 0 -> 2846 bytes
.../input/fit/2016-03-12_15-16-50_4_20.fit.xml | 24 +
test/unittest/input/fit/Warisouderghem_course.fit | Bin 0 -> 38115 bytes
.../input/fit/Warisouderghem_course.fit.xml | 22 +
test/unittest/input/gpx/gpx_ext_GarminTPX1_cns.gpx | 117 ++
.../input/gpx/gpx_ext_GarminTPX1_cns.gpx.xml | 12 +-
.../input/gpx/gpx_ext_GarminTPX1_gpxtpx.gpx | 0
.../input/gpx/gpx_ext_GarminTPX1_gpxtpx.gpx.xml | 0
.../unittest}/input/gpx/gpx_ext_GarminTPX1_tp1.gpx | 0
.../input/gpx/gpx_ext_GarminTPX1_tp1.gpx.xml | 0
.../unittest}/input/gpx/qtt_gpx_file0.gpx | 0
.../unittest}/input/gpx/qtt_gpx_file0.gpx.xml | 0
.../unittest}/input/qms/V1.6.0_file1.qms | Bin
.../unittest}/input/qms/V1.6.0_file1.qms.xml | 0
.../unittest}/input/qms/V1.6.0_file2.qms | Bin
.../unittest}/input/qms/V1.6.0_file2.qms.xml | 0
{src/test => test/unittest}/input/randomize_hr.awk | 0
.../unittest}/input/slf/qtt_slf_file0.slf | 0
.../unittest}/input/slf/qtt_slf_file0.slf.xml | 0
{src/test => test/unittest}/main.cpp | 25 +-
{src/test => test/unittest}/test_QMapShack.h | 22 +-
184 files changed, 8844 insertions(+), 3072 deletions(-)
diff --git a/.hg_archival.txt b/.hg_archival.txt
new file mode 100644
index 0000000..006d0fc
--- /dev/null
+++ b/.hg_archival.txt
@@ -0,0 +1,4 @@
+repo: 9d6ee306235c77d65d21797124dfc82760eb94e8
+node: 57b757a9dc6f723ddc144abac5aa28fa8dc8bc63
+branch: default
+tag: V 1.6.2
diff --git a/.hgsub b/.hgsub
new file mode 100644
index 0000000..e5ee4aa
--- /dev/null
+++ b/.hgsub
@@ -0,0 +1 @@
+doc = https://bitbucket.org/maproom/qmapshack/wiki
diff --git a/.hgsubstate b/.hgsubstate
new file mode 100644
index 0000000..3a64800
--- /dev/null
+++ b/.hgsubstate
@@ -0,0 +1 @@
+cb65ea843244179121ad43e6425ff8e2a3df37d8 doc
diff --git a/.hgtags b/.hgtags
new file mode 100644
index 0000000..882db32
--- /dev/null
+++ b/.hgtags
@@ -0,0 +1,43 @@
+fa1c3f1052c60c9dbb9257dafe64ddc260703401 V 0.1.0
+fa1c3f1052c60c9dbb9257dafe64ddc260703401 V 0.1.0
+0000000000000000000000000000000000000000 V 0.1.0
+0000000000000000000000000000000000000000 V 0.1.0
+b64cf4a6f83e022ff9f3561b1b2032328f778b24 V 0.1.0
+b64cf4a6f83e022ff9f3561b1b2032328f778b24 V 0.1.0
+0000000000000000000000000000000000000000 V 0.1.0
+0000000000000000000000000000000000000000 V 0.1.0
+ebf85b3b5f8522e87165d418b44a2e7c89df1442 V 0.1.0
+6e2abcfd92467de2b4db3bea7c1f18948c909486 V 0.2.0
+927dda1c9e5fc1d3c5468a06953e5fe4842b66d7 V 0.3.0
+49b3237aaa24ac3100f525643b93b184d34a22ae V 0.3.0.bureaucratic
+cbe5b6e6cab489636c3cce79c16a340fb249156f V 0.3.1
+96911e8840740c208cffde0c02eb8d1e81267ab2 V 0.4.0
+c0720884e8fdba0b812a76e8620f972f302e4162 V 0.5.0
+d7d2ddcbb62525558535f27ebffb1f9a54133441 V 0.6.0
+60688b74ffb725c9c4503e61557365f83300f678 V 0.7.0
+c77136ce6df5377999c5c4fa3b8030a34e67e9a0 V 0.8.0
+ef016d14cfedfd7ef049e654b8ba51ddd0596550 V 0.8.1
+ab336ed933234bea7ae829acce0f915af0bf03a7 V 0.8.2
+4e1f334e9dae91a47fd9f49a2a4e8ed2dcc95b1a V 0.9.0
+d33adee08e776175ff1c7657e1163f11b6d059ff V 0.9.1
+8a9ec70bc5fc877d43b75dd31bb79b46de2bc60c V 0.10.0
+8550e6fbf48f54f8435b5d40e020c94d39788512 V 0.11.0
+318e645a391e4123b55772680894a44e610b8dd4 V 0.12.0
+67253be16d82f83d305656f018a590d00195b597 1.0.beta1
+6fb4d49d01a6466611f9a67dd1d4f0f8225ee2ae V 1.0.0
+35f10e8b8ec91cc43aed1b80da9e5d4babcf01d8 V 1.0.1
+f0d7b8daaad87c31dadb595655973195f0806f10 V 1.1.0
+a1e241d27fc40824902a0a9e9b0d04879074526b V 1.2.0
+793787451aca45e1e653de2877373fb90696f0cd V 1.2.1
+3d8c8c87096d3281d7c030f4fa0cb1ebf86b197c V 1.2.2
+4ac5f1de9fd99feb74ca3a2b614a53c908287d8e V 1.3.0
+228db55703a455aebdcc5fb09c6338bde9178ace V 1.3.1
+228db55703a455aebdcc5fb09c6338bde9178ace V 1.3.1
+0000000000000000000000000000000000000000 V 1.3.1
+0000000000000000000000000000000000000000 V 1.3.1
+c512c34dc24209219fd5788048a9f0c770436685 V 1.3.1
+cf9ff8fe4efbfec3ea022086b45176af045c174b V 1.4.0
+78d7dbc30ba46ced8cfdcdde0222b6959f24eaed V 1.5.0
+291d4b0a0412cab850cdad65b18db5bc92802605 V 1.5.1
+11a4c7af09d95176170970cd42106d28ec4decae V 1.6.0
+51b1b3e463277ed59ce4b576f295611d2e4329a1 V 1.6.1
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0565c54..a79d6f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ if(WIN32)
set(QT_DEV_PATH "C:\\Qt5\\5.5\\msvc2013_64" CACHE PATH "Path to directory containing Qt5 include and lib, e.g. C:\\Qt5\\5.5\\msvc2013_64")
set(GDAL_DEV_PATH "C:\\GDAL" CACHE PATH "Path to directory containing GDAL include and lib, e.g. M:\\lib\\gdal")
set(PROJ_DEV_PATH "C:\\PROJ" CACHE PATH "Path to directory containing PROJ.4 include and lib, e.g. M:\\lib\\PROJ")
-set(ROUTINO_DEV_PATH "C:\\temp\\routino" CACHE PATH "Path to directory containing zlib include and lib, e.g. M:\\lib\\zlib")
+set(ROUTINO_DEV_PATH "C:\\routino" CACHE PATH "Path to directory containing routino include and lib, e.g. M:\\lib\\routino")
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_DEV_PATH})
endif(WIN32)
@@ -25,7 +25,7 @@ set(APPLICATION_NAME qmapshack)
set(APPLICATION_VERSION_MAJOR "1")
set(APPLICATION_VERSION_MINOR "6")
-set(APPLICATION_VERSION_PATCH "1")
+set(APPLICATION_VERSION_PATCH "2")
add_definitions(-DVER_MAJOR=${APPLICATION_VERSION_MAJOR} -DVER_MINOR=${APPLICATION_VERSION_MINOR} -DVER_STEP=${APPLICATION_VERSION_PATCH} -DAPPLICATION_NAME=${PROJECT_NAME})
@@ -69,6 +69,9 @@ configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
add_subdirectory(src)
+if(UNIX AND NOT APPLE)
+ add_subdirectory(test/unittest)
+endif(UNIX AND NOT APPLE)
if (UNIX AND NOT WIN32 AND NOT APPLE)
@@ -80,24 +83,10 @@ if (UNIX AND NOT WIN32 AND NOT APPLE)
)
install(
- FILES
- src/icons/48x48/QMapShack.png
- DESTINATION
- ${ICON_INSTALL_DIR}/hicolor/48x48/apps
- )
-
- install(
- FILES
- src/icons/32x32/QMapShack.png
- DESTINATION
- ${ICON_INSTALL_DIR}/hicolor/32x32/apps
- )
-
- install(
- FILES
- src/icons/QMapShack.svg
+ DIRECTORY
+ src/icons/hicolor
DESTINATION
- ${ICON_INSTALL_DIR}/hicolor/scalable/apps
+ ${ICON_INSTALL_DIR}
)
install(
diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user
deleted file mode 100644
index 881c0a4..0000000
--- a/CMakeLists.txt.user
+++ /dev/null
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.6.0, 2016-03-24T13:27:15. -->
-<qtcreator>
- <data>
- <variable>EnvironmentId</variable>
- <value type="QByteArray">{2664d6c3-cac3-44ef-bde0-590e210eae25}</value>
- </data>
- <data>
- <variable>ProjectExplorer.Project.ActiveTarget</variable>
- <value type="int">0</value>
- </data>
- <data>
- <variable>ProjectExplorer.Project.EditorSettings</variable>
- <valuemap type="QVariantMap">
- <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
- <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
- <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
- <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
- <value type="QString" key="language">Cpp</value>
- <valuemap type="QVariantMap" key="value">
- <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
- </valuemap>
- </valuemap>
- <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
- <value type="QString" key="language">QmlJS</value>
- <valuemap type="QVariantMap" key="value">
- <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
- </valuemap>
- </valuemap>
- <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
- <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
- <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
- <value type="int" key="EditorConfiguration.IndentSize">4</value>
- <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
- <value type="int" key="EditorConfiguration.MarginColumn">80</value>
- <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
- <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
- <value type="int" key="EditorConfiguration.PaddingMode">1</value>
- <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
- <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
- <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
- <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
- <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
- <value type="int" key="EditorConfiguration.TabSize">8</value>
- <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
- <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
- <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
- <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
- <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
- <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
- </valuemap>
- </data>
- <data>
- <variable>ProjectExplorer.Project.PluginSettings</variable>
- <valuemap type="QVariantMap"/>
- </data>
- <data>
- <variable>ProjectExplorer.Project.Target.0</variable>
- <valuemap type="QVariantMap">
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{021ef025-5564-47de-9a05-7e6d336dd5ab}</value>
- <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
- <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
- <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
- <value type="QString" key="CMakeProjectManager.CMakeBuildConfiguration.InitialArgument"></value>
- <value type="bool" key="CMakeProjectManager.CMakeBuildConfiguration.UseNinja">false</value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/oeichler/Code/cpp/build_QMapShack</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments">-j8</value>
- <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets"/>
- <value type="bool" key="CMakeProjectManager.MakeStep.Clean">false</value>
- <value type="QString" key="CMakeProjectManager.MakeStep.MakeCommand"></value>
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments">clean</value>
- <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets"/>
- <value type="bool" key="CMakeProjectManager.MakeStep.Clean">true</value>
- <value type="QString" key="CMakeProjectManager.MakeStep.MakeCommand"></value>
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
- <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
- <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">all</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deployment</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Lokales Deployment</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
- <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
- <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">0</value>
- <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
- <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
- <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
- <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
- <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
- <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
- <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
- <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
- <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
- <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
- <value type="int">0</value>
- <value type="int">1</value>
- <value type="int">2</value>
- <value type="int">3</value>
- <value type="int">4</value>
- <value type="int">5</value>
- <value type="int">6</value>
- <value type="int">7</value>
- <value type="int">8</value>
- <value type="int">9</value>
- <value type="int">10</value>
- <value type="int">11</value>
- <value type="int">12</value>
- <value type="int">13</value>
- <value type="int">14</value>
- </valuelist>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">qmapshack</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
- <value type="bool" key="CMakeProjectManager.CMakeRunConfiguration.UseTerminal">false</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory">/home/oeichler/Code/cpp/build_QMapShack/</value>
- <value type="int" key="PE.EnvironmentAspect.Base">2</value>
- <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmapshack</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.qmapshack</value>
- <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
- <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
- <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.1">
- <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
- <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">0</value>
- <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
- <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
- <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
- <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
- <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
- <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
- <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
- <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
- <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
- <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
- <value type="int">0</value>
- <value type="int">1</value>
- <value type="int">2</value>
- <value type="int">3</value>
- <value type="int">4</value>
- <value type="int">5</value>
- <value type="int">6</value>
- <value type="int">7</value>
- <value type="int">8</value>
- <value type="int">9</value>
- <value type="int">10</value>
- <value type="int">11</value>
- <value type="int">12</value>
- <value type="int">13</value>
- <value type="int">14</value>
- </valuelist>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">qttest</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
- <value type="bool" key="CMakeProjectManager.CMakeRunConfiguration.UseTerminal">false</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
- <value type="int" key="PE.EnvironmentAspect.Base">2</value>
- <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qttest</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.qttest</value>
- <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
- <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
- <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">2</value>
- </valuemap>
- </data>
- <data>
- <variable>ProjectExplorer.Project.TargetCount</variable>
- <value type="int">1</value>
- </data>
- <data>
- <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
- <value type="int">18</value>
- </data>
- <data>
- <variable>Version</variable>
- <value type="int">18</value>
- </data>
-</qtcreator>
diff --git a/MacOSX/bundle.sh b/MacOSX/bundle.sh
index 8583a2d..15d0aa2 100755
--- a/MacOSX/bundle.sh
+++ b/MacOSX/bundle.sh
@@ -115,8 +115,7 @@ function adjustLinkQt {
F=$1 # file
L=$2 # search condition
FREL=${F##*/}
-
- #printLinking $F
+
for P in `otool -L $F | awk '{print $1}'`
do
# replace doubel slashes
@@ -124,35 +123,29 @@ function adjustLinkQt {
PSLASH=$(echo $P | sed 's,//,/,g')
sudo install_name_tool -change $P $PSLASH $F
fi
-
- if [[ "$P" == *$L* ]]; then
- LIB=${P##*/}
- LIB=${LIB%%:}
-
- if [[ "$P" == *".framework"* ]]; then
- LIB_VERSION=Versions/5
- LIB=$LIB.framework/$LIB_VERSION/$LIB
- fi
-
+
+ LIB=${P##*/}
+ LIB=${LIB%%:}
+ PREL="@executable_path/../Frameworks/$LIB"
+
+ if [[ "$P" == *".framework"* ]]; then
+ LIB_VERSION=Versions/5
+ LIB=$LIB.framework/$LIB_VERSION/$LIB
PREL="@executable_path/../Frameworks/$LIB"
-
- if [[ "$P" == *"plugins"* ]]; then
- # subdirectory for PlugIns
- PREL=${P##*plugins/} # remove prepart
- LIB=$PREL
- PREL="@executable_path/../PlugIns/$LIB"
- fi
-
- if [[ "$LIB" == *$FREL* ]]; then
- sudo install_name_tool -id $PREL $F
- else
- sudo install_name_tool -change $P $PREL $F
- fi
-
- echo "$FREL > $P - $PREL"
+ elif [[ "$P" == *"plugins"* ]]; then
+ # subdirectory for PlugIns
+ LIB=${P##*plugins/} # remove prepart
+ PREL="@executable_path/../PlugIns/$LIB"
+ fi
+
+ if [[ "$LIB" == "$FREL" ]]; then
+ echo "$FREL >> $PREL ($P)"
+ sudo install_name_tool -id $PREL $F
+ elif [[ "$P" == *$L* ]]; then
+ echo "$FREL > $PREL ($P)"
+ sudo install_name_tool -change $P $PREL $F
fi
done
- #printLinking $F
}
@@ -169,7 +162,6 @@ function copyAdditionalLibraries {
cp -R $QT_DIR/lib/QtWebChannel.framework $BUILD_BUNDLE_FRW_DIR
# TODO remove QT Bus, is only for linux needed
cp -R $QT_DIR/lib/QtDBus.framework $BUILD_BUNDLE_FRW_DIR
-
}
function copyExternalFiles {
@@ -186,11 +178,32 @@ function copyExternalFiles {
cp $ROUTINO_LIB_XML_DIR/profiles.xml $BUILD_BUNDLE_RES_ROUTINO_DIR
cp $ROUTINO_LIB_XML_DIR/translations.xml $BUILD_BUNDLE_RES_ROUTINO_DIR
cp $ROUTINO_LIB_XML_DIR/tagging.xml $BUILD_BUNDLE_RES_ROUTINO_DIR
+}
+
+
+function adjustLinkingExtTools {
+ for F in `find $BUILD_BUNDLE_RES_BIN_DIR -type f ! \( -name "*.py" \)`
+ do
+ adjustLinkQt $F "/usr/local/opt/"
+ adjustLinkQt $F "/usr/local/Cellar/"
+ adjustLinkQt $F "/usr/local/lib/"
+ done
+}
+
+function printLinkingExtTools {
+ for F in `find $BUILD_BUNDLE_RES_BIN_DIR -type f ! \( -name "*.py" \)`
+ do
+ printLinking $F
+ done
+}
+
+
+function copyExtTools {
# at least gdalbuildvrt is used
- cp $GDAL_DIR/bin/* $BUILD_BUNDLE_RES_BIN_DIR
- cp $PROJ_DIR/bin/proj $BUILD_BUNDLE_RES_BIN_DIR
- cp $ROUTINO_LIB_LIB_DIR/planetsplitter $BUILD_BUNDLE_RES_BIN_DIR
+ cp $GDAL_DIR/bin/* $BUILD_BUNDLE_RES_BIN_DIR
+ cp $PROJ_DIR/bin/proj $BUILD_BUNDLE_RES_BIN_DIR
+ cp $ROUTINO_LIB_LIB_DIR/planetsplitter $BUILD_BUNDLE_RES_BIN_DIR
}
@@ -258,10 +271,14 @@ if [[ "$1" == "bundle" ]]; then
qtDeploy
echo "---copy libraries ------------------"
copyAdditionalLibraries
- echo "---copy external files ---------------"
+ echo "---copy external files -------------"
copyExternalFiles
echo "---adjust linking ------------------"
adjustLinking
+ echo "---external tools ------------------"
+ copyExtTools
+ adjustLinkingExtTools
+ printLinkingExtTools
echo "------------------------------------"
# chmod a+x $BUILD_BUNDLE_DIR/Contents/Frameworks/*
fi
@@ -272,7 +289,6 @@ if [[ "$1" == "info-before" ]]; then
printLinking $BUILD_RELEASE_DIR/$APP_NAME
printLinking $LIB_ROUTINO_LIB_DIR/libroutino.so
fi
-
if [[ "$1" == "archive" ]]; then
extractVersion
archiveBundle
diff --git a/MacOSX/env-path.sh b/MacOSX/env-path.sh
index e242745..3ec56e4 100644
--- a/MacOSX/env-path.sh
+++ b/MacOSX/env-path.sh
@@ -45,7 +45,7 @@ BUILD_BUNDLE_RES_QM_DIR=$BUILD_BUNDLE_RES_DIR/translations
BUILD_BUNDLE_RES_GDAL_DIR=$BUILD_BUNDLE_RES_DIR/gdal
BUILD_BUNDLE_RES_PROJ_DIR=$BUILD_BUNDLE_RES_DIR/proj
BUILD_BUNDLE_RES_ROUTINO_DIR=$BUILD_BUNDLE_RES_DIR/routino
-BUILD_BUNDLE_RES_BIN_DIR=$BUILD_BUNDLE_RES_DIR/bin
+BUILD_BUNDLE_RES_BIN_DIR=$BUILD_BUNDLE_CONTENTS_DIR/Tools
ROUTINO_LIB_LIB_DIR=$ROUTINO_LIB_DIR/lib
ROUTINO_LIB_H_DIR=$ROUTINO_LIB_DIR/include
diff --git a/changelog.txt b/changelog.txt
index f324d24..2a45f1d 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,30 @@
+V 1.6.2
+* Add support kFreeBSD ports, treat like Linux.
+* Add support for GNU/Hurd, treat like Linux.
+* Trk: Range Selection: Fix bad pointers if point 1 equals point 2
+* Trk: Derive valid/invalid flags for elevation and time
+* Trk: Change filter to remove invalid trackpoints due to flags.
+* Trk: Optimize waypoint correlation
+* Trk: Add visible and total index to trackpoint info
+* Wpt: Allow png as custom symbol
+* Rte: Add ascend/descend info to routes
+* Maps: Implement automatic removal of caches for no longer existing maps
+* Maps: VRT Builder: Set file extension in file dialog for target file
+* Improve 1st time experience for new users
+* DB: Properly handle unusable SQLite databases
+* DB: Don't close application if database can not be migrated
+* [Issue #128] Show map info on cursor while routing
+* [Issue #132] GPX file exported from QMS not accepted by Basecamp, Strava and JOSM
+* [Issue #131] Strange behaviour of filters "Change Speed" and "Hide Invalid Points" in extreme situations
+* [Issue #134] Possibility to manually edit elevation data of track points (preferably in the table of points)
+* [Issue #115] Read namespaces for known extensions from .gpx
+* [Issue #48] No http map access behind proxy
+* [Issue #30] Create Track of Route
+* [Issue #141] Additional information for WP in roadbook
+* [Issue #143] %5 3%4%5 {1 m?} is added to some data in points table
+* [Issue #144] Crash - reproduceable when viewing track profiles
+* [Issue #148] Implement "Paste Plain" for CTextEditWidget
+
V 1.6.1
* GUI improvements
* Improve render perfomance of DEM layer
diff --git a/msvc_64/3rdparty.txt b/msvc_64/3rdparty.txt
index 8be88b7..dc8a11e 100644
--- a/msvc_64/3rdparty.txt
+++ b/msvc_64/3rdparty.txt
@@ -38,4 +38,10 @@ QMS depends on the 3rd party software listed below:
7.) MinGW64, http://mingw-w64.org
The mingw64 compiler is used to compile the routino library.
This resulting library depends from mingw64 runtime libraries such as libwinpthread-1.dll, libz-1.dll
- which are also included in this installation
\ No newline at end of file
+ which are also included in this installation
+
+8.) MariaDB, https://mariadb.com/
+ For MySql/MariaDB support, the Qt mysql plugin needs libmysql.dll.
+ This DLL can be downloaded as part of the precompiled MariaDB binaries at https://downloads.mariadb.org/mariadb/+releases/
+ For the current QMS binary distribution, libmysql.dll is taken from mariadb version 10.1.11:
+ https://downloads.mariadb.org/mariadb/10.1.11/ --> mariadb-10.1.11-winx64.zip
diff --git a/src/CMainWindow.cpp b/src/CMainWindow.cpp
index 84cb090..b208e92 100644
--- a/src/CMainWindow.cpp
+++ b/src/CMainWindow.cpp
@@ -156,9 +156,10 @@ CMainWindow::CMainWindow()
connect(view, &CCanvas::sigMousePosition, this, &CMainWindow::slotMousePosition);
}
cfg.endGroup(); // Views
+ testForNoView();
actionShowScale->setChecked (cfg.value("isScaleVisible", true).toBool());
- actionShowGrid->setChecked (cfg.value("isGridVisible", false).toBool());
+ actionShowGrid->setChecked (cfg.value("isGridVisible", false).toBool());
actionPOIText->setChecked (cfg.value("POIText", true).toBool());
actionMapToolTip->setChecked (cfg.value("MapToolTip", true).toBool());
actionNightDay->setChecked (cfg.value("isNight", false).toBool());
@@ -200,6 +201,8 @@ CMainWindow::CMainWindow()
prepareMenuForMac();
loadGISData(qlOpts->arguments);
+
+ QTimer::singleShot(100, this, SLOT(slotSanityTest()));
}
void CMainWindow::prepareMenuForMac()
@@ -215,7 +218,6 @@ CMainWindow::~CMainWindow()
{
CActivityTrk::release();
- int cnt = 0;
SETTINGS;
cfg.setValue("MainWindow/state", saveState());
cfg.setValue("MainWindow/geometry", saveGeometry());
@@ -243,7 +245,7 @@ CMainWindow::~CMainWindow()
allOtherTabs << tabWidget->widget(i);
continue;
}
- cnt++;
+
// save views
cfg.beginGroup(view->objectName());
view->saveConfig(cfg);
@@ -290,8 +292,7 @@ CMainWindow::~CMainWindow()
cfg.setValue("Units/timezone/mode", tzmode);
cfg.setValue("Units/time/useShortFormat", useShortFormat);
- IUnit::coord_format_e coordFormat = IUnit::getCoordFormat();
- cfg.setValue("Units/coordFormat", coordFormat);
+ cfg.setValue("Units/coordFormat", IUnit::getCoordFormat());
}
QWidget * CMainWindow::getBestWidgetForParent()
@@ -371,11 +372,13 @@ bool CMainWindow::profileIsWindow() const
void CMainWindow::addMapList(CMapList * list, const QString &name)
{
tabMaps->addTab(list,name);
+ connect(list, &CMapList::sigSetupMapPath, this, &CMainWindow::slotSetupMapPath);
}
void CMainWindow::addDemList(CDemList * list, const QString &name)
{
tabDem->addTab(list,name);
+ connect(list, &CDemList::sigSetupDemPath, this, &CMainWindow::slotSetupDemPath);
}
void CMainWindow::addWidgetToTab(QWidget * w)
@@ -408,6 +411,17 @@ qreal CMainWindow::getElevationAt(const QPointF& pos) const
{
return canvas->getElevationAt(pos);
}
+ else
+ {
+ for(int i = 0; i < tabWidget->count(); i++)
+ {
+ canvas = dynamic_cast<CCanvas*>(tabWidget->widget(i));
+ if(canvas)
+ {
+ return canvas->getElevationAt(pos);
+ }
+ }
+ }
return NOFLOAT;
}
@@ -489,6 +503,8 @@ void CMainWindow::slotAddCanvas()
connect(canvas, &CCanvas::sigMousePosition, this, &CMainWindow::slotMousePosition);
tabWidget->setCurrentWidget(canvas);
+
+ testForNoView();
}
void CMainWindow::slotCloneCanvas()
@@ -527,6 +543,30 @@ void CMainWindow::slotCloneCanvas()
cfg.endGroup();
cfg.endGroup();
cfg.endGroup();
+
+ testForNoView();
+}
+
+void CMainWindow::testForNoView()
+{
+ if(tabWidget->count() == 0)
+ {
+ QLabel * label = new QLabel(tabWidget);
+ label->setAlignment(Qt::AlignCenter);
+ label->setWordWrap(true);
+ label->setText(tr("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>."));
+ label->setObjectName("NoViewInfo");
+ connect(label, &QLabel::linkActivated, this, &CMainWindow::slotLinkActivated);
+ tabWidget->addTab(label, "*");
+ return;
+ }
+
+ QLabel * label = tabWidget->findChild<QLabel*>("NoViewInfo");
+
+ if(label && tabWidget->count() > 1)
+ {
+ delete label;
+ }
}
void CMainWindow::slotTabCloseRequest(int i)
@@ -534,6 +574,8 @@ void CMainWindow::slotTabCloseRequest(int i)
QMutexLocker lock(&CMapItem::mutexActiveMaps);
delete tabWidget->widget(i);
+
+ testForNoView();
}
static inline bool compareNames(QString s1, QString s2)
@@ -873,9 +915,9 @@ void CMainWindow::slotLoadView()
cfg.beginGroup("Views");
cfg.beginGroup(canvas->objectName());
canvas->saveConfig(cfg);
- cfg.endGroup();
- cfg.endGroup();
- cfg.endGroup();
+ cfg.endGroup(); // objectName
+ cfg.endGroup(); // "Views"
+ cfg.endGroup(); // "Canvas"
QFileInfo fi(filename);
path = fi.absolutePath();
@@ -903,6 +945,14 @@ void CMainWindow::slotPrintMap()
}
}
+void CMainWindow::slotLinkActivated(const QString& link)
+{
+ if(link == "newview")
+ {
+ actionAddMapView->trigger();
+ }
+}
+
void CMainWindow::slotSetupWptIcons()
{
CWptIconDialog dlg(this);
@@ -1002,3 +1052,22 @@ void CMainWindow::dropEvent(QDropEvent *event)
event->acceptProposedAction();
}
+
+void CMainWindow::slotSanityTest()
+{
+ projPJ pjsrc = pj_init_plus("+init=epsg:32661");
+ if(pjsrc == nullptr)
+ {
+ QMessageBox::critical(this, tr("Fatal...")
+ ,tr("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 ditribution to fix it.")
+ ,QMessageBox::Close);
+
+ deleteLater();
+ return;
+ }
+
+ pj_free(pjsrc);
+
+
+ qDebug() << "Sanity test passed.";
+}
diff --git a/src/CMainWindow.h b/src/CMainWindow.h
index 820d992..774a505 100644
--- a/src/CMainWindow.h
+++ b/src/CMainWindow.h
@@ -125,12 +125,15 @@ private slots:
void slotCreateRoutinoDatabase();
void slotPrintMap();
void slotSetupWptIcons();
+ void slotLinkActivated(const QString& link);
+ void slotSanityTest();
private:
friend int main(int argc, char ** argv);
CMainWindow();
void loadGISData(const QStringList& filenames);
void prepareMenuForMac();
+ void testForNoView();
static CMainWindow * pSelf;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 931edb7..225f803 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,6 +26,10 @@ find_package(GDAL REQUIRED)
find_package(PROJ REQUIRED)
find_package(ROUTINO REQUIRED)
+if(${Qt5Widgets_VERSION} MATCHES "5\\.[0-2]+\\..*")
+ message( SEND_ERROR "You need at least Qt5.3 or newer.")
+endif()
+
function(cxx_add_flag_if_supported flag)
CHECK_CXX_COMPILER_FLAG(${flag} Flag:${flag})
if(Flag:${flag})
@@ -33,13 +37,8 @@ function(cxx_add_flag_if_supported flag)
endif(Flag:${flag})
endfunction(cxx_add_flag_if_supported)
-
-if(UNIX AND NOT APPLE)
-find_package(Qt5Test)
-endif(UNIX AND NOT APPLE)
-
if(UNIX)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
endif(UNIX)
if (APPLE)
@@ -113,7 +112,6 @@ set( SRCS
map/garmin/CGarminPolygon.cpp
map/garmin/CGarminTyp.cpp
map/cache/CDiskCache.cpp
- map/cache/IDiskCache.cpp
map/mapsforge/types.cpp
units/IUnit.cpp
units/CUnitImperial.cpp
@@ -205,6 +203,7 @@ set( SRCS
gis/trk/CActivityTrk.cpp
gis/trk/CPropertyTrk.cpp
gis/trk/CKnownExtension.cpp
+ gis/trk/CTableTrk.cpp
gis/trk/filter/filter.cpp
gis/trk/filter/CFilterDouglasPeuker.cpp
gis/trk/filter/CFilterInvalid.cpp
@@ -376,7 +375,6 @@ set( HDRS
map/garmin/CGarminPolygon.h
map/garmin/CGarminTyp.h
map/cache/CDiskCache.h
- map/cache/IDiskCache.h
map/mapsforge/types.h
units/IUnit.h
units/CUnitImperial.h
@@ -462,6 +460,7 @@ set( HDRS
gis/trk/CActivityTrk.h
gis/trk/CPropertyTrk.h
gis/trk/CKnownExtension.h
+ gis/trk/CTableTrk.h
gis/trk/filter/CFilterDouglasPeuker.h
gis/trk/filter/CFilterInvalid.h
gis/trk/filter/CFilterReset.h
@@ -753,50 +752,6 @@ target_link_libraries(${APPLICATION_NAME}
${ROUTINO_LIBRARIES}
)
-if(UNIX AND NOT APPLE)
- add_executable(qttest EXCLUDE_FROM_ALL
- test/main.cpp
- test/test_QMapShack.h
- test/CGpxProject.cpp
- test/CQmsProject.cpp
- test/CSlfReader.cpp
- test/CKnownExtension.cpp
- test/TestHelper.cpp
- test/CGisItemTrk.cpp
- ${RC_SRCS})
-
- # copy the input files required by the unittests to ./bin/input
- file(COPY test/input DESTINATION ../bin)
-
- target_link_libraries(qttest
- Qt5::Widgets
- Qt5::Xml
- Qt5::Script
- Qt5::Sql
- Qt5::WebKitWidgets
- Qt5::PrintSupport
- Qt5::Test
- QMS
- ${DBUS_LIB}
- ${GDAL_LIBRARIES}
- ${PROJ_LIBRARIES}
- ${ROUTINO_LIBRARIES}
- )
-
- add_custom_command(
- OUTPUT tests_run.log
- COMMAND qttest
- DEPENDS qttest
- COMMENT "Executing the Unittests"
- VERBATIM
- )
-
- add_custom_target(
- run_tests
- DEPENDS tests_run.log
- )
-endif(UNIX AND NOT APPLE)
-
if(APPLE)
target_link_libraries(${APPLICATION_NAME}
${Foundation_LIBRARY}
diff --git a/src/canvas/CCanvas.cpp b/src/canvas/CCanvas.cpp
index c4889b6..7849a2a 100644
--- a/src/canvas/CCanvas.cpp
+++ b/src/canvas/CCanvas.cpp
@@ -85,15 +85,13 @@ CCanvas::CCanvas(QWidget *parent, const QString &name)
timerToolTip->setSingleShot(true);
connect(timerToolTip, &QTimer::timeout, this, &CCanvas::slotToolTip);
- loadIndicator1 = new QMovie(this);
- loadIndicator1->setFileName("://animation/loader.gif");
+ loadIndicator1 = new QMovie("://animation/loader.gif", QByteArray(), this);
mapLoadIndicator = new QLabel(this);
mapLoadIndicator->setMovie(loadIndicator1);
loadIndicator1->start();
mapLoadIndicator->show();
- loadIndicator2 = new QMovie(this);
- loadIndicator2->setFileName("://animation/loader2.gif");
+ loadIndicator2 = new QMovie("://animation/loader2.gif", QByteArray(), this);
demLoadIndicator = new QLabel(this);
demLoadIndicator->setMovie(loadIndicator2);
loadIndicator2->start();
@@ -326,10 +324,8 @@ void CCanvas::resizeEvent(QResizeEvent * e)
setSizeTrackProfile();
}
-void CCanvas::paintEvent(QPaintEvent * e)
+void CCanvas::paintEvent(QPaintEvent*)
{
- Q_UNUSED(e);
-
if(!isVisible())
{
return;
diff --git a/src/canvas/CCanvas.h b/src/canvas/CCanvas.h
index 3ae8b68..5d32382 100644
--- a/src/canvas/CCanvas.h
+++ b/src/canvas/CCanvas.h
@@ -177,12 +177,12 @@ private:
void setDrawContextSize(const QSize& s);
void setMouseCursor(IMouse& mouse, const QString& src);
- QColor backColor; //< the background color used in case of missing map tiles
- redraw_e needsRedraw; //< set true to initiate a complete redraw of the screen content
- CMapDraw * map; //< the map object attached to this canvas
- CDemDraw * dem; //< the elevation data layer attached to this canvas
- CGisDraw * gis; //< the GIS data layer attached to this canvas
- CGrid * grid; //< the grid attached to this canvas
+ QColor backColor = "#FFFFBF"; //< the background color used in case of missing map tiles
+ redraw_e needsRedraw = eRedrawAll; //< set true to initiate a complete redraw of the screen content
+ CMapDraw * map; //< the map object attached to this canvas
+ CDemDraw * dem; //< the elevation data layer attached to this canvas
+ CGisDraw * gis; //< the GIS data layer attached to this canvas
+ CGrid * grid; //< the grid attached to this canvas
/// the current point of focus (usually the canvas center)
QPointF posFocus {12.00 * DEG_TO_RAD, 49.00 * DEG_TO_RAD};
diff --git a/src/dem/CDemList.cpp b/src/dem/CDemList.cpp
index 85c3b2b..15ee306 100644
--- a/src/dem/CDemList.cpp
+++ b/src/dem/CDemList.cpp
@@ -68,8 +68,8 @@ CDemList::CDemList(QWidget *parent)
connect(actionMoveDown, &QAction::triggered, this, &CDemList::slotMoveDown);
connect(actionActivate, &QAction::triggered, this, &CDemList::slotActivate);
connect(actionReloadDem, &QAction::triggered, this, &CDemList::slotReloadDem);
-
connect(treeWidget, &CDemTreeWidget::sigChanged, this, &CDemList::sigChanged);
+ connect(labelHelpFillMapList, &QLabel::linkActivated, this, &CDemList::slotLinkActivated);
menu = new QMenu(this);
menu->addAction(actionActivate);
@@ -112,16 +112,9 @@ void CDemList::updateHelpText()
labelHelpFillMapList->hide();
CDemItem * item = dynamic_cast<CDemItem*>(treeWidget->topLevelItem(0));
- if(item && item->isActivated())
- {
- labelIcon->hide();
- labelHelpActivateMap->hide();
- }
- else
- {
- labelIcon->show();
- labelHelpActivateMap->show();
- }
+ bool haveActive = item && item->isActivated();
+ labelIcon->setVisible(!haveActive);
+ labelHelpActivateMap->setVisible(!haveActive);
}
}
@@ -216,3 +209,11 @@ void CDemList::slotReloadDem()
{
CDemDraw::setupDemPath(CDemDraw::getDemPaths());
}
+
+void CDemList::slotLinkActivated(const QString& link)
+{
+ if(link == "setup")
+ {
+ emit sigSetupDemPath();
+ }
+}
diff --git a/src/dem/CDemList.h b/src/dem/CDemList.h
index a346827..f017d95 100644
--- a/src/dem/CDemList.h
+++ b/src/dem/CDemList.h
@@ -62,6 +62,7 @@ public:
signals:
void sigChanged();
+ void sigSetupDemPath();
private slots:
void slotActivate();
@@ -69,6 +70,7 @@ private slots:
void slotMoveDown();
void slotReloadDem();
void slotContextMenu(const QPoint &point);
+ void slotLinkActivated(const QString& link);
private:
QMenu * menu;
diff --git a/src/dem/IDemList.ui b/src/dem/IDemList.ui
index 24641ce..89023fd 100644
--- a/src/dem/IDemList.ui
+++ b/src/dem/IDemList.ui
@@ -115,7 +115,7 @@
<item>
<widget class="QLabel" name="labelHelpFillMapList">
<property name="text">
- <string>To add files with elevation data use <b>File->Setup DEM Paths</b>. </string>
+ <string>To add files with elevation data use <b>File->Setup DEM Paths</b>. Or click <a href='setup'><b>here</b></a></string>
</property>
<property name="alignment">
<set>Qt::AlignJustify|Qt::AlignVCenter</set>
diff --git a/src/gis/CGisListDB.cpp b/src/gis/CGisListDB.cpp
index 9782ded..d5f17aa 100644
--- a/src/gis/CGisListDB.cpp
+++ b/src/gis/CGisListDB.cpp
@@ -377,6 +377,7 @@ void CGisListDB::slotAddDatabase()
QString filename = dlg.getFilename();
CDBFolderSqlite *sfolder = new CDBFolderSqlite(filename, name, this);
sfolder->setToolTip(eColumnName, sfolder->getDBInfo());
+ isUsable = sfolder->isUsable();
folder = sfolder;
}
else if(dlg.isMysql())
diff --git a/src/gis/CGisListWks.cpp b/src/gis/CGisListWks.cpp
index 8a31a5c..435af43 100644
--- a/src/gis/CGisListWks.cpp
+++ b/src/gis/CGisListWks.cpp
@@ -163,6 +163,7 @@ CGisListWks::CGisListWks(QWidget *parent)
actionCalcRte = menuItemRte->addAction(QIcon("://icons/32x32/Apply.png"), tr("Calculate Route"), this, SLOT(slotCalcRte()));
actionResetRte = menuItemRte->addAction(QIcon("://icons/32x32/Reset.png"), tr("Reset Route"), this, SLOT(slotResetRte()));
actionEditRte = menuItemRte->addAction(QIcon("://icons/32x32/LineMove.png"), tr("Edit Route"), this, SLOT(slotEditRte()));
+ actionRte2Trk = menuItemRte->addAction(QIcon("://icons/32x32/Track.png"), tr("Convert to Track"),this, SLOT(slotRte2Trk()));
menuItemRte->addSeparator();
menuItemRte->addAction(actionDelete);
@@ -358,14 +359,7 @@ void CGisListWks::dragMoveEvent(QDragMoveEvent * e )
if(trk1 && trk2)
{
- if(trk1->parent() == trk2->parent())
- {
- e->setDropAction(Qt::MoveAction);
- }
- else
- {
- e->setDropAction(Qt::CopyAction);
- }
+ e->setDropAction( trk1->parent() == trk2->parent() ? Qt::MoveAction : Qt::CopyAction);
QTreeWidget::dragMoveEvent(e);
return;
}
@@ -375,14 +369,7 @@ void CGisListWks::dragMoveEvent(QDragMoveEvent * e )
if(wpt1 && wpt2)
{
- if(wpt1->parent() == wpt2->parent())
- {
- e->setDropAction(Qt::MoveAction);
- }
- else
- {
- e->setDropAction(Qt::CopyAction);
- }
+ e->setDropAction( wpt1->parent() == wpt2->parent() ? Qt::MoveAction : Qt::CopyAction);
QTreeWidget::dragMoveEvent(e);
return;
}
@@ -392,14 +379,7 @@ void CGisListWks::dragMoveEvent(QDragMoveEvent * e )
if(rte1 && rte2)
{
- if(rte1->parent() == rte2->parent())
- {
- e->setDropAction(Qt::MoveAction);
- }
- else
- {
- e->setDropAction(Qt::CopyAction);
- }
+ e->setDropAction( rte1->parent() == rte2->parent() ? Qt::MoveAction : Qt::CopyAction);
QTreeWidget::dragMoveEvent(e);
return;
}
@@ -409,14 +389,7 @@ void CGisListWks::dragMoveEvent(QDragMoveEvent * e )
if(area1 && area2)
{
- if(area1->parent() == area2->parent())
- {
- e->setDropAction(Qt::MoveAction);
- }
- else
- {
- e->setDropAction(Qt::CopyAction);
- }
+ e->setDropAction( area1->parent() == area2->parent() ? Qt::MoveAction : Qt::CopyAction);
QTreeWidget::dragMoveEvent(e);
return;
}
@@ -720,12 +693,9 @@ bool CGisListWks::hasProject(IGisProject * project)
for(int i = 0; i < topLevelItemCount(); i++)
{
IGisProject * item = dynamic_cast<IGisProject*>(topLevelItem(i));
- if(item && item->getKey() == key)
+ if(item && item->getKey() == key && item != project)
{
- if(item != project)
- {
- return true;
- }
+ return true;
}
}
return false;
@@ -1455,6 +1425,17 @@ void CGisListWks::slotEditRte()
}
}
+void CGisListWks::slotRte2Trk()
+{
+ CGisListWksEditLock lock(false, IGisItem::mutexItems);
+
+ CGisItemRte * gisItem = dynamic_cast<CGisItemRte*>(currentItem());
+ if(gisItem != nullptr)
+ {
+ CGisWidget::self().convertRouteToTrack(gisItem->getKey());
+ }
+}
+
void CGisListWks::slotEditArea()
{
CGisListWksEditLock lock(false, IGisItem::mutexItems);
diff --git a/src/gis/CGisListWks.h b/src/gis/CGisListWks.h
index 5df17b8..5fa7c60 100644
--- a/src/gis/CGisListWks.h
+++ b/src/gis/CGisListWks.h
@@ -93,6 +93,7 @@ private slots:
void slotCalcRte();
void slotResetRte();
void slotEditRte();
+ void slotRte2Trk();
void slotEditArea();
void slotAddEmptyProject();
void slotCloseAllProjects();
@@ -151,6 +152,7 @@ private:
QAction * actionCalcRte;
QAction * actionResetRte;
QAction * actionEditRte;
+ QAction * actionRte2Trk;
QAction * actionEditArea;
QAction * actionRteFromWpt;
diff --git a/src/gis/CGisWidget.cpp b/src/gis/CGisWidget.cpp
index 43a637d..1a2227c 100644
--- a/src/gis/CGisWidget.cpp
+++ b/src/gis/CGisWidget.cpp
@@ -145,14 +145,7 @@ void CGisWidget::loadGisProject(const QString& filename)
void CGisWidget::slotHelpText()
{
- if(treeDB->topLevelItemCount() == 0)
- {
- frameHelp->show();
- }
- else
- {
- frameHelp->hide();
- }
+ frameHelp->setVisible(treeDB->topLevelItemCount() == 0);
}
void CGisWidget::slotSaveAll()
@@ -635,6 +628,18 @@ void CGisWidget::focusRteByKey(bool yes, const IGisItem::key_t &key)
emit sigChanged();
}
+void CGisWidget::convertRouteToTrack(const IGisItem::key_t &key)
+{
+ QMutexLocker lock(&IGisItem::mutexItems);
+ CGisItemRte * rte = dynamic_cast<CGisItemRte*>(getItemByKey(key));
+ if(nullptr != rte)
+ {
+ rte->toTrack();
+ }
+
+ emit sigChanged();
+}
+
void CGisWidget::cutTrkByKey(const IGisItem::key_t& key)
{
QMutexLocker lock(&IGisItem::mutexItems);
diff --git a/src/gis/CGisWidget.h b/src/gis/CGisWidget.h
index 1999245..9102ebb 100644
--- a/src/gis/CGisWidget.h
+++ b/src/gis/CGisWidget.h
@@ -321,6 +321,8 @@ public:
void focusRteByKey(bool yes, const IGisItem::key_t &key);
+ void convertRouteToTrack(const IGisItem::key_t &key);
+
void cutTrkByKey(const IGisItem::key_t &key);
diff --git a/src/gis/IGisItem.cpp b/src/gis/IGisItem.cpp
index 751d169..05dd574 100644
--- a/src/gis/IGisItem.cpp
+++ b/src/gis/IGisItem.cpp
@@ -22,6 +22,7 @@
#include "device/IDevice.h"
#include "gis/CGisDraw.h"
#include "gis/CGisListWks.h"
+#include "gis/CGisWidget.h"
#include "gis/IGisItem.h"
#include "gis/db/macros.h"
#include "gis/prj/IGisProject.h"
@@ -718,14 +719,8 @@ QString IGisItem::createText(bool isReadOnly, const QString& cmt, const QString&
{
for(const link_t &link : links)
{
- if(link.text.isEmpty())
- {
- str += QString("<p><a href='%1'>%2</a></p>").arg(link.uri.toString()).arg(link.uri.toString());
- }
- else
- {
- str += QString("<p><a href='%1'>%2</a></p>").arg(link.uri.toString()).arg(link.text);
- }
+ str += QString("<p><a href='%1'>%2</a></p>").arg(link.uri.toString())
+ .arg(link.text.isEmpty() ? link.uri.toString() : link.text);
}
}
}
@@ -763,14 +758,8 @@ QString IGisItem::createText(bool isReadOnly, const QString& desc, const QList<l
{
for(const link_t &link : links)
{
- if(link.text.isEmpty())
- {
- str += QString("<p><a href='%1'>%2</a></p>").arg(link.uri.toString()).arg(link.uri.toString());
- }
- else
- {
- str += QString("<p><a href='%1'>%2</a></p>").arg(link.uri.toString()).arg(link.text);
- }
+ str += QString("<p><a href='%1'>%2</a></p>").arg(link.uri.toString())
+ .arg(link.text.isEmpty() ? link.uri.toString() : link.text);
}
}
}
@@ -836,3 +825,15 @@ bool IGisItem::isWithin(const QRectF& area, selflags_t flags, const QPolygonF& p
return false;
}
+
+bool IGisItem::getNameAndProject(QString &name, IGisProject *&project, const QString& itemtype)
+{
+ name = QInputDialog::getText(CMainWindow::getBestWidgetForParent(), tr("Edit name..."), tr("Enter new %1 name.").arg(itemtype), QLineEdit::Normal, name);
+ if(name.isEmpty())
+ {
+ return false;
+ }
+
+ project = CGisWidget::self().selectProject();
+ return nullptr != project;
+}
diff --git a/src/gis/IGisItem.h b/src/gis/IGisItem.h
index 557ba2f..0b6699c 100644
--- a/src/gis/IGisItem.h
+++ b/src/gis/IGisItem.h
@@ -489,6 +489,18 @@ public:
*/
static QString toLink(bool isReadOnly, const QString& href, const QString& str, const QString& key);
+ /**
+ @brief Unified handler to get a new item name and a pointer to the traget project
+
+ @param name a reference to a string object with the default name and to receive the name
+ @param project a reference to a IGisProject pointer. On success it will point to the project instance
+ @param itemtype a string to be used for the item type in the dialogs
+
+
+ @return Returns true on success. Otherwise false.
+ */
+ static bool getNameAndProject(QString &name, IGisProject *&project, const QString &itemtype);
+
/// a no key value that can be used to nullify references.
const static QString noKey;
diff --git a/src/gis/WptIcons.cpp b/src/gis/WptIcons.cpp
index a5a18b6..3437180 100644
--- a/src/gis/WptIcons.cpp
+++ b/src/gis/WptIcons.cpp
@@ -70,7 +70,8 @@ void initWptIcons()
SETTINGS;
QDir dirIcon(cfg.value("Paths/externalWptIcons", IAppSetup::getPlatformInstance()->userDataPath("WaypointIcons")).toString());
- QStringList filenames = dirIcon.entryList(QStringList("*.bmp"), QDir::Files);
+
+ QStringList filenames = dirIcon.entryList(QString("*.bmp *.png").split(" "), QDir::Files);
for(const QString &filename : filenames)
{
diff --git a/src/gis/db/CDBFolderSqlite.cpp b/src/gis/db/CDBFolderSqlite.cpp
index 4cceaa1..e5f8268 100644
--- a/src/gis/db/CDBFolderSqlite.cpp
+++ b/src/gis/db/CDBFolderSqlite.cpp
@@ -26,18 +26,22 @@ CDBFolderSqlite::CDBFolderSqlite(const QString& filename, const QString& name, Q
, filename(filename)
{
setToolTip(CGisListDB::eColumnName, tr("All your data grouped by folders."));
- setIcon(CGisListDB::eColumnCheckbox, QIcon("://icons/32x32/SQLite.png"));
- setText(CGisListDB::eColumnName, name);
- setupDB(filename, name);
+ setText(CGisListDB::eColumnName, name);
- setupFromDB();
+ if(setupDB(filename, name, error))
+ {
+ setupFromDB();
- setChildIndicatorPolicy(QTreeWidgetItem::ShowIndicator);
-}
+ setIcon(CGisListDB::eColumnCheckbox, QIcon("://icons/32x32/SQLite.png"));
+ setChildIndicatorPolicy(QTreeWidgetItem::ShowIndicator);
+ }
+ else
+ {
+ IDB::db.close();
-CDBFolderSqlite::~CDBFolderSqlite()
-{
+ setIcon(CGisListDB::eColumnCheckbox, QIcon("://icons/32x32/SQLiteNoConn.png"));
+ }
}
QString CDBFolderSqlite::getDBInfo() const
@@ -54,5 +58,11 @@ QString CDBFolderSqlite::getDBInfo() const
#endif
str += tr("File: ") + QString("<i>%1</i>").arg(path);
+
+ if(!isUsable())
+ {
+ str += "<br />" + tr("Error: ") + QString("<span style=\"color:#f00; font-weight:bold;\">%1</span>").arg(error);
+ }
+
return str;
}
diff --git a/src/gis/db/CDBFolderSqlite.h b/src/gis/db/CDBFolderSqlite.h
index 7b6cfc4..711b777 100644
--- a/src/gis/db/CDBFolderSqlite.h
+++ b/src/gis/db/CDBFolderSqlite.h
@@ -28,7 +28,7 @@ class CDBFolderSqlite : public IDBFolderSql, public IDBSqlite
Q_DECLARE_TR_FUNCTIONS(CDBFolderSqlite)
public:
CDBFolderSqlite(const QString &filename, const QString &name, QTreeWidget *parent);
- virtual ~CDBFolderSqlite();
+ virtual ~CDBFolderSqlite() {}
const QString& getFilename()
{
@@ -39,6 +39,7 @@ public:
private:
QString filename;
+ QString error;
};
#endif //CDBFOLDERSQLITE_H
diff --git a/src/gis/db/IDB.cpp b/src/gis/db/IDB.cpp
index 56affab..58189d4 100644
--- a/src/gis/db/IDB.cpp
+++ b/src/gis/db/IDB.cpp
@@ -44,7 +44,7 @@ void IDB::setup(const QString &connectionName)
references[connectionName]++;
}
-bool IDB::setupDB()
+bool IDB::setupDB(QString &error)
{
QSqlQuery query(db);
@@ -57,7 +57,7 @@ bool IDB::setupDB()
int version = query.value(0).toInt();
if(version < DB_VERSION)
{
- QString msg = tr("The internal database format of '%1'' has changed. QMapShack will migrate your database, now. "
+ QString msg = tr("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.").arg(db.connectionName());
int res = QMessageBox::warning(CMainWindow::self().getBestWidgetForParent(),
@@ -66,7 +66,8 @@ bool IDB::setupDB()
QMessageBox::Ok|QMessageBox::Abort);
if(res != QMessageBox::Ok)
{
- exit(0);
+ error = tr("Migration aborted by user");
+ return false;
}
if(!migrateDB(version))
@@ -77,17 +78,22 @@ bool IDB::setupDB()
msg,
QMessageBox::Abort);
+ error = tr("Migration failed");
+
return false;
}
}
else if(version > DB_VERSION)
{
- QString msg = tr("The database version of '%1'' is more advanced as the one understood by your "
+ QString msg = tr("The database version of '%1' is more advanced as the one understood by your "
"QMapShack installation. This won't work.").arg(db.connectionName());
QMessageBox::critical(CMainWindow::self().getBestWidgetForParent(),
tr("Wrong database version..."),
msg,
QMessageBox::Abort);
+
+ error = tr("Database created by newer version of QMapShack");
+
return false;
}
}
@@ -101,11 +107,13 @@ bool IDB::setupDB()
msg,
QMessageBox::Abort);
+ error = tr("Initialization failed");
+
return false;
}
}
- query.prepare( "UPDATE folders SET name=:name WHERE id=1");
+ query.prepare("UPDATE folders SET name=:name WHERE id=1");
query.bindValue(":name", db.connectionName());
QUERY_EXEC(return false);
@@ -114,21 +122,17 @@ bool IDB::setupDB()
quint64 IDB::getLastInsertID(QSqlDatabase& db, const QString& table)
{
- quint64 idChild = 0;
QSqlQuery query(db);
if(db.driverName() == "QSQLITE")
{
QUERY_RUN("SELECT last_insert_rowid() from " + table, return 0)
- query.next();
- idChild = query.value(0).toULongLong();
}
else if(db.driverName() == "QMYSQL")
{
QUERY_RUN("SELECT last_insert_id() from " + table, return 0)
- query.next();
- idChild = query.value(0).toULongLong();
}
- return idChild;
+ query.next();
+ return query.value(0).toULongLong();
}
diff --git a/src/gis/db/IDB.h b/src/gis/db/IDB.h
index 2452cbd..a0e7221 100644
--- a/src/gis/db/IDB.h
+++ b/src/gis/db/IDB.h
@@ -44,7 +44,7 @@ protected:
static QMap<QString,int> references;
QSqlDatabase db;
void setup(const QString& connectionName);
- bool setupDB();
+ bool setupDB(QString &error);
virtual bool initDB() = 0;
virtual bool migrateDB(int version) = 0;
};
diff --git a/src/gis/db/IDBMysql.cpp b/src/gis/db/IDBMysql.cpp
index 7d43e5a..974624e 100644
--- a/src/gis/db/IDBMysql.cpp
+++ b/src/gis/db/IDBMysql.cpp
@@ -73,7 +73,8 @@ bool IDBMysql::setupDB(const QString& server, const QString& port, const QString
db = QSqlDatabase::database(connectionName);
}
- return setupDB();
+ QString error;
+ return setupDB(error);
}
bool IDBMysql::initDB()
diff --git a/src/gis/db/IDBSqlite.cpp b/src/gis/db/IDBSqlite.cpp
index 05e052a..2a1b2f4 100644
--- a/src/gis/db/IDBSqlite.cpp
+++ b/src/gis/db/IDBSqlite.cpp
@@ -33,7 +33,7 @@ IDBSqlite::IDBSqlite()
}
-bool IDBSqlite::setupDB(const QString& filename, const QString& connectionName)
+bool IDBSqlite::setupDB(const QString& filename, const QString& connectionName, QString &error)
{
// this is important!
IDB::setup(connectionName);
@@ -73,7 +73,7 @@ bool IDBSqlite::setupDB(const QString& filename, const QString& connectionName)
QUERY_RUN("DROP TABLE tmp_items;", NO_CMD)
}
- return setupDB();
+ return setupDB(error);
}
bool IDBSqlite::initDB()
diff --git a/src/gis/db/IDBSqlite.h b/src/gis/db/IDBSqlite.h
index cafb189..492e257 100644
--- a/src/gis/db/IDBSqlite.h
+++ b/src/gis/db/IDBSqlite.h
@@ -29,7 +29,7 @@ public:
protected:
using IDB::setupDB;
- bool setupDB(const QString &filename, const QString &connectionName);
+ bool setupDB(const QString &filename, const QString &connectionName, QString &error);
bool initDB() override;
bool migrateDB(int version) override;
bool migrateDB1to2();
diff --git a/src/gis/fit/CFitProject.cpp b/src/gis/fit/CFitProject.cpp
index 7ab3c25..bd6e23c 100644
--- a/src/gis/fit/CFitProject.cpp
+++ b/src/gis/fit/CFitProject.cpp
@@ -39,7 +39,7 @@ CFitProject::CFitProject(const QString &filename, IDevice *parent)
: IGisProject(eTypeFit, filename, parent)
{
// this constructor is used when opening files from the garmin device.
- // this means several files are opened at the same time. For that case we don not show an error message if a file
+ // this means several files are opened at the same time. For that case we do not show an error message if a file
// can not be opened.
loadFitFromFile(filename, false);
}
diff --git a/src/gis/gpx/CGpxProject.cpp b/src/gis/gpx/CGpxProject.cpp
index 3dc866a..779c8d4 100644
--- a/src/gis/gpx/CGpxProject.cpp
+++ b/src/gis/gpx/CGpxProject.cpp
@@ -26,6 +26,7 @@
#include "gis/qms/CQmsProject.h"
#include "gis/rte/CGisItemRte.h"
#include "gis/trk/CGisItemTrk.h"
+#include "gis/trk/CKnownExtension.h"
#include "gis/wpt/CGisItemWpt.h"
#include "helpers/CSelectCopyAction.h"
#include "helpers/CSettings.h"
@@ -132,6 +133,25 @@ void CGpxProject::loadGpx(const QString &filename, CGpxProject *project)
throw tr("Not a GPX file: %1").arg(filename);
}
+ // Read all attributes and find any registrations for actually known extensions.
+ // This is used to properly detect valid .gpx files using uncommon namespaces.
+ QDomNamedNodeMap attributes = xmlGpx.attributes();
+ for(int i = 0; i < attributes.size(); ++i)
+ {
+ const QString xmlns("xmlns");
+ QDomAttr att = attributes.item(i).toAttr();
+
+ if(att.name().startsWith(xmlns + ":"))
+ {
+ QString ns = att.name().mid(xmlns.length() + 1);
+
+ if(att.value() == gpxtpx_ns)
+ {
+ CKnownExtension::initGarminTPXv1(IUnit::self(), ns);
+ }
+ }
+ }
+
const QDomElement& xmlExtension = xmlGpx.namedItem("extensions").toElement();
if(xmlExtension.namedItem("ql:key").isElement())
{
diff --git a/src/gis/gpx/serialization.cpp b/src/gis/gpx/serialization.cpp
index fba4db8..b041f6d 100644
--- a/src/gis/gpx/serialization.cpp
+++ b/src/gis/gpx/serialization.cpp
@@ -37,6 +37,7 @@ const QString IGisProject::wptx1_ns = "http://www.garmin.com/xmlschemas/Waypoin
const QString IGisProject::rmc_ns = "urn:net:trekbuddy:1.0:nmea:rmc";
const QString IGisProject::ql_ns = "http://www.qlandkarte.org/xmlschemas/v1.1";
const QString IGisProject::gs_ns = "http://www.groundspeak.com/cache/1/0";
+const QString IGisProject::tp1_ns = "http://www.garmin.com/xmlschemas/TrackPointExtension/v1";
static void readXml(const QDomNode& xml, const QString& tag, qint32& value)
@@ -448,6 +449,7 @@ QDomNode IGisProject::writeMetadata(QDomDocument& doc)
gpx.setAttribute("xmlns:wptx1", wptx1_ns);
gpx.setAttribute("xmlns:rmc", rmc_ns);
gpx.setAttribute("xmlns:ql", ql_ns);
+ gpx.setAttribute("xmlns:tp1", tp1_ns);
QString schemaLocation = QString()
+ gpx_ns + " http://www.topografix.com/GPX/1/1/gpx.xsd "
diff --git a/src/gis/prj/CDetailsPrj.cpp b/src/gis/prj/CDetailsPrj.cpp
index f2aa803..e4b5a47 100644
--- a/src/gis/prj/CDetailsPrj.cpp
+++ b/src/gis/prj/CDetailsPrj.cpp
@@ -532,9 +532,17 @@ void CDetailsPrj::drawByGroup(QTextCursor &cursor, QList<CGisItemTrk*>& trks, QL
struct wpt_info_t
{
IGisItem::key_t key;
- qreal distance;
- qreal ascend;
- qreal descend;
+ qreal distance1 = NOFLOAT;
+ qreal ascend1 = NOFLOAT;
+ qreal descend1 = NOFLOAT;
+
+ qreal distance2 = NOFLOAT;
+ qreal ascend2 = NOFLOAT;
+ qreal descend2 = NOFLOAT;
+
+ qreal distance3 = NOFLOAT;
+ qreal ascend3 = NOFLOAT;
+ qreal descend3 = NOFLOAT;
};
void CDetailsPrj::drawByTrack(QTextCursor& cursor, QList<CGisItemTrk *> &trks, QList<CGisItemWpt *> &wpts, CProgressDialog &progress, int &n, bool printable)
@@ -552,6 +560,8 @@ void CDetailsPrj::drawByTrack(QTextCursor& cursor, QList<CGisItemTrk *> &trks, Q
for(CGisItemTrk * trk : trks)
{
+ const CGisItemTrk::trkpt_t* lastTrkpt = nullptr;
+ wpt_info_t * lastWptInfo = nullptr;
QList<wpt_info_t> wptInfo;
const CGisItemTrk::trk_t& t = trk->getTrackData();
for(const CGisItemTrk::trkseg_t& seg : t.segs)
@@ -566,9 +576,23 @@ void CDetailsPrj::drawByTrack(QTextCursor& cursor, QList<CGisItemTrk *> &trks, Q
wptInfo << wpt_info_t();
wpt_info_t& info = wptInfo.last();
info.key = trkpt.keyWpt;
- info.distance = trkpt.distance;
- info.ascend = trkpt.ascend;
- info.descend = trkpt.descend;
+ info.distance1 = trkpt.distance;
+ info.ascend1 = trkpt.ascend;
+ info.descend1 = trkpt.descend;
+
+ if(lastWptInfo != nullptr)
+ {
+ lastWptInfo->distance2 = trkpt.distance - lastTrkpt->distance;
+ lastWptInfo->ascend2 = trkpt.ascend - lastTrkpt->ascend;
+ lastWptInfo->descend2 = trkpt.descend - lastTrkpt->descend;
+ }
+
+ info.distance3 = trk->getTotalDistance() - trkpt.distance;
+ info.ascend3 = trk->getTotalAscend() - trkpt.ascend;
+ info.descend3 = trk->getTotalDescend() - trkpt.descend;
+
+ lastTrkpt = &trkpt;
+ lastWptInfo = &wptInfo.last();
}
}
@@ -598,12 +622,40 @@ void CDetailsPrj::drawByTrack(QTextCursor& cursor, QList<CGisItemTrk *> &trks, Q
QTextTable * table1 = table->cellAt(cnt,eData2).lastCursorPosition().insertTable(1, 2, fmtTableInfo);
QString text, val, unit;
- IUnit::self().meter2distance(info.distance, val, unit);
- text += "<div>"+ tr("distance: %1%2").arg(val).arg(unit) + "</div>";
- IUnit::self().meter2elevation(info.ascend, val, unit);
- text += "<div>"+ tr("ascent: %1%2").arg(val).arg(unit) + "</div>";
- IUnit::self().meter2elevation(info.descend, val, unit);
- text += "<div>"+ tr("descend: %1%2").arg(val).arg(unit) + "</div>";
+ text += "<table sytle='border=1px;'>";
+ text += "<tr><td></td><td><nobr> " + tr("From Start") + " </nobr></td><td><nobr> " + tr("To Next") + " </nobr></td><td><nobr> " + tr("To End") + " </nobr></td></tr>";
+
+ text += "<tr>";
+ text += "<td>" + tr("distance: ") + "</td>";
+ IUnit::self().meter2distance(info.distance1, val, unit);
+ text += "<td>"+ QString("%1%2").arg(val).arg(unit) + "</td>";
+ IUnit::self().meter2distance(info.distance2, val, unit);
+ text += "<td>"+ QString("%1%2").arg(val).arg(unit) + "</td>";
+ IUnit::self().meter2distance(info.distance3, val, unit);
+ text += "<td>"+ QString("%1%2").arg(val).arg(unit) + "</td>";
+ text += "</tr>";
+
+ text += "<tr>";
+ text += "<td>" + tr("ascent: ") + "</td>";
+ IUnit::self().meter2elevation(info.ascend1, val, unit);
+ text += "<td>"+ QString("%1%2").arg(val).arg(unit) + "</td>";
+ IUnit::self().meter2elevation(info.ascend2, val, unit);
+ text += "<td>"+ QString("%1%2").arg(val).arg(unit) + "</td>";
+ IUnit::self().meter2elevation(info.ascend3, val, unit);
+ text += "<td>"+ QString("%1%2").arg(val).arg(unit) + "</td>";
+ text += "</tr>";
+
+ text += "<tr>";
+ text += "<td>" + tr("descend: ") + "</td>";
+ IUnit::self().meter2elevation(info.descend1, val, unit);
+ text += "<td>"+ QString("%1%2").arg(val).arg(unit) + "</td>";
+ IUnit::self().meter2elevation(info.descend2, val, unit);
+ text += "<td>"+ QString("%1%2").arg(val).arg(unit) + "</td>";
+ IUnit::self().meter2elevation(info.descend3, val, unit);
+ text += "<td>"+ QString("%1%2").arg(val).arg(unit) + "</td>";
+ text += "</tr>";
+
+ text += "</table>";
table1->cellAt(0,0).firstCursorPosition().insertHtml(text);
diff --git a/src/gis/prj/IGisProject.h b/src/gis/prj/IGisProject.h
index 4f88eb5..313865d 100644
--- a/src/gis/prj/IGisProject.h
+++ b/src/gis/prj/IGisProject.h
@@ -469,6 +469,7 @@ protected:
static const QString rmc_ns;
static const QString ql_ns;
static const QString gs_ns;
+ static const QString tp1_ns;
// Those are standard GPX/XML namespaces
static const QString gpx_ns;
static const QString xsi_ns;
diff --git a/src/gis/qms/serialization.cpp b/src/gis/qms/serialization.cpp
index 0a97e2d..b01e749 100644
--- a/src/gis/qms/serialization.cpp
+++ b/src/gis/qms/serialization.cpp
@@ -30,13 +30,13 @@
#define VER_TRK quint8(5)
#define VER_WPT quint8(2)
-#define VER_RTE quint8(2)
+#define VER_RTE quint8(3)
#define VER_AREA quint8(1)
#define VER_LINK quint8(1)
#define VER_TRKSEG quint8(1)
#define VER_TRKPT quint8(2)
#define VER_RTEPT quint8(2)
-#define VER_RTESUBPT quint8(1)
+#define VER_RTESUBPT quint8(2)
#define VER_WPT_T quint8(1)
#define VER_GC_T quint8(1)
#define VER_GCLOG_T quint8(1)
@@ -379,6 +379,7 @@ QDataStream& operator<<(QDataStream& stream, const CGisItemRte::subpt_t& pt)
stream << pt.instruction;
stream << pt.distance;
stream << pt.time;
+ stream << pt.ele;
return stream;
}
@@ -398,7 +399,16 @@ QDataStream& operator>>(QDataStream& stream, CGisItemRte::subpt_t& pt)
stream >> pt.instruction;
stream >> pt.distance;
- stream >> pt.time;
+ if(version < 2)
+ {
+ quint32 time;
+ stream >> time;
+ }
+ else
+ {
+ stream >> pt.time;
+ stream >> pt.ele;
+ }
return stream;
}
@@ -700,10 +710,15 @@ QDataStream& CGisItemRte::operator<<(QDataStream& stream)
in >> rte.pts;
if(version > 1)
{
- in >> lastRoutedWith;
- in >> lastRoutedTime;
- in >> totalDistance;
- in >> totalTime;
+ in >> rte.lastRoutedWith;
+ in >> rte.lastRoutedTime;
+ in >> rte.totalDistance;
+ in >> rte.totalTime;
+ }
+ if(version > 2)
+ {
+ in >> rte.ascend;
+ in >> rte.descend;
}
@@ -732,10 +747,12 @@ QDataStream& CGisItemRte::operator>>(QDataStream& stream) const
out << rte.number;
out << rte.type;
out << rte.pts;
- out << lastRoutedWith;
- out << lastRoutedTime;
- out << totalDistance;
- out << totalTime;
+ out << rte.lastRoutedWith;
+ out << rte.lastRoutedTime;
+ out << rte.totalDistance;
+ out << rte.totalTime;
+ out << rte.ascend;
+ out << rte.descend;
stream.writeRawData(MAGIC_RTE, MAGIC_SIZE);
stream << VER_RTE;
diff --git a/src/gis/rte/CCreateRouteFromWpt.cpp b/src/gis/rte/CCreateRouteFromWpt.cpp
index 638b78c..30929c3 100644
--- a/src/gis/rte/CCreateRouteFromWpt.cpp
+++ b/src/gis/rte/CCreateRouteFromWpt.cpp
@@ -62,14 +62,10 @@ void CCreateRouteFromWpt::accept()
{
QDialog::accept();
- QString name = QInputDialog::getText(CMainWindow::getBestWidgetForParent(), tr("Edit name..."), tr("Enter new route name."), QLineEdit::Normal, "");
- if(name.isEmpty())
- {
- return;
- }
+ QString name;
+ IGisProject *project = nullptr;
- IGisProject *project = CGisWidget::self().selectProject();
- if(nullptr == project)
+ if(!IGisItem::getNameAndProject(name, project, tr("route")))
{
return;
}
diff --git a/src/gis/rte/CGisItemRte.cpp b/src/gis/rte/CGisItemRte.cpp
index 62f7e40..01c974d 100644
--- a/src/gis/rte/CGisItemRte.cpp
+++ b/src/gis/rte/CGisItemRte.cpp
@@ -27,7 +27,9 @@
#include "gis/rte/CDetailsRte.h"
#include "gis/rte/CGisItemRte.h"
#include "gis/rte/CScrOptRte.h"
+#include "gis/trk/CGisItemTrk.h"
#include "helpers/CDraw.h"
+#include "units/IUnit.h"
#include <QtWidgets>
#include <QtXml>
@@ -175,56 +177,93 @@ bool CGisItemRte::isCalculated()
return yes;
}
+void CGisItemRte::setElevation(qreal ele, subpt_t& subpt, qreal& lastEle)
+{
+ if(ele == NOFLOAT)
+ {
+ subpt.ele = NOINT;
+ return;
+ }
+
+ subpt.ele = qRound(ele);
+
+ if(lastEle != NOFLOAT)
+ {
+ qreal delta = subpt.ele - lastEle;
+
+ if(qAbs(delta) > ASCEND_THRESHOLD)
+ {
+ if(delta > 0)
+ {
+ rte.ascend += delta;
+ }
+ else
+ {
+ rte.descend -= delta;
+ }
+ lastEle = subpt.ele;
+ }
+ }
+ else
+ {
+ lastEle = subpt.ele;
+ }
+}
+
void CGisItemRte::deriveSecondaryData()
{
+ QPolygonF pos;
+ QPolygonF ele;
qreal north = -90;
qreal east = -180;
qreal south = 90;
qreal west = 180;
- //for(const rtept_t &rtept : rte.pts)
- const int N = rte.pts.count();
-
- for(int i = 0; i < N; i++)
+ for(rtept_t &rtept : rte.pts)
{
- rtept_t &rtept = rte.pts[i];
- if(rtept.lon < west)
- {
- west = rtept.lon;
- }
- if(rtept.lon > east)
- {
- east = rtept.lon;
- }
- if(rtept.lat < south)
- {
- south = rtept.lat;
- }
- if(rtept.lat > north)
+ west = qMin(west, rtept.lon);
+ east = qMax(east, rtept.lon);
+ south = qMin(south, rtept.lat);
+ north = qMax(north, rtept.lat);
+
+ pos << (QPointF(rtept.lon, rtept.lat) * DEG_TO_RAD);
+ rtept.ele = NOINT;
+ rtept.fakeSubpt.ele = NOINT;
+
+ for(subpt_t &subpt : rtept.subpts)
{
- north = rtept.lat;
+ west = qMin(west, subpt.lon);
+ east = qMax(east, subpt.lon);
+ south = qMin(south, subpt.lat);
+ north = qMax(north, subpt.lat);
+
+ pos << (QPointF(subpt.lon, subpt.lat) * DEG_TO_RAD);
+ subpt.ele = NOINT;
}
+ rtept.updateIcon();
+ }
- for(const subpt_t &subpt : rtept.subpts)
+ ele.resize(pos.size());
+ ele.fill(NOPOINTF);
+ CMainWindow::self().getElevationAt(pos, ele);
+
+ if(!ele.isEmpty())
+ {
+ qreal lastEle = NOFLOAT;
+ int i = 0;
+ rte.descend = 0;
+ rte.ascend = 0;
+
+ for(rtept_t &rtept : rte.pts)
{
- if(subpt.lon < west)
- {
- west = subpt.lon;
- }
- if(subpt.lon > east)
- {
- east = subpt.lon;
- }
- if(subpt.lat < south)
- {
- south = subpt.lat;
- }
- if(subpt.lat > north)
+ setElevation(ele[i++].y(), rtept.fakeSubpt, lastEle);
+ rtept.ele = rtept.fakeSubpt.ele;
+
+ for(subpt_t &subpt : rtept.subpts)
{
- north = subpt.lat;
+ setElevation(ele[i++].y(), subpt, lastEle);
}
}
- rtept.updateIcon();
}
boundingRect = QRectF(QPointF(west * DEG_TO_RAD, north * DEG_TO_RAD), QPointF(east * DEG_TO_RAD,south * DEG_TO_RAD));
@@ -236,6 +275,28 @@ void CGisItemRte::edit()
dlg.exec();
}
+void CGisItemRte::toTrack()
+{
+ QString name;
+ IGisProject * project;
+
+ if(!getNameAndProject(name, project, tr("track")))
+ {
+ return;
+ }
+
+ SGisLine line;
+ getPolylineFromData(line);
+
+ CCanvas * canvas = CMainWindow::self().getVisibleCanvas();
+ if(canvas)
+ {
+ canvas->getElevationAt(line);
+ }
+
+ new CGisItemTrk(line, name, project, -1);
+}
+
void CGisItemRte::setSymbol()
{
icon = QPixmap("://icons/32x32/Route.png").scaled(22,22, Qt::KeepAspectRatio, Qt::SmoothTransformation);
@@ -279,9 +340,9 @@ QString CGisItemRte::getInfo(bool showName) const
str += "<b>" + getName() + "</b><br />";
}
- if(totalDistance != NOFLOAT)
+ if(rte.totalDistance != NOFLOAT)
{
- IUnit::self().meter2distance(totalDistance, val1, unit1);
+ IUnit::self().meter2distance(rte.totalDistance, val1, unit1);
str += tr("Length: %1 %2").arg(val1).arg(unit1);
}
else
@@ -290,9 +351,9 @@ QString CGisItemRte::getInfo(bool showName) const
}
str += "<br/>\n";
- if(totalTime != 0)
+ if(rte.totalTime != 0)
{
- IUnit::self().seconds2time(totalTime, val1, unit1);
+ IUnit::self().seconds2time(rte.totalTime, val1, unit1);
str += tr("Time: %1 %2").arg(val1).arg(unit1);
}
else
@@ -300,12 +361,22 @@ QString CGisItemRte::getInfo(bool showName) const
str += tr("Time: -");
}
- if(!lastRoutedWith.isEmpty())
+ if((rte.ascend != NOFLOAT) && (rte.descend != NOFLOAT))
+ {
+ str += "<br/>\n";
+ QString val1, val2, unit1, unit2;
+ IUnit::self().meter2elevation(rte.ascend, val1, unit1);
+ IUnit::self().meter2elevation(rte.descend, val2, unit2);
+
+ str += tr("%1%2 %3, %4%5 %6").arg(QChar(0x2197)).arg(val1).arg(unit1).arg(QChar(0x2198)).arg(val2).arg(unit2);
+ }
+
+ if(!rte.lastRoutedWith.isEmpty())
{
str += "<br/>\n";
- str += tr("Last time routed:<br/>%1").arg(IUnit::datetime2string(lastRoutedTime, false, boundingRect.center()));
+ str += tr("Last time routed:<br/>%1").arg(IUnit::datetime2string(rte.lastRoutedTime, false, boundingRect.center()));
str += "<br/>\n";
- str += tr("with %1").arg(lastRoutedWith);
+ str += tr("with %1").arg(rte.lastRoutedWith);
}
return str;
}
@@ -473,6 +544,8 @@ void CGisItemRte::drawItem(QPainter& p, const QRectF& viewport, CGisDraw * gis)
return;
}
+ QDateTime startTime = rte.pts.first().fakeSubpt.time;
+
if(hasUserFocus() && mouseMoveFocus && mouseMoveFocus->lon != NOFLOAT && mouseMoveFocus->lat != NOFLOAT)
{
QPointF anchor(mouseMoveFocus->lon, mouseMoveFocus->lat);
@@ -481,7 +554,7 @@ void CGisItemRte::drawItem(QPainter& p, const QRectF& viewport, CGisDraw * gis)
p.drawEllipse(anchor, 5, 5);
QString str, val, unit;
- IUnit::self().seconds2time(mouseMoveFocus->time, val, unit);
+ IUnit::self().seconds2time((mouseMoveFocus->time.toTime_t() - startTime.toTime_t()), val, unit);
str += tr("Time: %1 %2").arg(val).arg(unit) + " ";
IUnit::self().meter2distance(mouseMoveFocus->distance, val, unit);
str += tr("Distance: %1 %2").arg(val).arg(unit);
@@ -641,10 +714,10 @@ void CGisItemRte::reset()
}
mouseMoveFocus = nullptr;
- totalDistance = NOFLOAT;
- totalTime = 0;
- lastRoutedTime = QDateTime();
- lastRoutedWith = "";
+ rte.totalDistance = NOFLOAT;
+ rte.totalTime = 0;
+ rte.lastRoutedTime = QDateTime();
+ rte.lastRoutedWith = "";
deriveSecondaryData();
updateHistory();
@@ -724,6 +797,8 @@ void CGisItemRte::setResult(Routino_Output * route, const QString& options)
qint32 idxRtept = -1;
rtept_t * rtept = nullptr;
+ QDateTime time = QDateTime::currentDateTimeUtc();
+
Routino_Output * next = route;
while(next)
{
@@ -738,7 +813,8 @@ void CGisItemRte::setResult(Routino_Output * route, const QString& options)
rtept->fakeSubpt.turn = next->turn;
rtept->fakeSubpt.bearing = next->bearing;
rtept->fakeSubpt.distance = next->dist * 1000;
- rtept->fakeSubpt.time = next->time * 60;
+ rtept->fakeSubpt.time = time.addSecs(next->time * 60);
+
rtept->fakeSubpt.type = subpt_t::eTypeWpt;
rtept->fakeSubpt.instruction = QString(next->desc1) + ".\n" + QString(next->desc2) + ".";
}
@@ -752,7 +828,7 @@ void CGisItemRte::setResult(Routino_Output * route, const QString& options)
subpt.turn = next->turn;
subpt.bearing = next->bearing;
subpt.distance = next->dist * 1000;
- subpt.time = next->time * 60;
+ subpt.time = time.addSecs(next->time * 60);
if(next->name != 0)
{
@@ -768,16 +844,16 @@ void CGisItemRte::setResult(Routino_Output * route, const QString& options)
subpt.type = subpt_t::eTypeNone;
}
- totalDistance = subpt.distance;
- totalTime = subpt.time;
+ rte.totalDistance = subpt.distance;
+ rte.totalTime = subpt.time.toTime_t() - time.toTime_t();
subpt.instruction = QString(next->desc1) + ".\n" + QString(next->desc2) + ".";
}
next = next->next;
}
- lastRoutedTime = QDateTime::currentDateTimeUtc();
- lastRoutedWith = "Routino, " + options;
+ rte.lastRoutedTime = QDateTime::currentDateTimeUtc();
+ rte.lastRoutedWith = "Routino, " + options;
deriveSecondaryData();
updateHistory();
@@ -811,12 +887,14 @@ void CGisItemRte::setResult(const QDomDocument& xml, const QString &options)
{
QMutexLocker lock(&mutexItems);
+ QDateTime localtime = QDateTime::currentDateTimeUtc();
+
QDomElement response = xml.firstChildElement("response");
QDomElement route = response.firstChildElement("route");
// get time of travel
QDomElement xmlTime = route.firstChildElement("time");
- totalTime = xmlTime.text().toUInt();
+ rte.totalTime = xmlTime.text().toUInt();
// build list of maneuvers
@@ -896,7 +974,7 @@ void CGisItemRte::setResult(const QDomDocument& xml, const QString &options)
subpt.type = subpt_t::eTypeJunct;
subpt.instruction = maneuver.instruction;
- subpt.time = time;
+ subpt.time = localtime.addSecs(time);
time += maneuver.time;
subpt.distance = dist;
@@ -923,9 +1001,9 @@ void CGisItemRte::setResult(const QDomDocument& xml, const QString &options)
rtept.fakeSubpt.lon = rtept.lon;
rtept.fakeSubpt.lat = rtept.lat;
- totalDistance = dist;
- lastRoutedTime = QDateTime::currentDateTimeUtc();
- lastRoutedWith = "MapQuest" + options;
+ rte.totalDistance = dist;
+ rte.lastRoutedTime = QDateTime::currentDateTimeUtc();
+ rte.lastRoutedWith = "MapQuest" + options;
deriveSecondaryData();
updateHistory();
diff --git a/src/gis/rte/CGisItemRte.h b/src/gis/rte/CGisItemRte.h
index 9bef285..dc533ca 100644
--- a/src/gis/rte/CGisItemRte.h
+++ b/src/gis/rte/CGisItemRte.h
@@ -62,7 +62,9 @@ public:
QString instruction;
qreal distance = 0;
- quint32 time = 0;
+ QDateTime time;
+
+ qint32 ele = NOINT;
};
struct rtept_t : public wpt_t
@@ -93,6 +95,14 @@ public:
QString type;
QVector<rtept_t> pts;
// -- all gpx tags - stop
+
+ QString lastRoutedWith;
+ QDateTime lastRoutedTime;
+
+ qreal totalDistance = NOFLOAT;
+ quint32 totalTime = 0;
+ qreal ascend = NOFLOAT;
+ qreal descend = NOFLOAT;
};
CGisItemRte(const QDomNode &xml, IGisProject *parent);
@@ -187,10 +197,10 @@ public:
void setLinks(const QList<link_t>& links) override;
void calc();
-
void reset();
-
void edit() override;
+ void toTrack();
+
QPointF setMouseFocusByPoint(const QPoint& pt, focusmode_e fmode, const QString &owner);
@@ -201,6 +211,7 @@ public:
private:
void deriveSecondaryData();
+ void setElevation(qreal ele, subpt_t &subpt, qreal &lastEle);
void setSymbol() override;
void readRte(const QDomNode& xml, rte_t& rte);
void readRteFromFit(CFitStream &stream);
@@ -216,11 +227,6 @@ private:
rte_t rte;
QPolygonF line;
- QString lastRoutedWith;
- QDateTime lastRoutedTime;
-
- qreal totalDistance = NOFLOAT;
- quint32 totalTime = 0;
const subpt_t * mouseMoveFocus = nullptr;
diff --git a/src/gis/rte/CScrOptRte.cpp b/src/gis/rte/CScrOptRte.cpp
index 984dbc8..51d7f70 100644
--- a/src/gis/rte/CScrOptRte.cpp
+++ b/src/gis/rte/CScrOptRte.cpp
@@ -55,6 +55,7 @@ CScrOptRte::CScrOptRte(CGisItemRte *rte, const QPoint& point, IMouse *parent)
connect(toolReset, &QToolButton::clicked, this, &CScrOptRte::hide);
connect(toolEdit, &QToolButton::clicked, this, &CScrOptRte::hide);
connect(toolInstruction, &QToolButton::toggled, this, &CScrOptRte::hide);
+ connect(toolToTrack, &QToolButton::clicked, this, &CScrOptRte::hide);
connect(toolEditDetails, &QToolButton::clicked, this, &CScrOptRte::slotEditDetails);
connect(toolDelete, &QToolButton::clicked, this, &CScrOptRte::slotDelete);
@@ -63,6 +64,7 @@ CScrOptRte::CScrOptRte(CGisItemRte *rte, const QPoint& point, IMouse *parent)
connect(toolReset, &QToolButton::clicked, this, &CScrOptRte::slotReset);
connect(toolEdit, &QToolButton::clicked, this, &CScrOptRte::slotEdit);
connect(toolInstruction, &QToolButton::toggled, this, &CScrOptRte::slotInstruction);
+ connect(toolToTrack, &QToolButton::clicked, this, &CScrOptRte::slotToTrack);
}
CScrOptRte::~CScrOptRte()
@@ -111,6 +113,12 @@ void CScrOptRte::slotInstruction(bool on)
deleteLater();
}
+void CScrOptRte::slotToTrack()
+{
+ CGisWidget::self().convertRouteToTrack(key);
+ deleteLater();
+}
+
void CScrOptRte::draw(QPainter& p)
{
IGisItem *item = CGisWidget::self().getItemByKey(key);
diff --git a/src/gis/rte/CScrOptRte.h b/src/gis/rte/CScrOptRte.h
index 2adb1f4..66088b5 100644
--- a/src/gis/rte/CScrOptRte.h
+++ b/src/gis/rte/CScrOptRte.h
@@ -45,6 +45,7 @@ private slots:
void slotReset();
void slotEdit();
void slotInstruction(bool on);
+ void slotToTrack();
private:
IGisItem::key_t key;
diff --git a/src/gis/rte/IScrOptRte.ui b/src/gis/rte/IScrOptRte.ui
index e7580d0..33cd108 100644
--- a/src/gis/rte/IScrOptRte.ui
+++ b/src/gis/rte/IScrOptRte.ui
@@ -140,6 +140,20 @@
</widget>
</item>
<item>
+ <widget class="QToolButton" name="toolToTrack">
+ <property name="toolTip">
+ <string>Convert route to track</string>
+ </property>
+ <property name="text">
+ <string>...</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../../resources.qrc">
+ <normaloff>:/icons/32x32/Track.png</normaloff>:/icons/32x32/Track.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
diff --git a/src/gis/rte/router/CRouterRoutino.cpp b/src/gis/rte/router/CRouterRoutino.cpp
index 4687216..a5ab7be 100644
--- a/src/gis/rte/router/CRouterRoutino.cpp
+++ b/src/gis/rte/router/CRouterRoutino.cpp
@@ -266,16 +266,10 @@ void CRouterRoutino::freeDatabaseList()
void CRouterRoutino::updateHelpText()
{
- if(comboDatabase->count() != 0)
- {
- frameHelp->hide();
- comboDatabase->setEnabled(true);
- }
- else
- {
- frameHelp->show();
- comboDatabase->setEnabled(false);
- }
+ bool haveDB = (comboDatabase->count() != 0);
+
+ frameHelp->setVisible(!haveDB);
+ comboDatabase->setEnabled(haveDB);
}
void CRouterRoutino::calcRoute(const IGisItem::key_t& key)
diff --git a/src/gis/trk/CDetailsTrk.cpp b/src/gis/trk/CDetailsTrk.cpp
index 4554404..ba3b79f 100644
--- a/src/gis/trk/CDetailsTrk.cpp
+++ b/src/gis/trk/CDetailsTrk.cpp
@@ -110,6 +110,8 @@ CDetailsTrk::CDetailsTrk(CGisItemTrk& trk, QWidget *parent)
updateData();
+ treeWidget->setTrack(&trk);
+
plot1 = new CPlotProfile(&trk, trk.limitsGraph1, IPlot::eModeNormal, this);
plot2 = new CPlot(&trk, trk.limitsGraph2, this);
plot3 = new CPlot(&trk, trk.limitsGraph3, this);
@@ -133,7 +135,6 @@ CDetailsTrk::CDetailsTrk(CGisItemTrk& trk, QWidget *parent)
checkGraph2->setChecked(cfg.value("showGraph2", true).toBool());
checkGraph3->setChecked(cfg.value("showGraph3", true).toBool());
splitter->restoreState (cfg.value("splitterSizes").toByteArray());
- treeWidget->header()->restoreState(cfg.value("trackPointListState").toByteArray());
tabWidget->setCurrentIndex(cfg.value("visibleTab", 0).toInt());
cfg.endGroup();
@@ -142,7 +143,6 @@ CDetailsTrk::CDetailsTrk(CGisItemTrk& trk, QWidget *parent)
connect(checkGraph3, &QCheckBox::clicked, this, &CDetailsTrk::slotShowPlots);
connect(toolLock, &QToolButton::toggled, this, &CDetailsTrk::slotChangeReadOnlyMode);
- connect(treeWidget, &QTreeWidget::itemSelectionChanged, this, &CDetailsTrk::slotItemSelectionChanged);
connect(textCmtDesc, &QTextBrowser::anchorClicked, this, &CDetailsTrk::slotLinkActivated);
connect(lineName, &QLineEdit::textEdited, this, &CDetailsTrk::slotNameChanged);
@@ -204,7 +204,6 @@ CDetailsTrk::~CDetailsTrk()
cfg.setValue("showGraph2", checkGraph2->isChecked());
cfg.setValue("showGraph3", checkGraph3->isChecked());
cfg.setValue("splitterSizes", splitter->saveState());
- cfg.setValue("trackPointListState", treeWidget->header()->saveState());
cfg.setValue("visibleTab", tabWidget->currentIndex());
cfg.endGroup();
@@ -374,86 +373,6 @@ void CDetailsTrk::updateData()
lineName->setText(trk.getName());
lineName->setReadOnly(isReadOnly);
- QList<QTreeWidgetItem*> items;
- const CGisItemTrk::trk_t& t = trk.getTrackData();
- for(const CGisItemTrk::trkseg_t& seg : t.segs)
- {
- for(const CGisItemTrk::trkpt_t& trkpt : seg.pts)
- {
- QString val, unit;
-
- QTreeWidgetItem * item = new QTreeWidgetItem();
- item->setTextAlignment(eColNum, Qt::AlignLeft);
- item->setTextAlignment(eColEle, Qt::AlignRight);
- item->setTextAlignment(eColDelta, Qt::AlignRight);
- item->setTextAlignment(eColDist, Qt::AlignRight);
- item->setTextAlignment(eColAscend, Qt::AlignRight);
- item->setTextAlignment(eColDescend, Qt::AlignRight);
- item->setTextAlignment(eColSpeed, Qt::AlignRight);
-
- QBrush b( trkpt.flags & CGisItemTrk::trkpt_t::eHidden ? Qt::gray : Qt::black );
- for(int i = 0; i < eColMax; i++)
- {
- item->setForeground(i, b);
- }
-
- item->setText(eColNum,QString::number(trkpt.idxTotal));
-
- item->setText(eColTime, trkpt.time.isValid()
- ? IUnit::self().datetime2string(trkpt.time, true, QPointF(trkpt.lon, trkpt.lat)*DEG_TO_RAD)
- : "-"
- );
-
- if(trkpt.ele != NOINT)
- {
- IUnit::self().meter2elevation(trkpt.ele, val, unit);
- item->setText(eColEle, tr("%1 %2").arg(val).arg(unit));
- }
- else
- {
- item->setText(eColEle, "-");
- }
-
- IUnit::self().meter2distance(trkpt.deltaDistance, val, unit);
- item->setText(eColDelta, tr("%1 %2").arg(val).arg(unit));
-
- IUnit::self().meter2distance(trkpt.distance, val, unit);
- item->setText(eColDist, tr("%1 %2").arg(val).arg(unit));
-
- if(trkpt.speed != NOFLOAT)
- {
- IUnit::self().meter2speed(trkpt.speed, val, unit);
- item->setText(eColSpeed, tr("%1 %2").arg(val).arg(unit));
- }
- else
- {
- item->setText(eColSpeed, "-");
- }
-
- item->setText(eColSlope,
- (trkpt.slope1 != NOFLOAT)
- ? QString("%1°(%2%)").arg(trkpt.slope1, 2, 'f', 0).arg(trkpt.slope2, 2, 'f', 0)
- : "-"
- );
-
- IUnit::self().meter2elevation(trkpt.ascend, val, unit);
- item->setText(eColAscend, tr("%1 %2").arg(val).arg(unit));
- IUnit::self().meter2elevation(trkpt.descend, val, unit);
- item->setText(eColDescend, tr("%1 %2").arg(val).arg(unit));
-
- // position
- QString str;
- IUnit::degToStr(trkpt.lon, trkpt.lat, str);
- item->setText(eColPosition,str);
-
- items << item;
- }
- }
-
- treeWidget->clear();
- treeWidget->addTopLevelItems(items);
- treeWidget->header()->resizeSections(QHeaderView::ResizeToContents);
-
textCmtDesc->document()->clear();
textCmtDesc->append(IGisItem::createText(isReadOnly, trk.getComment(), trk.getDescription(), trk.getLinks()));
textCmtDesc->moveCursor (QTextCursor::Start);
@@ -686,15 +605,6 @@ void CDetailsTrk::slotChangeReadOnlyMode(bool on)
}
-void CDetailsTrk::slotItemSelectionChanged()
-{
- QTreeWidgetItem * item = treeWidget->currentItem();
- if(nullptr != item)
- {
- quint32 idx = item->text(eColNum).toUInt();
- trk.setMouseFocusByTotalIndex(idx, CGisItemTrk::eFocusMouseMove, "CDetailsTrk");
- }
-}
void CDetailsTrk::slotLinkActivated(const QUrl& url)
{
diff --git a/src/gis/trk/CDetailsTrk.h b/src/gis/trk/CDetailsTrk.h
index 3744a21..2947c16 100644
--- a/src/gis/trk/CDetailsTrk.h
+++ b/src/gis/trk/CDetailsTrk.h
@@ -47,7 +47,6 @@ private slots:
void slotShowPlots();
void slotColorChanged(int idx);
void slotChangeReadOnlyMode(bool on);
- void slotItemSelectionChanged();
void slotLinkActivated(const QUrl& url);
void slotMouseClickState(int);
void slotActivitySelected(bool checked);
@@ -73,20 +72,6 @@ private:
void setupGraph(CPlot * plot, const CLimit &limit, const QString& source, QDoubleSpinBox * spinMin, QDoubleSpinBox * spinMax);
void setupLimits(CLimit *limit, QDoubleSpinBox * spinMin, QDoubleSpinBox * spinMax);
- enum columns_t
- {
- eColNum
- ,eColTime
- ,eColEle
- ,eColDelta
- ,eColDist
- ,eColSpeed
- ,eColSlope
- ,eColAscend
- ,eColDescend
- ,eColPosition
- ,eColMax
- };
enum tabs_t
{
diff --git a/src/gis/trk/CGisItemTrk.cpp b/src/gis/trk/CGisItemTrk.cpp
index 247228a..f2b00e2 100644
--- a/src/gis/trk/CGisItemTrk.cpp
+++ b/src/gis/trk/CGisItemTrk.cpp
@@ -324,17 +324,6 @@ void CGisItemTrk::getPolylineFromData(SGisLine &l)
}
}
-bool CGisItemTrk::getNameAndProject(QString &name, IGisProject *&project)
-{
- name = QInputDialog::getText(CMainWindow::getBestWidgetForParent(), tr("Edit name..."), tr("Enter new track name."), QLineEdit::Normal, name);
- if(name.isEmpty())
- {
- return false;
- }
-
- project = CGisWidget::self().selectProject();
- return nullptr != project;
-}
void CGisItemTrk::readTrackDataFromGisLine(const SGisLine &l)
{
@@ -390,6 +379,10 @@ QString CGisItemTrk::getInfo(bool showName) const
return showName ? QString("<div><b>%1</b></div>").arg(getName()) : QString("<div></div>");
}
+ bool timeIsValid = (allValidFlags & trkpt_t::eInvalidTime) == 0;
+ bool eleIsValid = (allValidFlags & trkpt_t::eInvalidEle) == 0;
+
+
QString str = "<div>";
if(showName)
@@ -400,39 +393,80 @@ QString CGisItemTrk::getInfo(bool showName) const
IUnit::self().meter2distance(totalDistance, val1, unit1);
str += tr("Length: %1 %2").arg(val1).arg(unit1);
- if(totalAscend != NOFLOAT && totalDescend != NOFLOAT)
+ if(eleIsValid && totalAscend != NOFLOAT && totalDescend != NOFLOAT)
{
IUnit::self().meter2elevation(totalAscend, val1, unit1);
IUnit::self().meter2elevation(totalDescend, 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(totalElapsedSeconds != NOTIME)
+ 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) + "<br />";
+ str += tr("Time: %1, Speed: %2 %3").arg(val1).arg(val2).arg(unit2);
}
+ else
+ {
+ str += tr("Time: -, Speed: -");
+ }
+ str += "<br />";
- if(totalElapsedSecondsMoving != NOTIME)
+ 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) + "<br />";
+ str += tr("Moving: %1, Speed: %2 %3").arg(val1).arg(val2).arg(unit2);
}
+ else
+ {
+ str += tr("Moving: -, Speed: -");
+ }
+ str += "<br />";
- if(timeStart.isValid())
+ if(timeIsValid && timeStart.isValid())
{
- str += tr("Start: %1").arg(IUnit::datetime2string(timeStart, false, boundingRect.center())) + "<br />";
+ str += tr("Start: %1").arg(IUnit::datetime2string(timeStart, false, boundingRect.center()));
}
- if(timeEnd.isValid())
+ else
{
- str += tr("End: %1").arg(IUnit::datetime2string(timeEnd, false, boundingRect.center())) + "<br />";
+ str += tr("Start: -");
+ }
+ str += "<br />";
+
+ if(timeIsValid && timeEnd.isValid())
+ {
+ str += tr("End: %1").arg(IUnit::datetime2string(timeEnd, false, boundingRect.center()));
+ }
+ else
+ {
+ str += tr("End: -");
+ }
+ str += "<br />";
+
+ str += tr("Points: %1 (%2)").arg(cntVisiblePoints).arg(cntTotalPoints) + "<br />";
+
+ if((allValidFlags & (trkpt_t::eValidEle|trkpt_t::eInvalidEle)) == (trkpt_t::eValidEle|trkpt_t::eInvalidEle))
+ {
+ str += "<b style='color: red;'>" + tr("Invalid elevations!") + "</b><br/>";
+ }
+
+ if((allValidFlags & (trkpt_t::eValidTime|trkpt_t::eInvalidTime)) == (trkpt_t::eValidTime|trkpt_t::eInvalidTime))
+ {
+ str += "<b style='color: red;'>" + tr("Invalid timestamps!") + "</b><br/>";
+ }
+
+ if((allValidFlags & (trkpt_t::eValidPos|trkpt_t::eInvalidPos)) == (trkpt_t::eValidPos|trkpt_t::eInvalidPos))
+ {
+ str += "<b style='color: red;'>" + tr("Invalid positions!") + "</b><br/>";
}
- str += tr("Points: %1 (%2)").arg(cntVisiblePoints).arg(cntTotalPoints);
return str + "</div>";
}
@@ -440,13 +474,14 @@ QString CGisItemTrk::getInfoRange() const
{
qreal tmp, slope1, slope2;
QString str, val, unit;
- if(mouseRange1 == nullptr || mouseRange2 == nullptr)
+ if((mouseRange1 == nullptr) || (mouseRange2 == nullptr) || (mouseRange1 == mouseRange2))
{
return str;
}
int idx1 = mouseRange1->idxTotal;
int idx2 = mouseRange2->idxTotal;
+
const trkpt_t *pt1 = mouseRange1;
const trkpt_t *pt2 = mouseRange2;
if(idx1 >= idx2)
@@ -455,7 +490,7 @@ QString CGisItemTrk::getInfoRange() const
pt2 = mouseRange1;
}
- for(; pt1->isHidden() && (pt1->idxTotal < cntTotalPoints); ++pt1)
+ for(; pt1->isHidden() && (pt1->idxTotal < (cntTotalPoints - 1)); ++pt1)
{
}
for(; pt2->isHidden() && (pt2->idxTotal > 0); --pt2)
@@ -517,11 +552,22 @@ QString CGisItemTrk::getInfoRange() const
QString CGisItemTrk::getInfoTrkPt(const trkpt_t& pt) const
{
QString str, val1, unit1;
+
+ if(pt.idxTotal == pt.idxVisible)
+ {
+ str += tr("Index: %1").arg(pt.idxVisible);
+ }
+ else
+ {
+ str += tr("Index: visible %1, total %2").arg(pt.idxVisible).arg(pt.idxTotal);
+ }
+ str += "\n";
+
if(totalElapsedSeconds != 0)
{
str += IUnit::datetime2string(pt.time, false, QPointF(pt.lon, pt.lat) * DEG_TO_RAD);
+ str += "\n";
}
- str += "\n";
IUnit::self().meter2elevation(pt.ele, val1, unit1);
str += tr("Ele.: %1 %2").arg(val1).arg(unit1);
@@ -651,6 +697,12 @@ QString CGisItemTrk::getInfoRange(const trkpt_t& pt1, const trkpt_t& pt2) const
return QString("%1 %2\n%3").arg(asc).arg(dsc).arg(dsttme);
}
+qint32 CGisItemTrk::getElevation(qint32 idx) const
+{
+ const trkpt_t *trkpt = getTrkPtByTotalIndex(idx);
+ return trkpt != nullptr ? trkpt->ele : NOINT;
+}
+
IScrOpt * CGisItemTrk::getScreenOptions(const QPoint& origin, IMouse * mouse)
{
if(scrOpt.isNull())
@@ -794,6 +846,31 @@ void CGisItemTrk::resetInternalData()
delete dlgDetails;
}
+void CGisItemTrk::verifyTrkPt(trkpt_t*& last, trkpt_t& trkpt)
+{
+ trkpt.valid = 0;
+ trkpt.valid |= trkpt.ele != NOINT ? quint32(trkpt_t::eValidEle) : quint32(trkpt_t::eInvalidEle);
+ trkpt.valid |= (trkpt.lat < -90) || (trkpt.lat > 90) ||(trkpt.lon < -180) || (trkpt.lon > 180) ? quint32(trkpt_t::eInvalidPos) : quint32(trkpt_t::eValidPos);
+
+ if(trkpt.time.isValid())
+ {
+ if(last != nullptr)
+ {
+ trkpt.valid |= (trkpt.time.toMSecsSinceEpoch() - last->time.toMSecsSinceEpoch()) < 0 ? quint32(trkpt_t::eInvalidTime) : quint32(trkpt_t::eValidTime);
+ }
+ else
+ {
+ trkpt.valid |= trkpt_t::eValidTime;
+ }
+
+ last = &trkpt;
+ }
+ else
+ {
+ trkpt.valid |= trkpt_t::eInvalidTime;
+ }
+}
+
void CGisItemTrk::deriveSecondaryData()
{
qreal north = -90;
@@ -802,6 +879,7 @@ void CGisItemTrk::deriveSecondaryData()
qreal west = 180;
// reset all secondary data
+ allValidFlags = 0;
cntTotalPoints = 0;
cntVisiblePoints = 0;
timeStart = QDateTime();
@@ -833,9 +911,11 @@ void CGisItemTrk::deriveSecondaryData()
return;
}
- trkpt_t * lastTrkpt = nullptr;
- qreal timestampStart = NOFLOAT;
- qreal lastEle = NOFLOAT;
+ trkpt_t * lastValid = nullptr;
+ trkpt_t * lastTrkpt = nullptr;
+ qreal timestampStart = NOFLOAT;
+ qreal lastEle = NOFLOAT;
+
// linear list of pointers to visible track points
QVector<trkpt_t*> lintrk;
@@ -848,12 +928,19 @@ void CGisItemTrk::deriveSecondaryData()
{
trkpt_t& trkpt = seg.pts[p];
+ // verify data of all points
+ verifyTrkPt(lastValid, trkpt);
trkpt.idxTotal = cntTotalPoints++;
+
if(trkpt.isHidden())
{
trkpt.reset();
continue;
}
+
+ // count only visible points to allValidFlags
+ allValidFlags |= trkpt.valid;
+
trkpt.idxVisible = cntVisiblePoints++;
lintrk << &trkpt;
@@ -1008,9 +1095,10 @@ void CGisItemTrk::deriveSecondaryData()
propHandler->setupData();
}
- updateVisuals(eVisualPlot|eVisualDetails|eVisualProject|eVisualColorAct, "deriveSecondaryData()");
+ updateVisuals(eVisualPlot|eVisualDetails|eVisualProject|eVisualColorAct|eVisualTrkTable, "deriveSecondaryData()");
// qDebug() << "--------------" << getName() << "------------------";
+// qDebug() << "allValidFlags" << hex << allValidFlags;
// qDebug() << "totalDistance" << totalDistance;
// qDebug() << "totalAscend" << totalAscend;
// qDebug() << "totalDescend" << totalDescend;
@@ -1071,6 +1159,11 @@ void CGisItemTrk::findWaypointsCloseBy(CProgressDialog& progress, quint32& curre
continue;
}
+ if(!boundingRect.contains(wpt->getBoundingRect().topLeft()))
+ {
+ continue;
+ }
+
QPointF pos;
pos = wpt->getPosition();
@@ -1168,6 +1261,7 @@ bool CGisItemTrk::isWithin(const QRectF& area, selflags_t flags)
void CGisItemTrk::gainUserFocus(bool yes)
{
keyUserFocus = yes ? key : key_t();
+ widthInfoBox = MIN_WIDTH_INFO_BOX;
}
void CGisItemTrk::looseUserFocus()
@@ -1220,7 +1314,7 @@ bool CGisItemTrk::cut()
{
QString name = getName() + QString(" (%1 - %2)").arg(0).arg(idxMouse);
IGisProject *project = nullptr;
- if(!getNameAndProject(name, project))
+ if(!getNameAndProject(name, project, tr("track")))
{
return false;
}
@@ -1233,7 +1327,7 @@ bool CGisItemTrk::cut()
{
QString name = getName() + QString(" (%1 - %2)").arg(idxMouse).arg(cntTotalPoints-1);
IGisProject *project = nullptr;
- if(!getNameAndProject(name, project))
+ if(!getNameAndProject(name, project, tr("track")))
{
return false;
}
@@ -1293,7 +1387,7 @@ void CGisItemTrk::reverse()
{
QString name = getName() + "_rev";
IGisProject *project = nullptr;
- if(!getNameAndProject(name, project))
+ if(!getNameAndProject(name, project, tr("track")))
{
return;
}
@@ -1315,8 +1409,8 @@ void CGisItemTrk::reverse()
trkseg_t seg1;
for(const trkpt_t &pt : seg.pts)
{
- trkpt_t pt1 = pt;
- pt1.time = QDateTime();
+ trkpt_t pt1 = pt;
+ pt1.time = QDateTime();
seg1.pts.push_front(pt1);
}
@@ -1337,7 +1431,7 @@ void CGisItemTrk::combine(const QList<IGisItem::key_t>& keys)
QString name = getName() + " & other";
IGisProject *projectNew = nullptr;
- if(!getNameAndProject(name, projectNew))
+ if(!getNameAndProject(name, projectNew, tr("track")))
{
return;
}
@@ -1502,7 +1596,7 @@ void CGisItemTrk::copySelectedPoints() const
QString name = getName() + QString(" (%1 - %2)").arg(idx1).arg(idx2);
IGisProject *project = nullptr;
- if(!getNameAndProject(name, project))
+ if(!getNameAndProject(name, project, tr("track")))
{
return;
}
@@ -1763,29 +1857,20 @@ qreal CGisItemTrk::getMax(const QString& source) const
qreal CGisItemTrk::getMinProp(const QString& source) const
{
- if(propHandler == nullptr)
- {
- return NOFLOAT;
- }
- return propHandler->propBySource(source).min;
+ return propHandler == nullptr ? NOFLOAT
+ : propHandler->propBySource(source).min;
}
qreal CGisItemTrk::getMaxProp(const QString& source) const
{
- if(propHandler == nullptr)
- {
- return NOFLOAT;
- }
- return propHandler->propBySource(source).max;
+ return propHandler == nullptr ? NOFLOAT
+ : propHandler->propBySource(source).max;
}
QString CGisItemTrk::getUnitProp(const QString& source) const
{
- if(propHandler == nullptr)
- {
- return QString();
- }
- return propHandler->propBySource(source).unit;
+ return propHandler == nullptr ? QString()
+ : propHandler->propBySource(source).unit;
}
@@ -1838,18 +1923,12 @@ void CGisItemTrk::setColorizeLimitHigh(qreal limit)
updateHistory(eVisualColorLegend|eVisualDetails);
}
-void CGisItemTrk::setColorizeLimits(qreal low, qreal high)
-{
- colorSourceLimit.setMin(low);
- colorSourceLimit.setMax(high);
- updateHistory(eVisualColorLegend|eVisualDetails);
-}
-
-const QString CGisItemTrk::getColorizeUnit() const
+QString CGisItemTrk::getColorizeUnit() const
{
return CKnownExtension::get(getColorizeSource()).unit;
}
+
void CGisItemTrk::drawItem(QPainter& p, const QRectF& viewport, CGisDraw * gis)
{
QMutexLocker lock(&mutexItems);
@@ -1875,6 +1954,18 @@ void CGisItemTrk::drawItem(QPainter& p, const QRectF& viewport, CGisDraw * gis)
QFontMetrics fm(f);
QRect rectText = fm.boundingRect(QRect(0,0,500,0), Qt::AlignLeft|Qt::AlignTop|Qt::TextWordWrap, str);
+ // The initial minimum size of the box will be MIN_WIDTH_INFO_BOX.
+ // If a larger box is needed the minimum grows. By that the width
+ // of the box will only grow but not jump between sizes
+ if(rectText.width() < widthInfoBox)
+ {
+ rectText.setWidth(widthInfoBox);
+ }
+ else
+ {
+ widthInfoBox = rectText.width();
+ }
+
// create info box
int w = rectText.width() + 5 + 5;
int h = rectText.height() + 5 + (fm.height() + 8);
@@ -1931,15 +2022,10 @@ void CGisItemTrk::drawItem(QPainter& p, const QRectF& viewport, CGisDraw * gis)
p.drawText(QRect(0,1,rectBar1.width(),fm.height()), Qt::AlignVCenter|Qt::AlignLeft, QString("%1%2").arg(val1).arg(unit1));
p.drawText(QRect(0,1,rectBar1.width(),fm.height()), Qt::AlignCenter, QString("%1%").arg(mouseMoveFocus->elapsedSecondsMoving * 100 / totalElapsedSecondsMoving, 0, 'f', 0));
p.drawText(QRect(0,1,rectBar1.width(),fm.height()), Qt::AlignVCenter|Qt::AlignRight, QString("%1%2").arg(val2).arg(unit2));
-
- p.translate(0,fm.height() + 5);
- }
- else
- {
- p.translate(0, 5);
}
+
// draw text
- p.translate(0, 3);
+ p.translate(0,fm.height() + 8);
p.setPen(Qt::darkBlue);
p.drawText(rectText, Qt::AlignLeft|Qt::AlignTop|Qt::TextWordWrap,str);
@@ -2058,6 +2144,17 @@ void CGisItemTrk::setLinks(const QList<link_t>& links)
changed(tr("Changed links"), "://icons/48x48/Link.png");
}
+void CGisItemTrk::setElevation(qint32 idx, qint32 ele)
+{
+ auto condition = [idx](const trkpt_t &pt) { return pt.idxTotal == idx; };
+ trkpt_t * trkpt = getTrkPtByCondition(condition);
+ if((trkpt != nullptr) && (trkpt->ele != ele))
+ {
+ trkpt->ele = ele;
+ deriveSecondaryData();
+ changed(tr("Changed elevation of point %1 to %2 %3").arg(idx).arg(ele).arg(IUnit::self().baseunit), "://icons/48x48/SetEle.png");
+ }
+}
void CGisItemTrk::setColor(int idx)
{
@@ -2130,7 +2227,7 @@ void CGisItemTrk::setActivity()
{
trkpt_t& trkpt = seg.pts[i];
- if((idx1 < trkpt.idxTotal) && (trkpt.idxTotal <= idx2))
+ if((idx1 <= trkpt.idxTotal) && (trkpt.idxTotal < idx2))
{
trkpt.unsetFlag(trkpt_t::eActMask);
trkpt.setFlag((enum CGisItemTrk::trkpt_t::flag_e) flag);
@@ -2164,8 +2261,8 @@ void CGisItemTrk::setColor(const QColor& c)
void CGisItemTrk::setIcon(const QString& iconColor)
{
- trk.color = iconColor;
- icon = QPixmap("://icons/48x48/Track.png");
+ trk.color = iconColor;
+ icon = QPixmap("://icons/48x48/Track.png");
QPixmap mask( icon.size() );
mask.fill( str2color(iconColor) );
@@ -2310,6 +2407,21 @@ const CGisItemTrk::trkpt_t* CGisItemTrk::getTrkPtByCondition(std::function<bool(
return nullptr;
}
+CGisItemTrk::trkpt_t* CGisItemTrk::getTrkPtByCondition(std::function<bool(const trkpt_t&)> cond)
+{
+ for(trkseg_t &seg : trk.segs)
+ {
+ for(trkpt_t &pt : seg.pts)
+ {
+ if(cond(pt))
+ {
+ return &pt;
+ }
+ }
+ }
+ return nullptr;
+}
+
const CGisItemTrk::trkpt_t * CGisItemTrk::getTrkPtByVisibleIndex(qint32 idx) const
{
if(idx == NOIDX)
diff --git a/src/gis/trk/CGisItemTrk.h b/src/gis/trk/CGisItemTrk.h
index b1530ce..d1b0fbf 100644
--- a/src/gis/trk/CGisItemTrk.h
+++ b/src/gis/trk/CGisItemTrk.h
@@ -32,21 +32,19 @@
class QDomNode;
class IGisProject;
-class IPlot;
class INotifyTrk;
class CDetailsTrk;
class CScrOptTrk;
class QSqlDatabase;
class CQlgtTrack;
class IQlgtOverlay;
-class QDir;
class CProgressDialog;
class CPropertyTrk;
-class CColorLegend;
class CFitStream;
#define TRK_N_COLORS 17
#define ASCEND_THRESHOLD 5
+#define MIN_WIDTH_INFO_BOX 300
class CGisItemTrk : public IGisItem, public IGisLine
{
@@ -75,6 +73,7 @@ public:
, eVisualDetails = 0x04
, eVisualProject = 0x08
, eVisualColorAct = 0x10
+ , eVisualTrkTable = 0x20
, eVisualAll = -1
};
@@ -229,6 +228,13 @@ public:
{
return trk.links;
}
+
+ qint32 getCntTotalPoints()
+ {
+ return cntTotalPoints;
+ }
+
+
/// get the track as a simple coordinate polyline
void getPolylineFromData(QPolygonF &l) const;
/// get the track as polyline with elevation, pixel and GIS coordinates.
@@ -259,6 +265,17 @@ public:
return mouseMoveFocus;
}
+ quint32 getAllValidFlags() const
+ {
+ return allValidFlags;
+ }
+
+ /**
+ @brief Get the elevation of a track point
+ @param idx The total index of the point
+ @return The elevation or NOINT if the index is invalid, or the track point has no elevation value.
+ */
+ qint32 getElevation(qint32 idx) const;
/** @defgroup ColorSource Stuff related to coloring tracks using data from different sources
@@ -296,9 +313,7 @@ public:
return colorSourceLimit.getMax();
}
- void setColorizeLimits(qreal low, qreal high);
-
- const QString getColorizeUnit() const;
+ QString getColorizeUnit() const;
qreal getMin(const QString& source) const;
qreal getMax(const QString& source) const;
@@ -330,6 +345,12 @@ public:
void setDescription(const QString& str) override;
void setLinks(const QList<link_t>& links) override;
void setDataFromPolyline(const SGisLine &l) override;
+ /**
+ @brief Manually set the elevation value of a single track point
+ @param idx the total index of the track point
+ @param ele the new elevation value
+ */
+ void setElevation(qint32 idx, qint32 ele);
/**
@brief display the track screen options
@@ -490,7 +511,6 @@ public:
@brief Use point with the distance from start matching best the given distance.
@param dist the distance in [m]
- @param initiator a pointer to an initiating IPlot object, or 0
*/
bool setMouseFocusByDistance(qreal dist, focusmode_e fmode, const QString& owner);
@@ -498,7 +518,6 @@ public:
@brief Use point with time from start matching best the given time delta
@param time a time delta in [s] relative to the start time
- @param initiator a pointer to an initiating IPlot object, or 0
*/
bool setMouseFocusByTime(quint32 time, focusmode_e fmode, const QString& owner);
@@ -530,7 +549,7 @@ public:
void filterReducePoints(qreal dist);
/** @brief Remove track points without valid location at the beginning of the track */
- void filterRemoveNullPoints();
+ void filterRemoveInvalidPoints();
/** @param points size of Median filter */
void filterSmoothProfile(int points);
@@ -603,6 +622,7 @@ private:
*/
void resetInternalData();
+ void verifyTrkPt(trkpt_t *&last, trkpt_t& trkpt);
/** @defgroup ExtremaExtensions Stuff related to calculation of extrema/extensions
@@ -621,10 +641,10 @@ private:
QHash<QString, limits_t> extrema;
void updateExtremaAndExtensions();
- static bool getNameAndProject(QString &name, IGisProject *&project);
-
const trkpt_t* getTrkPtByCondition(std::function<bool(const trkpt_t&)> cond) const;
+ trkpt_t* getTrkPtByCondition(std::function<bool(const trkpt_t&)> cond);
+
/**
@brief Try to get access Nth visible point matching the idx
@@ -726,9 +746,8 @@ public:
enum flag_e
{
- eHidden = 0x00000004 ///< mark point as deleted
-
- // activity flags
+ eHidden = 0x00000004 ///< mark point as deleted
+ // activity flags
,eActNone = 0x00000000
,eActFoot = 0x80000000
,eActCycle = 0x40000000
@@ -743,6 +762,23 @@ public:
,eActMaxNum = 9 ///< maximum number of activity flags. this is defined by the mask
};
+ enum valid_e
+ {
+ eValidTime = 0x00000001
+ ,eValidEle = 0x00000002
+ ,eValidPos = 0x00000004
+ ,eValidMask = 0x0000FFFF
+ };
+
+ enum invalid_e
+ {
+ eInvalidTime = eValidTime << 16
+ ,eInvalidEle = eValidEle << 16
+ ,eInvalidPos = eValidPos << 16
+ ,eInvalidMask = 0xFFFF0000
+ };
+
+
inline bool isHidden() const
{
return hasFlag(trkpt_t::eHidden);
@@ -763,7 +799,18 @@ public:
flags &= ~flag;
}
+ inline bool isValid(valid_e flag) const
+ {
+ return (valid & flag) != 0;
+ }
+
+ inline bool isInvalid(invalid_e flag) const
+ {
+ return (valid & flag) != 0;
+ }
+
quint32 flags = 0;
+ quint32 valid = 0;
qint32 idxTotal = NOIDX; //< index within the complete track
qint32 idxVisible; //< offset into lineSimple
qreal deltaDistance; //< the distance to the last point
@@ -869,6 +916,7 @@ private:
\defgroup TrackStatistics Some statistical values over the complete track
*/
/**@{*/
+ quint32 allValidFlags = 0;
qint32 cntTotalPoints = 0;
qint32 cntVisiblePoints = 0;
QDateTime timeStart;
@@ -896,6 +944,8 @@ private:
qint32 penWidthBg = 5; //< outer trackline width
qint32 penWidthHi = 11; //< highlighted trackline width
+ qint32 widthInfoBox = MIN_WIDTH_INFO_BOX;
+
/// the pen with the actual track color
QPen penForeground {Qt::blue, qreal(penWidthFg), Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin};
/// background (border) color of all tracks
diff --git a/src/gis/trk/CKnownExtension.cpp b/src/gis/trk/CKnownExtension.cpp
index 678bf31..81418c3 100644
--- a/src/gis/trk/CKnownExtension.cpp
+++ b/src/gis/trk/CKnownExtension.cpp
@@ -26,6 +26,7 @@ const QString CKnownExtension::internalEle = "::ql:ele";
const QString CKnownExtension::internalProgress = "::ql:progress";
QHash<QString, CKnownExtension> CKnownExtension::knownExtensions;
+QSet<QString> CKnownExtension::registeredNS;
static fTrkPtGetVal getExtensionValueFunc(const QString ext)
{
@@ -37,8 +38,24 @@ static fTrkPtGetVal getExtensionValueFunc(const QString ext)
};
}
+bool CKnownExtension::registerNS(const QString &ns)
+{
+ if(!registeredNS.contains(ns))
+ {
+ registeredNS.insert(ns);
+ return true;
+ }
+
+ return false;
+}
+
void CKnownExtension::initGarminTPXv1(const IUnit &units, const QString &ns)
{
+ if(!registerNS(ns))
+ {
+ return;
+ }
+
// support for the Garmin TrackPointExtension v1
// https://www8.garmin.com/xmlschemas/TrackPointExtensionv1.xsd
knownExtensions.insert(ns % ":TrackPointExtension|" % ns % ":atemp",
diff --git a/src/gis/trk/CKnownExtension.h b/src/gis/trk/CKnownExtension.h
index 906b3e4..b769479 100644
--- a/src/gis/trk/CKnownExtension.h
+++ b/src/gis/trk/CKnownExtension.h
@@ -19,20 +19,44 @@
#ifndef CKNOWNEXTENSION_H
#define CKNOWNEXTENSION_H
+#include <QSet>
+
#include "gis/trk/CGisItemTrk.h"
-#include <functional>
class CKnownExtension
{
Q_DECLARE_TR_FUNCTIONS(CKnownExtension)
public:
+ /**
+ @brief Initialize using the default list of known namespaces
+ @param units The unit class currently used
+ */
static void init(const IUnit &units);
- static const QString internalSlope;
- static const QString internalSpeed;
- static const QString internalEle;
- static const QString internalProgress;
+ /**
+ @brief Register the Garmin TPX v1 for namespace ns
+ @param units The unit class currently used
+ @param ns The namespace to be used for Garmin TPX v1
+ */
+ static void initGarminTPXv1(const IUnit &units, const QString &ns);
+
+ static const QString internalSlope; //< name of internally derived slope
+ static const QString internalSpeed; //< name of internally derived speed
+ static const QString internalEle; //< name of internally derived elevation (DEM)
+ static const QString internalProgress; //< name of internally derived progress
+
+ /**
+ @brief Get extension descriptor for name
+
+ If there is no known descriptor for an extension with `name`, a valid dummy descriptor
+ will be returned.
+ The dummy descriptor contains valid entries, `valueFunc` can be used just as if the
+ extension was known.
+ @param name The name of the requested extension (incl. namespace)
+
+ @return a valid extension descriptor (for both known and unknown extensions)
+ */
static const CKnownExtension get(const QString &name);
static bool isKnown(const QString &name);
@@ -43,12 +67,16 @@ public:
qreal factor; //< factor used to convert a value to match the users' units
QString unit; //< the unit (to be displayed)
QString icon; //< path to an icon
- bool known;
+ bool known; //< true if extension is known, false otherwise
bool derivedQMS; //< if set to true the value is derived by QMS (p.x. slope*)
fTrkPtGetVal valueFunc; //< the function used to retrieve the value
private:
+
+ static bool registerNS(const QString &ns);
+
static QHash<QString, CKnownExtension> knownExtensions;
+ static QSet<QString> registeredNS;
CKnownExtension(QString name, int order,
qreal minimum, qreal maximum,
@@ -61,7 +89,6 @@ private:
{
}
- static void initGarminTPXv1(const IUnit &units, const QString &ns);
static void initMioTPX(const IUnit &units);
};
diff --git a/src/gis/trk/CPropertyTrk.cpp b/src/gis/trk/CPropertyTrk.cpp
index cd34497..65e82c0 100644
--- a/src/gis/trk/CPropertyTrk.cpp
+++ b/src/gis/trk/CPropertyTrk.cpp
@@ -43,7 +43,7 @@ void CPropertyTrk::setupData()
, nullptr
, QString()
, QString()
- , 1.0
+ , 1.0
, nullptr
};
properties << propNull;
@@ -61,9 +61,9 @@ void CPropertyTrk::setupData()
, QIcon(ext.icon)
, property_t::eAxisDistance
, [](const CGisItemTrk::trkpt_t &p) {return p.distance; }
- , ext.unit
+ , ext.unit
, ext.known ? QString("%1 [%2]").arg(name).arg(ext.unit) : name
- , ext.factor
+ , ext.factor
, ext.valueFunc
};
diff --git a/src/gis/trk/CPropertyTrk.h b/src/gis/trk/CPropertyTrk.h
index ac28d87..d36f74e 100644
--- a/src/gis/trk/CPropertyTrk.h
+++ b/src/gis/trk/CPropertyTrk.h
@@ -53,13 +53,13 @@ public:
qreal factor,
fTrkPtGetVal getY)
: key(key)
- , name(name)
- , icon(icon)
+ , name(name)
+ , icon(icon)
, axisType(axisType)
, getX(getX)
, unit(unit)
, yLabel(yLabel)
- , factor(factor)
+ , factor(factor)
, getY(getY)
{
}
@@ -67,7 +67,7 @@ public:
// key/extension source of the property
QString key;
// name of the property
- QString name;
+ QString name;
// symbol representing the property
QIcon icon;
diff --git a/src/gis/trk/CTableTrk.cpp b/src/gis/trk/CTableTrk.cpp
new file mode 100644
index 0000000..58ac155
--- /dev/null
+++ b/src/gis/trk/CTableTrk.cpp
@@ -0,0 +1,208 @@
+/**********************************************************************************************
+ Copyright (C) 2016 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 "gis/trk/CTableTrk.h"
+#include "helpers/CElevationDialog.h"
+#include "helpers/CSettings.h"
+#include "units/IUnit.h"
+
+
+#include <QtWidgets>
+#include <proj_api.h>
+
+CTableTrk::CTableTrk(QWidget *parent)
+ : QTreeWidget(parent)
+ , INotifyTrk(CGisItemTrk::eVisualTrkTable)
+{
+ SETTINGS;
+ cfg.beginGroup("TrackDetails");
+ header()->restoreState(cfg.value("trackPointListState").toByteArray());
+ cfg.endGroup();
+
+ connect(this, &CTableTrk::itemSelectionChanged, this, &CTableTrk::slotItemSelectionChanged);
+ connect(this, &CTableTrk::itemDoubleClicked, this, &CTableTrk::slotItemDoubleClicked);
+}
+
+CTableTrk::~CTableTrk()
+{
+ SETTINGS;
+ cfg.beginGroup("TrackDetails");
+ cfg.setValue("trackPointListState", header()->saveState());
+ cfg.endGroup();
+
+ if(trk != nullptr)
+ {
+ trk->unregisterVisual(this);
+ }
+}
+
+void CTableTrk::setTrack(CGisItemTrk * track)
+{
+ if(trk != nullptr)
+ {
+ trk->unregisterVisual(this);
+ }
+
+ clear();
+ trk = track;
+
+ if(trk != nullptr)
+ {
+ trk->registerVisual(this);
+ updateData();
+ }
+}
+
+void CTableTrk::updateData()
+{
+ if(trk == nullptr)
+ {
+ return;
+ }
+
+ // use all valid flags as invalid mask. By that only
+ // invalid flags for properties with valid points count
+ quint32 invalidMask = (trk->getAllValidFlags() & CGisItemTrk::trkpt_t::eValidMask) << 16;
+
+ QList<QTreeWidgetItem*> items;
+ const CGisItemTrk::trk_t& t = trk->getTrackData();
+ for(const CGisItemTrk::trkseg_t& seg : t.segs)
+ {
+ for(const CGisItemTrk::trkpt_t& trkpt : seg.pts)
+ {
+ QString val, unit;
+
+ QTreeWidgetItem * item = new QTreeWidgetItem();
+ item->setTextAlignment(eColNum, Qt::AlignLeft);
+ item->setTextAlignment(eColEle, Qt::AlignRight);
+ item->setTextAlignment(eColDelta, Qt::AlignRight);
+ item->setTextAlignment(eColDist, Qt::AlignRight);
+ item->setTextAlignment(eColAscend, Qt::AlignRight);
+ item->setTextAlignment(eColDescend, Qt::AlignRight);
+ item->setTextAlignment(eColSpeed, Qt::AlignRight);
+
+ if(!trk->isReadOnly())
+ {
+ item->setToolTip(eColEle, tr("Double click to edit elevation value"));
+ }
+
+ QBrush bg = item->background(0);
+ if(trkpt.isInvalid(CGisItemTrk::trkpt_t::invalid_e(invalidMask)))
+ {
+ bg = QColor(255, 100, 100);
+ }
+
+ QBrush fg( trkpt.flags & CGisItemTrk::trkpt_t::eHidden ? Qt::gray : Qt::black );
+ for(int i = 0; i < eColMax; i++)
+ {
+ item->setBackground(i, bg);
+ item->setForeground(i, fg);
+ }
+
+ item->setText(eColNum,QString::number(trkpt.idxTotal));
+
+ item->setText(eColTime, trkpt.time.isValid()
+ ? IUnit::self().datetime2string(trkpt.time, true, QPointF(trkpt.lon, trkpt.lat)*DEG_TO_RAD)
+ : "-"
+ );
+
+ if(trkpt.ele != NOINT)
+ {
+ IUnit::self().meter2elevation(trkpt.ele, val, unit);
+ item->setText(eColEle, tr("%1 %2").arg(val).arg(unit));
+ }
+ else
+ {
+ item->setText(eColEle, "-");
+ }
+
+ IUnit::self().meter2distance(trkpt.deltaDistance, val, unit);
+ item->setText(eColDelta, tr("%1 %2").arg(val).arg(unit));
+
+ IUnit::self().meter2distance(trkpt.distance, val, unit);
+ item->setText(eColDist, tr("%1 %2").arg(val).arg(unit));
+
+ if(trkpt.speed != NOFLOAT)
+ {
+ IUnit::self().meter2speed(trkpt.speed, val, unit);
+ item->setText(eColSpeed, tr("%1 %2").arg(val).arg(unit));
+ }
+ else
+ {
+ item->setText(eColSpeed, "-");
+ }
+
+ item->setText(eColSlope,
+ (trkpt.slope1 != NOFLOAT)
+ ? QString("%1%3(%2%)").arg(trkpt.slope1, 2, 'f', 0).arg(trkpt.slope2, 2, 'f', 0).arg(QChar(0x00b0))
+ : "-"
+ );
+
+ IUnit::self().meter2elevation(trkpt.ascend, val, unit);
+ item->setText(eColAscend, tr("%1 %2").arg(val).arg(unit));
+ IUnit::self().meter2elevation(trkpt.descend, val, unit);
+ item->setText(eColDescend, tr("%1 %2").arg(val).arg(unit));
+
+ // position
+ QString str;
+ IUnit::degToStr(trkpt.lon, trkpt.lat, str);
+ item->setText(eColPosition,str);
+
+ items << item;
+ }
+ }
+
+ clear();
+ addTopLevelItems(items);
+ header()->resizeSections(QHeaderView::ResizeToContents);
+}
+
+
+void CTableTrk::slotItemSelectionChanged()
+{
+ QTreeWidgetItem * item = currentItem();
+ if(nullptr != item)
+ {
+ quint32 idx = item->text(eColNum).toUInt();
+ trk->setMouseFocusByTotalIndex(idx, CGisItemTrk::eFocusMouseMove, "CTableTrk");
+ }
+}
+
+void CTableTrk::slotItemDoubleClicked(QTreeWidgetItem * item, int column)
+{
+ if(trk->isReadOnly())
+ {
+ return;
+ }
+
+ qint32 idx = item->text(eColNum).toInt();
+ qint32 ele = trk->getElevation(idx);
+ qreal lon, lat;
+ IUnit::strToDeg(item->text(eColPosition), lon, lat);
+
+ if((column == eColEle) && (lon != NOFLOAT) && (lat != NOFLOAT))
+ {
+ QVariant var(ele);
+ CElevationDialog dlg(this, var, QVariant(ele), QPointF(lon, lat));
+
+ if(dlg.exec() == QDialog::Accepted)
+ {
+ trk->setElevation(idx, var.toInt());
+ }
+ }
+}
diff --git a/src/gis/trk/CTableTrk.h b/src/gis/trk/CTableTrk.h
new file mode 100644
index 0000000..9958c03
--- /dev/null
+++ b/src/gis/trk/CTableTrk.h
@@ -0,0 +1,64 @@
+/**********************************************************************************************
+ Copyright (C) 2016 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/>.
+
+**********************************************************************************************/
+
+#ifndef CTABLETRK_H
+#define CTABLETRK_H
+
+#include <QTreeWidget>
+#include <gis/trk/CGisItemTrk.h>
+
+class CTableTrk : public QTreeWidget, public INotifyTrk
+{
+ Q_OBJECT
+public:
+ CTableTrk(QWidget * parent);
+ virtual ~CTableTrk();
+
+ void setTrack(CGisItemTrk * track);
+
+ void updateData() override;
+ void setMouseFocus(const CGisItemTrk::trkpt_t * pt) override {}
+ void setMouseRangeFocus(const CGisItemTrk::trkpt_t * pt1, const CGisItemTrk::trkpt_t * pt2) override {}
+ void setMouseClickFocus(const CGisItemTrk::trkpt_t * pt) override {}
+
+
+ enum columns_t
+ {
+ eColNum
+ ,eColTime
+ ,eColEle
+ ,eColDelta
+ ,eColDist
+ ,eColSpeed
+ ,eColSlope
+ ,eColAscend
+ ,eColDescend
+ ,eColPosition
+ ,eColMax
+ };
+
+private slots:
+ void slotItemSelectionChanged();
+ void slotItemDoubleClicked(QTreeWidgetItem * item, int column);
+
+private:
+ CGisItemTrk * trk = nullptr;
+};
+
+#endif //CTABLETRK_H
+
diff --git a/src/gis/trk/IDetailsTrk.ui b/src/gis/trk/IDetailsTrk.ui
index ef75bf4..6801235 100644
--- a/src/gis/trk/IDetailsTrk.ui
+++ b/src/gis/trk/IDetailsTrk.ui
@@ -54,8 +54,12 @@
</property>
<property name="text">
<string>-
+-
-</string>
</property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
</widget>
</item>
<item>
@@ -77,6 +81,9 @@
<string>-
-</string>
</property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
</widget>
</item>
<item>
@@ -98,6 +105,9 @@
<string>-
-</string>
</property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
</widget>
</item>
<item>
@@ -338,7 +348,7 @@
</sizepolicy>
</property>
<property name="currentIndex">
- <number>1</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="tab_3">
<attribute name="title">
@@ -1408,7 +1418,7 @@
<number>0</number>
</property>
<item>
- <widget class="QTreeWidget" name="treeWidget">
+ <widget class="CTableTrk" name="treeWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
<horstretch>0</horstretch>
@@ -1595,16 +1605,21 @@
<header>gis/trk/CSelectActivityColor.h</header>
<container>1</container>
</customwidget>
+ <customwidget>
+ <class>CTableTrk</class>
+ <extends>QTreeWidget</extends>
+ <header>gis/trk/CTableTrk.h</header>
+ </customwidget>
</customwidgets>
<resources>
<include location="../../resources.qrc"/>
</resources>
<connections/>
<buttongroups>
- <buttongroup name="buttonGroupGraph2"/>
+ <buttongroup name="buttonGroupLineWidth"/>
<buttongroup name="buttonGroupGraph1"/>
<buttongroup name="buttonGroupArrow"/>
- <buttongroup name="buttonGroupLineWidth"/>
+ <buttongroup name="buttonGroupGraph2"/>
<buttongroup name="buttonGroupGraph3"/>
</buttongroups>
</ui>
diff --git a/src/gis/trk/filter/CFilterInvalid.cpp b/src/gis/trk/filter/CFilterInvalid.cpp
index 92b8d97..6b688a4 100644
--- a/src/gis/trk/filter/CFilterInvalid.cpp
+++ b/src/gis/trk/filter/CFilterInvalid.cpp
@@ -33,6 +33,6 @@ CFilterInvalid::CFilterInvalid(CGisItemTrk &trk, QWidget *parent)
void CFilterInvalid::slotApply()
{
CCanvas::setOverrideCursor(Qt::WaitCursor, "CFilterInvalid");
- trk.filterRemoveNullPoints();
+ trk.filterRemoveInvalidPoints();
CCanvas::restoreOverrideCursor("CFilterInvalid");
}
diff --git a/src/gis/trk/filter/IFilterInvalid.ui b/src/gis/trk/filter/IFilterInvalid.ui
index 65944fa..6262631 100644
--- a/src/gis/trk/filter/IFilterInvalid.ui
+++ b/src/gis/trk/filter/IFilterInvalid.ui
@@ -53,7 +53,7 @@
<item>
<widget class="QLabel" name="labelDescription">
<property name="text">
- <string>Hide points with invalid coordinates at the beginning of the track.</string>
+ <string>Hide points with invalid data.</string>
</property>
</widget>
</item>
diff --git a/src/gis/trk/filter/filter.cpp b/src/gis/trk/filter/filter.cpp
index 4f96e1f..2c8b183 100644
--- a/src/gis/trk/filter/filter.cpp
+++ b/src/gis/trk/filter/filter.cpp
@@ -108,29 +108,27 @@ void CGisItemTrk::filterReducePoints(qreal dist)
changed(tr("Hide points by Douglas Peuker algorithm (%1%2)").arg(val).arg(unit), "://icons/48x48/PointHide.png");
}
-void CGisItemTrk::filterRemoveNullPoints()
+void CGisItemTrk::filterRemoveInvalidPoints()
{
bool nothingDone = true;
- bool done = false;
- for(int i = 0; i < trk.segs.size() && !done; i++)
+ // use all valid flags as invalid mask. By that only
+ // invalid flags for properties with valid points count
+ quint32 invalidMask = (getAllValidFlags() & trkpt_t::eValidMask) << 16;
+
+ for(int i = 0; i < trk.segs.size(); i++)
{
trkseg_t& seg = trk.segs[i];
- for(int n = 0; n < seg.pts.size() && !done; n++)
+ for(int n = 0; n < seg.pts.size(); n++)
{
trkpt_t& pt = seg.pts[n];
- if( (NOFLOAT == pt.lat || 0. == pt.lat)
- && (NOFLOAT == pt.lon || 0. == pt.lon) )
+ if(pt.isInvalid(trkpt_t::invalid_e(invalidMask)))
{
pt.flags |= trkpt_t::eHidden;
nothingDone = false;
}
- else
- {
- done = true;
- }
}
}
@@ -140,7 +138,7 @@ void CGisItemTrk::filterRemoveNullPoints()
}
deriveSecondaryData();
- changed(tr("Hide points with invalid coordinates at the beginning of the track"), "://icons/48x48/PointHide.png");
+ changed(tr("Hide points with invalid data."), "://icons/48x48/PointHide.png");
}
void CGisItemTrk::filterReset()
@@ -384,8 +382,7 @@ void CGisItemTrk::filterSpeed(qreal speed)
continue;
}
- qreal dmsec = 1000 * pt.deltaDistance/speed;
- timestamp = timestamp.addMSecs(qRound(dmsec));
+ timestamp = speed == 0 ? QDateTime() : timestamp.addMSecs(qRound(1000 * pt.deltaDistance/speed));
pt.time = timestamp;
}
}
diff --git a/src/helpers/CElevationDialog.cpp b/src/helpers/CElevationDialog.cpp
index 37a2f12..3e2ceed 100644
--- a/src/helpers/CElevationDialog.cpp
+++ b/src/helpers/CElevationDialog.cpp
@@ -39,7 +39,7 @@ CElevationDialog::CElevationDialog(QWidget * parent, QVariant &val, const QVaria
IUnit::self().meter2elevation(100, str, unit);
labelUnit->setText(unit);
- if(val != reset)
+ if(val != NOINT)
{
IUnit::self().meter2elevation(val.toDouble(), str, unit);
lineValue->setText(str);
@@ -66,7 +66,16 @@ void CElevationDialog::accept()
void CElevationDialog::slotReset()
{
- lineValue->clear();
+ if(reset == NOINT)
+ {
+ lineValue->clear();
+ }
+ else
+ {
+ QString str, unit;
+ IUnit::self().meter2elevation(val.toDouble(), str, unit);
+ lineValue->setText(str);
+ }
}
void CElevationDialog::slotGetEle()
diff --git a/src/helpers/CPositionDialog.cpp b/src/helpers/CPositionDialog.cpp
index bdad6c9..8bf4b1a 100644
--- a/src/helpers/CPositionDialog.cpp
+++ b/src/helpers/CPositionDialog.cpp
@@ -67,14 +67,8 @@ bool CPositionDialog::getPosition(QPointF& pt, const QString& str)
void CPositionDialog::slotEdit(const QString& str)
{
- if(IUnit::isValidCoordString(str))
- {
- labelWarning->hide();
- buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
- }
- else
- {
- labelWarning->show();
- buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
- }
+ bool isValid = IUnit::isValidCoordString(str);
+
+ labelWarning->setVisible(!isValid);
+ buttonBox->button(QDialogButtonBox::Ok)->setEnabled(isValid);
}
diff --git a/src/helpers/CWptIconDialog.cpp b/src/helpers/CWptIconDialog.cpp
index 937da45..e667d1d 100644
--- a/src/helpers/CWptIconDialog.cpp
+++ b/src/helpers/CWptIconDialog.cpp
@@ -129,6 +129,7 @@ void CWptIconDialog::setupList(QObject * obj)
QString path = cfg.value("Paths/externalWptIcons", IAppSetup::getPlatformInstance()->userDataPath("WaypointIcons")).toString();
labelIconPath->setProperty("path", path);
labelIconPath->setText(path.size() > 25 ? "..." + path.right(22) : path);
+ labelIconPath->setToolTip(path);
adjustSize();
}
diff --git a/src/helpers/IWptIconDialog.ui b/src/helpers/IWptIconDialog.ui
index 8269468..f7c006a 100644
--- a/src/helpers/IWptIconDialog.ui
+++ b/src/helpers/IWptIconDialog.ui
@@ -92,7 +92,7 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
- <string>All custom icons have to be *.bmp format.</string>
+ <string>All custom icons have to be *.bmp or *.png format.</string>
</property>
</widget>
</item>
diff --git a/src/icons/32x32/AreaOn.png b/src/icons/32x32/AreaOn.png
new file mode 100644
index 0000000..082f468
Binary files /dev/null and b/src/icons/32x32/AreaOn.png differ
diff --git a/src/icons/32x32/RouteOn.png b/src/icons/32x32/RouteOn.png
new file mode 100644
index 0000000..4d29ee7
Binary files /dev/null and b/src/icons/32x32/RouteOn.png differ
diff --git a/src/icons/32x32/SQLiteNoConn.png b/src/icons/32x32/SQLiteNoConn.png
new file mode 100644
index 0000000..b702b6c
Binary files /dev/null and b/src/icons/32x32/SQLiteNoConn.png differ
diff --git a/src/icons/32x32/TrackOn.png b/src/icons/32x32/TrackOn.png
new file mode 100644
index 0000000..14f6925
Binary files /dev/null and b/src/icons/32x32/TrackOn.png differ
diff --git a/src/icons/32x32/Waypoint.png b/src/icons/32x32/Waypoint.png
new file mode 100644
index 0000000..d52a006
Binary files /dev/null and b/src/icons/32x32/Waypoint.png differ
diff --git a/src/icons/32x32/WaypointOn.png b/src/icons/32x32/WaypointOn.png
new file mode 100644
index 0000000..b6fccff
Binary files /dev/null and b/src/icons/32x32/WaypointOn.png differ
diff --git a/src/icons/48x48/AreaOn.png b/src/icons/48x48/AreaOn.png
new file mode 100644
index 0000000..660a03e
Binary files /dev/null and b/src/icons/48x48/AreaOn.png differ
diff --git a/src/icons/48x48/RouteOn.png b/src/icons/48x48/RouteOn.png
new file mode 100644
index 0000000..f082313
Binary files /dev/null and b/src/icons/48x48/RouteOn.png differ
diff --git a/src/icons/48x48/SQLiteNoConn.png b/src/icons/48x48/SQLiteNoConn.png
new file mode 100644
index 0000000..e39ebbb
Binary files /dev/null and b/src/icons/48x48/SQLiteNoConn.png differ
diff --git a/src/icons/48x48/TrackOn.png b/src/icons/48x48/TrackOn.png
new file mode 100644
index 0000000..b451c27
Binary files /dev/null and b/src/icons/48x48/TrackOn.png differ
diff --git a/src/icons/48x48/Waypoint.png b/src/icons/48x48/Waypoint.png
new file mode 100644
index 0000000..cef3e64
Binary files /dev/null and b/src/icons/48x48/Waypoint.png differ
diff --git a/src/icons/48x48/WaypointOn.png b/src/icons/48x48/WaypointOn.png
new file mode 100644
index 0000000..ad32b80
Binary files /dev/null and b/src/icons/48x48/WaypointOn.png differ
diff --git a/src/icons/AreaOn.svg b/src/icons/AreaOn.svg
new file mode 100644
index 0000000..d37d3da
--- /dev/null
+++ b/src/icons/AreaOn.svg
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+ 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:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="64px"
+ height="64px"
+ id="svg3377"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="AreaOn.svg">
+ <defs
+ id="defs3379">
+ <pattern
+ inkscape:collect="always"
+ xlink:href="#Strips1_4"
+ id="pattern6173"
+ patternTransform="matrix(1.0647681,0.75352479,-4.886427,5.4556167,0.19082391,7.1447686)" />
+ <pattern
+ inkscape:stockid="Stripes 1:4"
+ id="Strips1_4"
+ patternTransform="translate(0,0) scale(10,10)"
+ height="1"
+ width="5"
+ patternUnits="userSpaceOnUse"
+ inkscape:collect="always">
+ <rect
+ id="rect4528"
+ height="2"
+ width="1"
+ y="-0.5"
+ x="0"
+ style="fill:black;stroke:none" />
+ </pattern>
+ <pattern
+ inkscape:stockid="Sand (bitmap)"
+ id="pattern6165"
+ height="256"
+ width="256"
+ patternUnits="userSpaceOnUse">
+ <!-- Seamless texture provided by FreeSeamlessTextures.com -->
+ <!-- License: creative commons attribution -->
+ <image
+ xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAQIAIwAjAAD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEB AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wAARCAEEAQQDASIA AhEBAxEB/8QAHQAAAgIDAQEBAAAAAAAAAAAABgcFCAADBAkBAv/EAEIQAAICAAUDBAECBAQFAwEI AwUGBAcBAwgVFgAXJQIRFCYnITUYJDZFEzE3RgkSQVVWKFF1ZTQ4R1dhZmd2hYaV/8QAGQEAAgMB AAAAAAAAAAAAAAAAAgMAAQQF/8QAOxEAAgIBAwMDBAEBBgUDBQEAAQIDERIEEyE [...]
+ y="0"
+ x="0"
+ id="image6167"
+ height="260"
+ width="260" />
+ </pattern>
+ <pattern
+ inkscape:stockid="Sand (bitmap)"
+ id="pattern6153"
+ height="256"
+ width="256"
+ patternUnits="userSpaceOnUse">
+ <!-- Seamless texture provided by FreeSeamlessTextures.com -->
+ <!-- License: creative commons attribution -->
+ <image
+ xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAQIAIwAjAAD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEB AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wAARCAEEAQQDASIA AhEBAxEB/8QAHQAAAgIDAQEBAAAAAAAAAAAABgcFCAADBAkBAv/EAEIQAAICAAUDBAECBAQFAwEI AwUGBAcBAwgVFgAXJQIRFCYnITUYJDZFEzE3RgkSQVVWKFF1ZTQ4R1dhZmd2hYaV/8QAGQEAAgMB AAAAAAAAAAAAAAAAAgMAAQQF/8QAOxEAAgIBAwMDBAEBBgUDBQEAAQIDERIEEyE [...]
+ y="0"
+ x="0"
+ id="image6155"
+ height="260"
+ width="260" />
+ </pattern>
+ <linearGradient
+ id="linearGradient6147"
+ osb:paint="solid">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop6149" />
+ </linearGradient>
+ <pattern
+ inkscape:stockid="Sand (bitmap)"
+ id="pattern6139"
+ height="256"
+ width="256"
+ patternUnits="userSpaceOnUse">
+ <!-- Seamless texture provided by FreeSeamlessTextures.com -->
+ <!-- License: creative commons attribution -->
+ <image
+ xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAQIAIwAjAAD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEB AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wAARCAEEAQQDASIA AhEBAxEB/8QAHQAAAgIDAQEBAAAAAAAAAAAABgcFCAADBAkBAv/EAEIQAAICAAUDBAECBAQFAwEI AwUGBAcBAwgVFgAXJQIRFCYnITUYJDZFEzE3RgkSQVVWKFF1ZTQ4R1dhZmd2hYaV/8QAGQEAAgMB AAAAAAAAAAAAAAAAAgMAAQQF/8QAOxEAAgIBAwMDBAEBBgUDBQEAAQIDERIEEyE [...]
+ y="0"
+ x="0"
+ id="image6141"
+ height="260"
+ width="260" />
+ </pattern>
+ <linearGradient
+ id="linearGradient6133"
+ osb:paint="solid">
+ <stop
+ style="stop-color:#000080;stop-opacity:1;"
+ offset="0"
+ id="stop6135" />
+ </linearGradient>
+ <pattern
+ inkscape:stockid="Sand (bitmap)"
+ id="pattern5660"
+ height="256"
+ width="256"
+ patternUnits="userSpaceOnUse">
+ <!-- Seamless texture provided by FreeSeamlessTextures.com -->
+ <!-- License: creative commons attribution -->
+ <image
+ xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAQIAIwAjAAD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEB AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wAARCAEEAQQDASIA AhEBAxEB/8QAHQAAAgIDAQEBAAAAAAAAAAAABgcFCAADBAkBAv/EAEIQAAICAAUDBAECBAQFAwEI AwUGBAcBAwgVFgAXJQIRFCYnITUYJDZFEzE3RgkSQVVWKFF1ZTQ4R1dhZmd2hYaV/8QAGQEAAgMB AAAAAAAAAAAAAAAAAgMAAQQF/8QAOxEAAgIBAwMDBAEBBgUDBQEAAQIDERIEEyE [...]
+ y="0"
+ x="0"
+ id="image5662"
+ height="260"
+ width="260" />
+ </pattern>
+ <pattern
+ inkscape:stockid="Sand (bitmap)"
+ id="sand_bitmap"
+ height="256"
+ width="256"
+ patternUnits="userSpaceOnUse">
+ <!-- Seamless texture provided by FreeSeamlessTextures.com -->
+ <!-- License: creative commons attribution -->
+ <image
+ xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAQIAIwAjAAD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEB AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wAARCAEEAQQDASIA AhEBAxEB/8QAHQAAAgIDAQEBAAAAAAAAAAAABgcFCAADBAkBAv/EAEIQAAICAAUDBAECBAQFAwEI AwUGBAcBAwgVFgAXJQIRFCYnITUYJDZFEzE3RgkSQVVWKFF1ZTQ4R1dhZmd2hYaV/8QAGQEAAgMB AAAAAAAAAAAAAAAAAgMAAQQF/8QAOxEAAgIBAwMDBAEBBgUDBQEAAQIDERIEEyE [...]
+ y="0"
+ x="0"
+ id="image9"
+ height="260"
+ width="260" />
+ </pattern>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11"
+ inkscape:cx="30.647903"
+ inkscape:cy="27.46309"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:document-units="px"
+ inkscape:grid-bbox="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="972"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid3416" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata3382">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <g
+ id="g3801"
+ style="fill:#000080;stroke:#000080"
+ transform="matrix(0.97337577,0,0,0.97349304,27.017654,2.5790254)">
+ <path
+ inkscape:connector-curvature="0"
+ id="path3015"
+ d="m 4.1627317,12.624625 a 0.50005,0.50005 0 0 0 -0.125,0.03125 l -19.5312497,8.6875 a 0.50005,0.50005 0 0 0 -0.3125,0.46875 l 0,30.375 a 0.50005,0.50005 0 0 0 0.5,0.5 l 24.4374997,0 a 0.50005,0.50005 0 0 0 0.125,0 l 14.6562503,-4.34375 a 0.50005,0.50005 0 0 0 0.34375,-0.65625 l -4.78125,-12.6875 4.625,-4.125 a 0.50005,0.50005 0 0 0 0.1875,-0.375 l 0,-13.03125 a 0.50005,0.50005 0 0 0 -0.40625,-0.5 L 4.3502317,12.624625 a 0.50005,0.50005 0 0 0 -0.1875,0 z m 0.125,1.03125 19.00000 [...]
+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#00008 [...]
+ <g
+ style="fill:#000080;stroke:#000080"
+ transform="translate(-25.249389,-1.9115885)"
+ id="g3788">
+ <path
+ style="fill:#000080;stroke:#000080"
+ d="m 10.468663,35.533491 0.0011,-0.907025 1.794324,-2.002659 c 0.986878,-1.101462 1.889855,-2.103734 2.006615,-2.227273 0.11676,-0.123537 1.303124,-1.446933 2.636364,-2.940881 1.333239,-1.493946 3.981505,-4.459855 5.885035,-6.590908 l 3.460964,-3.874642 1.206454,-0.529553 c 0.663549,-0.291254 1.227768,-0.508238 1.253819,-0.482187 0.02605,0.02605 -0.480618,0.632531 -1.125929,1.347734 -0.645313,0.715203 -1.660093,1.852642 -2.255069,2.527642 -1.179948,1.338652 -4.264587,4.794291 [...]
+ id="path3001"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:#000080;fill-opacity:1;stroke:#000080"
+ d="m 10.512987,25.801348 0,-0.912497 0.676485,-0.75392 c 0.669545,-0.746185 0.68923,-0.759515 1.918868,-1.299374 0.683311,-0.3 1.286739,-0.561706 1.340952,-0.58157 0.08188,-0.03 -1.626642,1.912192 -3.496977,3.97526 l -0.439328,0.484599 0,-0.912498 z"
+ id="path3771"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:#000080;fill-opacity:1;stroke:#000080"
+ d="m 10.512987,45.247809 0,-0.892434 2.113636,-2.348424 c 2.536074,-2.817788 6.282044,-7.003613 9.033665,-10.094403 2.112387,-2.372765 5.655683,-6.330505 8.943608,-9.989702 1.687459,-1.878007 2.705109,-3.004219 4.288115,-4.745566 l 0.350492,-0.385549 0.676321,0.14861 0.676321,0.148611 -0.381988,0.428073 c -0.210094,0.23544 -1.486534,1.654496 -2.836534,3.153458 -2.580782,2.86555 -5.303298,5.904681 -12.933681,14.437801 -6.842795,7.652355 -8.898229,9.941657 -9.441696,10.515979 l [...]
+ id="path3773"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:#000080;fill-opacity:1;stroke:#000080"
+ d="m 11.058441,53.476308 c 0,-0.02259 0.930682,-1.081981 2.068182,-2.354209 1.1375,-1.272228 2.973156,-3.329885 4.079234,-4.572569 2.474647,-2.780278 6.199907,-6.937314 9.80713,-10.943824 3.066224,-3.405627 7.067968,-7.873673 9.045454,-10.099473 1.496762,-1.68471 5.038327,-5.651833 5.823722,-6.523504 l 0.522684,-0.580102 0.600653,0.113336 c 0.330359,0.06233 0.622405,0.148531 0.648991,0.191549 0.02659,0.04302 -0.747306,0.968971 -1.719761,2.057675 -5.188416,5.808642 -11.361413,1 [...]
+ id="path3775"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:#000080;fill-opacity:1;stroke:#000080"
+ d="m 20.898547,52.176466 c 3.427101,-3.792503 7.309629,-8.12602 12.205349,-13.623109 1.55,-1.740395 3.738636,-4.187444 4.863636,-5.437886 1.125,-1.250443 2.986364,-3.320237 4.136364,-4.599541 1.15,-1.279305 2.954191,-3.285286 4.009314,-4.457737 1.055122,-1.17245 2.025421,-2.254454 2.156218,-2.404454 l 0.237813,-0.272727 0.0029,0.918764 0.0029,0.918764 -1.340909,1.485769 c -3.565476,3.950659 -7.207054,8.012391 -16.092707,17.94943 -5.271092,5.894789 -6.91632,7.729128 -8.581756,9 [...]
+ id="path3777"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:#000080;fill-opacity:1;stroke:#000080"
+ d="m 28.481159,53.403739 c 0.07303,-0.118882 2.759666,-3.13503 5.482594,-6.155036 0.877079,-0.97277 2.535598,-2.815632 3.685598,-4.095249 1.15,-1.279617 2.947148,-3.277758 3.993662,-4.440313 l 1.902753,-2.113737 0.210884,0.560962 c 0.115985,0.308529 0.210882,0.612564 0.210882,0.675634 0,0.06307 -0.439772,0.604195 -0.977272,1.202501 -0.5375,0.598307 -2.204546,2.450697 -3.704546,4.116423 -4.253858,4.72384 -7.655309,8.52319 -8.490936,9.484202 l -0.763664,0.878249 -0.809883,0 c -0 [...]
+ id="path3779"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:#000080;fill-opacity:1;stroke:#000080"
+ d="m 38.393503,52.123964 c 0.10102,-0.128427 0.779887,-0.900403 1.508592,-1.715501 3.844146,-4.2999 5.423129,-6.075823 5.788277,-6.510227 l 0.404657,-0.481407 0.252902,0.658443 c 0.213873,0.556829 0.234168,0.680332 0.131507,0.800273 -0.322277,0.376525 -5.658982,6.355315 -5.865754,6.571492 -0.164348,0.171823 -0.501959,0.327683 -1.100697,0.508144 -0.475,0.143166 -0.962529,0.292249 -1.083398,0.331294 l -0.219761,0.07099 0.183675,-0.233504 z"
+ id="path3781"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
+ <path
+ style="fill:#008000;stroke:#ffffff;stroke-width:1.42415118;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path4189"
+ sodipodi:type="arc"
+ sodipodi:cx="41.145531"
+ sodipodi:cy="44.360138"
+ sodipodi:rx="9.2879"
+ sodipodi:ry="9.2879229"
+ sodipodi:start="3.1402313"
+ sodipodi:end="3.1371421"
+ sodipodi:open="true"
+ d="m 31.857639,44.372782 a 9.2879,9.2879229 0 0 1 9.268075,-9.300546 9.2879,9.2879229 0 0 1 9.307677,9.260912 9.2879,9.2879229 0 0 1 -9.253697,9.31485 9.2879,9.2879229 0 0 1 -9.321971,-9.246524" />
+ </g>
+</svg>
diff --git a/src/icons/Route.svg b/src/icons/Route.svg
index 5870a62..a6067ed 100644
--- a/src/icons/Route.svg
+++ b/src/icons/Route.svg
@@ -11,7 +11,7 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg2"
version="1.1"
- inkscape:version="0.48.5 r10040"
+ inkscape:version="0.91 r13725"
width="64"
height="67"
sodipodi:docname="Route.svg">
@@ -39,14 +39,14 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
- inkscape:window-height="996"
+ inkscape:window-height="972"
id="namedview4"
showgrid="true"
inkscape:zoom="3.5223881"
- inkscape:cx="-33.154661"
- inkscape:cy="33.5"
- inkscape:window-x="-2"
- inkscape:window-y="-3"
+ inkscape:cx="113.30969"
+ inkscape:cy="56.211865"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg2">
<inkscape:grid
diff --git a/src/icons/RouteOn.svg b/src/icons/RouteOn.svg
new file mode 100644
index 0000000..5a78fd9
--- /dev/null
+++ b/src/icons/RouteOn.svg
@@ -0,0 +1,116 @@
+<?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"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ width="64"
+ height="67"
+ sodipodi:docname="RouteOn.svg">
+ <metadata
+ id="metadata8">
+ <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>
+ <defs
+ id="defs6" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="972"
+ id="namedview4"
+ showgrid="true"
+ inkscape:zoom="3.5223881"
+ inkscape:cx="113.30969"
+ inkscape:cy="56.211865"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2982" />
+ </sodipodi:namedview>
+ <g
+ id="g4174"
+ transform="matrix(0.72727272,0,0,0.66666667,13.047669,12.717514)">
+ <path
+ inkscape:connector-curvature="0"
+ id="path3036"
+ d="M 15,12 50,32 20,52"
+ style="fill:none;stroke:#000080;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ transform="matrix(1.3333333,0,0,1.3333333,-1.6666667,-7.3333333)"
+ sodipodi:open="true"
+ sodipodi:end="6.2789689"
+ sodipodi:start="0"
+ d="m 20,14.5 a 7.5,7.5 0 0 1 -7.492094,7.499996 7.5,7.5 0 0 1 -7.5078893,-7.484184 7.5,7.5 0 0 1 7.4762663,-7.5157745 7.5,7.5 0 0 1 7.52365,7.4683395"
+ sodipodi:ry="7.5"
+ sodipodi:rx="7.5"
+ sodipodi:cy="14.5"
+ sodipodi:cx="12.5"
+ id="path2984"
+ style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(1.3333333,0,0,1.3333333,33.333334,12.666667)"
+ sodipodi:open="true"
+ sodipodi:end="6.2789689"
+ sodipodi:start="0"
+ d="m 20,14.5 a 7.5,7.5 0 0 1 -7.492094,7.499996 7.5,7.5 0 0 1 -7.5078893,-7.484184 7.5,7.5 0 0 1 7.4762663,-7.5157745 7.5,7.5 0 0 1 7.52365,7.4683395"
+ sodipodi:ry="7.5"
+ sodipodi:rx="7.5"
+ sodipodi:cy="14.5"
+ sodipodi:cx="12.5"
+ id="path2984-8"
+ style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(1.3333333,0,0,1.3333333,3.3333338,32.666667)"
+ sodipodi:open="true"
+ sodipodi:end="6.2789689"
+ sodipodi:start="0"
+ d="m 20,14.5 a 7.5,7.5 0 0 1 -7.492094,7.499996 7.5,7.5 0 0 1 -7.5078893,-7.484184 7.5,7.5 0 0 1 7.4762663,-7.5157745 7.5,7.5 0 0 1 7.52365,7.4683395"
+ sodipodi:ry="7.5"
+ sodipodi:rx="7.5"
+ sodipodi:cy="14.5"
+ sodipodi:cx="12.5"
+ id="path2984-0"
+ style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ sodipodi:type="arc" />
+ </g>
+ <path
+ style="fill:#008000;stroke:#ffffff;stroke-width:1.42415118;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path4189"
+ sodipodi:type="arc"
+ sodipodi:cx="46.684055"
+ sodipodi:cy="44.050846"
+ sodipodi:rx="9.2879"
+ sodipodi:ry="9.2879229"
+ sodipodi:start="3.1402313"
+ sodipodi:end="3.1371421"
+ sodipodi:open="true"
+ d="m 37.396164,44.06349 a 9.2879,9.2879229 0 0 1 9.268074,-9.300546 9.2879,9.2879229 0 0 1 9.307678,9.260912 9.2879,9.2879229 0 0 1 -9.253697,9.31485 9.2879,9.2879229 0 0 1 -9.321972,-9.246524" />
+</svg>
diff --git a/src/icons/SQLiteNoConn.svg b/src/icons/SQLiteNoConn.svg
new file mode 100644
index 0000000..9f6c4a8
--- /dev/null
+++ b/src/icons/SQLiteNoConn.svg
@@ -0,0 +1,187 @@
+<?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="SQLiteNoConn.svg">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="7.229447"
+ inkscape:cx="26.124988"
+ inkscape:cy="17.895333"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1916"
+ inkscape:window-height="1041"
+ inkscape:window-x="0"
+ inkscape:window-y="18"
+ inkscape:window-maximized="0"
+ inkscape:snap-text-baseline="false">
+ <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> <g
+ id="g3856"
+ transform="matrix(0.69904187,0,0,0.76693067,9.7429075,993.52947)"
+ style="stroke:#80b3ff;stroke-width:3.38945651;stroke-miterlimit:4;stroke-dasharray:none">
+ <path
+ transform="matrix(0.97628959,0,0,0.90577639,0.75264714,41.745822)"
+ sodipodi:open="true"
+ sodipodi:end="5.8029047"
+ sodipodi:start="5.8033439"
+ d="m 47.741363,16.691808 a 20,5 0 0 1 -8.506645,6.743279 20,5 0 0 1 -26.974053,-2.125921 20,5 0 0 1 8.500722,-6.743746 20,5 0 0 1 26.975919,2.12444"
+ sodipodi:ry="5"
+ sodipodi:rx="20"
+ sodipodi:cy="19"
+ sodipodi:cx="30"
+ id="path3012-6"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#80b3ff;stroke-width:3.60437727;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ sodipodi:type="arc" />
+ <rect
+ y="18.943857"
+ x="10.056155"
+ height="40"
+ width="40"
+ id="rect3032"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#80b3ff" />
+ <path
+ transform="matrix(0.97628959,0,0,0.90577639,0.75264717,1.7458229)"
+ sodipodi:open="true"
+ sodipodi:end="5.8029047"
+ sodipodi:start="5.8033439"
+ d="m 47.741363,16.691808 a 20,5 0 0 1 -8.506645,6.743279 20,5 0 0 1 -26.974053,-2.125921 20,5 0 0 1 8.500722,-6.743746 20,5 0 0 1 26.975919,2.12444"
+ sodipodi:ry="5"
+ sodipodi:rx="20"
+ sodipodi:cy="19"
+ sodipodi:cx="30"
+ id="path3012"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#80b3ff;stroke-width:3.60437727;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"
+ transform="matrix(0.9793945,0,0,0.87054856,0.71290745,12.690707)"
+ sodipodi:end="3.0635271"
+ sodipodi:start="0.063511676"
+ d="M 49.959676,19.317345 A 20,5 0 0 1 30.145537,23.999868 20,5 0 0 1 10.060911,19.389931"
+ sodipodi:ry="5"
+ sodipodi:rx="20"
+ sodipodi:cy="19"
+ sodipodi:cx="30"
+ id="path3012-0"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#80b3ff;stroke-width:3.67074943;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"
+ transform="matrix(0.9793945,0,0,0.87054856,0.6219979,22.236163)"
+ sodipodi:end="3.0635271"
+ sodipodi:start="0.063511676"
+ d="M 49.959676,19.317345 A 20,5 0 0 1 30.145537,23.999868 20,5 0 0 1 10.060911,19.389931"
+ sodipodi:ry="5"
+ sodipodi:rx="20"
+ sodipodi:cy="19"
+ sodipodi:cx="30"
+ id="path3012-0-2"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#80b3ff;stroke-width:3.67074943;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"
+ transform="matrix(0.9793945,0,0,0.87054856,0.71290699,32.327076)"
+ sodipodi:end="3.0635271"
+ sodipodi:start="0.063511676"
+ d="M 49.959676,19.317345 A 20,5 0 0 1 30.145537,23.999868 20,5 0 0 1 10.060911,19.389931"
+ sodipodi:ry="5"
+ sodipodi:rx="20"
+ sodipodi:cy="19"
+ sodipodi:cx="30"
+ id="path3012-0-1"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#80b3ff;stroke-width:3.67074943;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ sodipodi:type="arc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3084"
+ d="m 10.454545,19 0,40"
+ style="fill:#ffffff;stroke:#80b3ff;stroke-width:3.38945651;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3086"
+ d="m 49.545455,19 0,40"
+ style="fill:#ffffff;stroke:#80b3ff;stroke-width:3.38945651;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:15.84499073px;line-height:120.00000477%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000080;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ x="-706.11664"
+ y="732.60388"
+ id="text3350"
+ sodipodi:linespacing="120%"
+ transform="matrix(0.68925322,-0.7254228,0.68925322,0.7254228,0,0)"><tspan
+ sodipodi:role="line"
+ id="tspan3352"
+ x="-706.11664"
+ y="732.60388"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:15.84499073px;line-height:120.00000477%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000080">SQLite</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ x="31.533443"
+ y="1043.2921"
+ id="text4149"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan4151"
+ x="31.533443"
+ y="1043.2921"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Sans;-inkscape-font-specification:'Sans Bold'">x</tspan></text>
+ </g>
+</svg>
diff --git a/src/icons/Track.svg b/src/icons/Track.svg
index 83d4d83..268b4b6 100644
--- a/src/icons/Track.svg
+++ b/src/icons/Track.svg
@@ -25,14 +25,14 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="5.5"
- inkscape:cx="-8.7272727"
+ inkscape:cx="-49.454545"
inkscape:cy="32"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:window-width="1920"
- inkscape:window-height="985"
+ inkscape:window-height="972"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1">
diff --git a/src/icons/Track.svg b/src/icons/TrackOn.svg
similarity index 86%
copy from src/icons/Track.svg
copy to src/icons/TrackOn.svg
index 83d4d83..6bfbbbc 100644
--- a/src/icons/Track.svg
+++ b/src/icons/TrackOn.svg
@@ -14,7 +14,7 @@
id="svg3377"
version="1.1"
inkscape:version="0.91 r13725"
- sodipodi:docname="Track.svg">
+ sodipodi:docname="TrackOn.svg">
<defs
id="defs3379" />
<sodipodi:namedview
@@ -24,15 +24,15 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="5.5"
- inkscape:cx="-8.7272727"
- inkscape:cy="32"
+ inkscape:zoom="2.8284271"
+ inkscape:cx="48.479685"
+ inkscape:cy="19.715729"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:window-width="1920"
- inkscape:window-height="985"
+ inkscape:window-height="972"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1">
@@ -48,7 +48,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>
@@ -58,7 +58,7 @@
inkscape:groupmode="layer">
<g
id="g3937"
- transform="matrix(0.46114505,0,0,0.60404216,-167.21055,-32.539512)"
+ transform="matrix(0.52705344,0,0,0.69038707,-188.26124,-44.162668)"
inkscape:export-filename="/home/oeichler/Code/android/QLandkarteM/QLandkarteM/icons/48x48/record.png"
inkscape:export-xdpi="123.42857"
inkscape:export-ydpi="123.42857"
@@ -77,7 +77,7 @@
sodipodi:ry="7"
d="m 416.9824,87.362205 a 7,7 0 0 1 6.07773,3.496442 7,7 0 0 1 -0.003,7.0117 7,7 0 0 1 -6.08041,3.491803 L 417,94.362183 Z"
sodipodi:start="4.7098749"
- sodipodi:end="7.8572596"
+ sodipodi:end="1.5740743"
transform="matrix(2.8638155,0,0,0.95340127,-777.28343,4.421604)" />
<path
sodipodi:type="arc"
@@ -106,7 +106,7 @@
sodipodi:ry="7"
d="m 416.9824,87.362205 a 7,7 0 0 1 6.07773,3.496442 7,7 0 0 1 -0.003,7.0117 7,7 0 0 1 -6.08041,3.491803 L 417,94.362183 Z"
sodipodi:start="4.7098749"
- sodipodi:end="7.8572596"
+ sodipodi:end="1.5740743"
transform="matrix(2.8638155,0,0,0.95340127,-777.28343,4.421604)" />
<path
sodipodi:type="arc"
@@ -135,7 +135,7 @@
sodipodi:ry="7"
d="m 416.9824,87.362205 a 7,7 0 0 1 6.07773,3.496442 7,7 0 0 1 -0.003,7.0117 7,7 0 0 1 -6.08041,3.491803 L 417,94.362183 Z"
sodipodi:start="4.7098749"
- sodipodi:end="7.8572596"
+ sodipodi:end="1.5740743"
transform="matrix(2.8638155,0,0,0.95340127,-777.28343,4.421604)" />
<path
sodipodi:type="arc"
@@ -164,7 +164,7 @@
sodipodi:ry="7"
d="m 416.9824,87.362205 a 7,7 0 0 1 6.07773,3.496442 7,7 0 0 1 -0.003,7.0117 7,7 0 0 1 -6.08041,3.491803 L 417,94.362183 Z"
sodipodi:start="4.7098749"
- sodipodi:end="7.8572596"
+ sodipodi:end="1.5740743"
transform="matrix(2.8638155,0,0,0.95340127,-777.28343,4.421604)" />
<path
sodipodi:type="arc"
@@ -180,5 +180,17 @@
transform="matrix(2.1833386,0,0,1.0380416,-476.38942,-0.97014023)" />
</g>
</g>
+ <path
+ style="fill:#008000;stroke:#ffffff;stroke-width:1.42415118;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path4189"
+ sodipodi:type="arc"
+ sodipodi:cx="50.043594"
+ sodipodi:cy="38.772476"
+ sodipodi:rx="9.2879"
+ sodipodi:ry="9.2879229"
+ sodipodi:start="3.1402313"
+ sodipodi:end="3.1371421"
+ sodipodi:open="true"
+ d="m 40.755703,38.78512 a 9.2879,9.2879229 0 0 1 9.268074,-9.300546 9.2879,9.2879229 0 0 1 9.307678,9.260912 9.2879,9.2879229 0 0 1 -9.253697,9.31485 9.2879,9.2879229 0 0 1 -9.321972,-9.246524" />
</g>
</svg>
diff --git a/src/icons/Waypoint.svg b/src/icons/Waypoint.svg
new file mode 100644
index 0000000..0d9dd39
--- /dev/null
+++ b/src/icons/Waypoint.svg
@@ -0,0 +1,82 @@
+<?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="Waypoint.svg">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="7.9195959"
+ inkscape:cx="-22.673418"
+ inkscape:cy="22.814764"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="972"
+ 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.36215)">
+ <path
+ style="fill:#000080;stroke:#000080;stroke-width:1.34993112;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 16.875788,998.65233 25.339695,10.78737 -28.507157,10.7873 3.167462,-21.57467"
+ id="path3763"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:#000000;stroke:#000000;stroke-width:0.71901649px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+ d="m 10.325373,1037.1836 3.609174,-39.39145 3.609174,0 z"
+ id="path3761"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ <rect
+ style="fill:none;stroke:none"
+ id="rect3769"
+ width="40"
+ height="40"
+ x="9.9636908"
+ y="997.48792" />
+ </g>
+</svg>
diff --git a/src/icons/WaypointOn.svg b/src/icons/WaypointOn.svg
new file mode 100644
index 0000000..8c36c59
--- /dev/null
+++ b/src/icons/WaypointOn.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="64"
+ height="64"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="WaypointOn.svg">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="7.0050283"
+ inkscape:cx="-19.519785"
+ inkscape:cy="12.821355"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="972"
+ 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.36215)">
+ <g
+ id="g4183"
+ transform="translate(0,8.1693123)">
+ <g
+ id="g4171">
+ <path
+ style="fill:#000080;stroke:#000080;stroke-width:1.34993112;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 16.875788,998.65233 25.339695,10.78737 -28.507157,10.7873 3.167462,-21.57467"
+ id="path3763"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:#000000;stroke:#000000;stroke-width:0.71901649px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+ d="m 10.325373,1037.1836 3.609174,-39.39145 3.609174,0 z"
+ id="path3761"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ </g>
+ <rect
+ y="997.55298"
+ x="9.9636908"
+ height="40"
+ width="40"
+ id="rect3769"
+ style="fill:none;stroke:none" />
+ </g>
+ <path
+ style="fill:#008000;stroke:#ffffff;stroke-width:1.42415118;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path4189"
+ sodipodi:type="arc"
+ sodipodi:cx="39.963715"
+ sodipodi:cy="1035.7223"
+ sodipodi:rx="9.2879"
+ sodipodi:ry="9.2879229"
+ sodipodi:start="3.1402313"
+ sodipodi:end="3.1371421"
+ sodipodi:open="true"
+ d="m 30.675823,1035.7349 a 9.2879,9.2879229 0 0 1 9.268074,-9.3005 9.2879,9.2879229 0 0 1 9.307678,9.2609 9.2879,9.2879229 0 0 1 -9.253697,9.3149 9.2879,9.2879229 0 0 1 -9.321971,-9.2466" />
+ </g>
+</svg>
diff --git a/src/icons/hicolor/128x128/apps/QMapShack.png b/src/icons/hicolor/128x128/apps/QMapShack.png
new file mode 100644
index 0000000..59f9416
Binary files /dev/null and b/src/icons/hicolor/128x128/apps/QMapShack.png differ
diff --git a/src/icons/hicolor/16x16/apps/QMapShack.png b/src/icons/hicolor/16x16/apps/QMapShack.png
new file mode 100644
index 0000000..a8ef599
Binary files /dev/null and b/src/icons/hicolor/16x16/apps/QMapShack.png differ
diff --git a/src/icons/hicolor/192x192/apps/QMapShack.png b/src/icons/hicolor/192x192/apps/QMapShack.png
new file mode 100644
index 0000000..b8119e3
Binary files /dev/null and b/src/icons/hicolor/192x192/apps/QMapShack.png differ
diff --git a/src/icons/hicolor/22x22/apps/QMapShack.png b/src/icons/hicolor/22x22/apps/QMapShack.png
new file mode 100644
index 0000000..8ef5988
Binary files /dev/null and b/src/icons/hicolor/22x22/apps/QMapShack.png differ
diff --git a/src/icons/hicolor/24x24/apps/QMapShack.png b/src/icons/hicolor/24x24/apps/QMapShack.png
new file mode 100644
index 0000000..2bfe85f
Binary files /dev/null and b/src/icons/hicolor/24x24/apps/QMapShack.png differ
diff --git a/src/icons/hicolor/256x256/apps/QMapShack.png b/src/icons/hicolor/256x256/apps/QMapShack.png
new file mode 100644
index 0000000..e42064b
Binary files /dev/null and b/src/icons/hicolor/256x256/apps/QMapShack.png differ
diff --git a/src/icons/hicolor/32x32/apps/QMapShack.png b/src/icons/hicolor/32x32/apps/QMapShack.png
new file mode 100644
index 0000000..420965c
Binary files /dev/null and b/src/icons/hicolor/32x32/apps/QMapShack.png differ
diff --git a/src/icons/hicolor/36x36/apps/QMapShack.png b/src/icons/hicolor/36x36/apps/QMapShack.png
new file mode 100644
index 0000000..41df7c9
Binary files /dev/null and b/src/icons/hicolor/36x36/apps/QMapShack.png differ
diff --git a/src/icons/hicolor/40x40/apps/QMapShack.png b/src/icons/hicolor/40x40/apps/QMapShack.png
new file mode 100644
index 0000000..37cb7ea
Binary files /dev/null and b/src/icons/hicolor/40x40/apps/QMapShack.png differ
diff --git a/src/icons/hicolor/42x42/apps/QMapShack.png b/src/icons/hicolor/42x42/apps/QMapShack.png
new file mode 100644
index 0000000..cd85a7d
Binary files /dev/null and b/src/icons/hicolor/42x42/apps/QMapShack.png differ
diff --git a/src/icons/hicolor/48x48/apps/QMapShack.png b/src/icons/hicolor/48x48/apps/QMapShack.png
new file mode 100644
index 0000000..cdf3b77
Binary files /dev/null and b/src/icons/hicolor/48x48/apps/QMapShack.png differ
diff --git a/src/icons/hicolor/512x512/apps/QMapShack.png b/src/icons/hicolor/512x512/apps/QMapShack.png
new file mode 100644
index 0000000..06f70cc
Binary files /dev/null and b/src/icons/hicolor/512x512/apps/QMapShack.png differ
diff --git a/src/icons/hicolor/64x64/apps/QMapShack.png b/src/icons/hicolor/64x64/apps/QMapShack.png
new file mode 100644
index 0000000..013e1d2
Binary files /dev/null and b/src/icons/hicolor/64x64/apps/QMapShack.png differ
diff --git a/src/icons/hicolor/72x72/apps/QMapShack.png b/src/icons/hicolor/72x72/apps/QMapShack.png
new file mode 100644
index 0000000..37fa8df
Binary files /dev/null and b/src/icons/hicolor/72x72/apps/QMapShack.png differ
diff --git a/src/icons/hicolor/80x80/apps/QMapShack.png b/src/icons/hicolor/80x80/apps/QMapShack.png
new file mode 100644
index 0000000..77b612c
Binary files /dev/null and b/src/icons/hicolor/80x80/apps/QMapShack.png differ
diff --git a/src/icons/hicolor/8x8/apps/QMapShack.png b/src/icons/hicolor/8x8/apps/QMapShack.png
new file mode 100644
index 0000000..77fabeb
Binary files /dev/null and b/src/icons/hicolor/8x8/apps/QMapShack.png differ
diff --git a/src/icons/hicolor/96x96/apps/QMapShack.png b/src/icons/hicolor/96x96/apps/QMapShack.png
new file mode 100644
index 0000000..426d660
Binary files /dev/null and b/src/icons/hicolor/96x96/apps/QMapShack.png differ
diff --git a/src/icons/hicolor/scalable/apps/QMapShack.svg b/src/icons/hicolor/scalable/apps/QMapShack.svg
new file mode 100644
index 0000000..14f761c
--- /dev/null
+++ b/src/icons/hicolor/scalable/apps/QMapShack.svg
@@ -0,0 +1,2117 @@
+<?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="149.76425"
+ height="158.90781"
+ id="svg3462"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="QMapShack.svg">
+ <defs
+ id="defs3464" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="2.75"
+ inkscape:cx="0.84106947"
+ inkscape:cy="31.551972"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:document-units="px"
+ inkscape:grid-bbox="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="981"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0" />
+ <metadata
+ id="metadata3467">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ transform="translate(-18.801369,114.11195)">
+ <g
+ id="g5362">
+ <rect
+ y="-112.61195"
+ x="20.301369"
+ height="155.90781"
+ width="146.76425"
+ id="rect3167"
+ style="fill:#ffffff;stroke:#000080;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <g
+ transform="matrix(0.08207728,0,0,0.08432853,97.757513,-36.545624)"
+ id="g5153">
+ <path
+ d="m 498.84632,-32.609374 c -0.583,-0.917 -1.334,-3.333 -1.167,-3.833 0.167,-0.5 1.917,-3.75 1.833,-4.167 -0.084,-0.417 -1.417,-2.417 -1.5,-2.833 -0.083,-0.416 0.667,-1.583 0.667,-1.583 l -1.5,-0.25 c 0,0 2.083,-1.334 2.333,-1.667 0.25,-0.333 -0.75,-2.167 -0.75,-2.167 l 0.417,-2.083 2.083,-0.417 1.5,0.167 c 0,0 2,-1.75 2.25,-2.083 0.25,-0.333 0.5,-1.917 0.5,-1.917 0,0 2.75,3.5 3.417,4.583 0.667,1.083 2.25,3.833 2.167,4.583 -0.083,0.75 -0.167,4.75 -0.167,4.75 l 0.917,-0.167 c 0 [...]
+ id="path3671"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 505.51332,-55.442374 c 0,0 -1.167,-2.917 -1.583,-2.917 -0.416,0 -1.583,-0.75 -1.583,-0.75 l 0.667,-1.417 0.25,-1.917 c 0,0 4.083,-2.417 4.667,-3 0.584,-0.583 4.167,-2.5 4.167,-2.5 l 0.5,-3.417 -0.333,-1 2.167,-3.583 2,-0.917 -1.583,-1.667 -0.667,-1.833 -2,0.333 0.417,1.917 c 0,0 -1.333,1.166 -1.833,1.583 -0.5,0.417 -2.083,2.25 -2.333,2.167 -0.25,-0.083 -2.833,-0.417 -2.833,-0.417 0,0 1.416,1.917 1.083,2.333 -0.333,0.416 -3.083,0 -3.083,0 0,0 -1.667,-0.167 -1.833,-0.583 -0 [...]
+ id="path3675"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 517.76332,-31.48438 c 0,0 1.125,-2.125 1.75,-2.125 0.625,0 4.625,-2.75 4.875,-3.125 0.25,-0.375 1.25,-2.125 1.25,-2.125 0,0 2.625,0.375 3.5,0.375 0.875,0 5.25,-0.25 5.875,-0.375 0.625,-0.125 3,-0.125 3.375,0 0.375,0.125 1.125,-1.25 1.25,-1.875 0.125,-0.625 1.375,-2.875 1.875,-3.125 0.5,-0.25 1,-2.75 1,-2.75 0,0 -0.125,-1.5 0.125,-1.875 0.25,-0.375 2.625,-1 2.625,-1 0,0 -0.625,1.875 -1.125,2.125 -0.5,0.25 -0.625,0.875 -0.25,1.5 0.375,0.625 2.125,-0.25 2.125,-0.25 l 4.25,-2 [...]
+ id="path3677"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 517.51332,-30.35938 -1.875,0.75 -0.875,1.25 -2.125,0.5 -0.875,1.5 0.5,1.875 0.875,1 1,-0.75 1,0.5 0,-2.125 1,1.625 0,2.25 -1.25,0.5 -1.375,1.25 0.75,1.5 1.125,0.25 -1,1.5 1.875,1.125 1,-1.625 -0.25,-1.5 1.25,1.875 -0.125,1.375 1.5,-1.75 0.625,-2.125 -0.375,-1.875 2,-2.5 0.875,-1.5 -1.625,-1.5 -1.5,0.125 0.875,-1.25 -1.75,-0.625 -1.25,-1.625 z"
+ id="path3679"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 522.88832,-27.48438 1.625,0.75 0.375,1.625 1.875,1.125 0.625,-2.375 0.75,-1.125 2.75,0.125 1.125,-0.75 1.375,-1.5 0.25,-1.5 -0.5,-1.625 -2.5,0.125 -1.5,0.625 -0.5,1.625 -1.875,0.5 -1.75,0.375 -0.75,1.375 -1.375,0.625 z"
+ id="path3681"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 557.13832,-71.23438 0,-1.875 0.25,-1.625 -1,-1 0,-1.875 1.375,-1.75 1.5,-0.875 -0.375,-3.375 1.5,2 2,0.375 1.5,-2.5 -0.875,-1.25 1.625,-1.5 -0.625,-1.75 1,-2.5 -0.875,-3.375 2,-2.25 1.75,0.25 0,2 0.625,2.25 2.375,2.375 3.5,1.75 1.375,1.125 0.625,0.75 2.25,-0.375 1.625,-1.625 0.375,2 -0.75,1.875 0.5,1.25 1.125,-0.625 -0.625,1.625 -2.625,1.125 -2,1.125 -1.75,-0.25 -2,0.875 -0.875,2.125 -0.625,2.625 -4.25,-2.375 -1.125,-0.875 -1.75,-1.25 -1.375,1.375 -1.25,0.75 -1.875,-1 -1. [...]
+ id="path3683"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 512.51332,-2.98338 -2.875,0.375 -0.25,1.375 1.625,0.75 1.5,-2.5 z"
+ id="path3685"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 506.13832,4.8916261 -2.25,1.25 -0.375,1 1.875,-0.375 0.75,-1.875 z"
+ id="path3687"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 470.5134,-143.77538 2.667,-4.333 3.333,-0.5 4.833,-0.167 4.333,-1 4,1.833 2.667,2 0.5,-1 3.167,2.833 1.167,3.167 2,4.5 2.333,5.333 1.667,3.5 0,2.833 1.333,1.333 4.167,0.667 2.667,0.5 1.5,3 2,2.167 1.167,-0.333 -0.5,2.167 1.167,1.333 0.333,3 1.167,1.167 3,-0.167 2.667,-0.667 3,-1.333 3.167,-0.833 2.5,-0.5 3.333,-1.167 -1.333,2.667 -0.5,3 -1.5,1.667 -0.667,2.5 -0.5,2.167 -1.667,3.167 -1.333,3.833 -1.5,1.5 0.167,1.667 -2,-0.833 -3.167,-1 -1,0.833 -1.5,2.5 -0.833,0 0.667,3.66 [...]
+ id="path3691"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 431.1384,38.01662 -4.875,-0.625 -3.375,0.75 -0.25,1.5 -1.875,1.75 c 0,0 0.25,2 0.625,2.5 0.375,0.5 3,1.25 3,1.25 0,0 2.375,0.25 2.875,-0.375 0.5,-0.625 1.625,-2.125 1.625,-2.125 l 0.5,-2.375 2,-1 -0.25,-1.25 z"
+ id="path3693"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 477.59632,13.308626 c 0,0 -2.583,0.333 -3,0.833 -0.417,0.5 -2.167,3.75 -2.167,3.75 l -1.75,2.667 -0.167,2.5 1,2.083 1.75,1.833 0,1.5 0.833,-0.25 0.417,-1.916 1.417,-1.917 0.667,-2.917 0.25,-2.666 1.5,-2.084 0.083,-3.25 -0.833,-0.166 z"
+ id="path3695"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 332.17932,-121.60937 2.667,-2.333 3,-0.167 1.167,-2.667 2.833,0.667 1.833,-2.333 3.667,0 2.333,-2 1.667,0.333 0.5,-1 2.167,2.167 5.667,-0.167 2,2.5 1.833,1 4,-0.333 6.667,1.667 2,-0.667 0.667,-5 -1.833,-0.833 -0.333,-3.5 1.5,-4.667 1.833,1.333 1.167,-3.5 3.167,1.667 3.833,1.5 3.5,0.833 0.833,1.5 3.167,0.167 0,3.333 1.667,3.333 3,0.833 3.333,0 2.5,-1 4.667,0.5 1.833,0.667 2.667,0 4.167,3.333 3.5,1.667 7.167,1.667 4.167,0 3.333,-1 2.833,-1.167 3,-1.5 1.5,-2.833 3.5,-1.667 2 [...]
+ id="path3697"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 472.63832,44.01662 2,0.25 0.375,-0.75 2.5,1.5 1.875,-0.625 0.875,0.25 -0.625,1.25 -0.625,0.875 1,2.25 1,1.375 0,2.125 -1.5,1.25 0.25,0.875 -2.5,1.5 -0.125,2.25 -0.875,0.875 1.5,0.75 1,1 0,1.375 -1.625,-0.375 0.375,1.625 1.375,1.25 1.875,-1.5 2.25,0 0.75,1.875 c 0,0 0.75,-1.625 1.125,-1.25 0.375,0.375 2.125,1.625 2.125,1.625 l -1.125,1.125 1,1.5 1.625,1.125 -0.5,1.625 -2.625,-1.375 -1.625,-2.25 -2.25,-1.75 0.5,2.625 -2,-1.5 -1.875,-0.625 c 0,0 -0.5,-0.375 -1.375,0.125 -0.8 [...]
+ id="path3699"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 467.88832,76.39162 -1.125,1.625 -1.5,0.25 1.125,1.125 -0.5,0.875 -1,1.125 -1.125,1.25 -2.375,2.625 -2.375,1.375 -1.5,2.375 -0.625,1.625 1.875,-1.625 2,-0.875 1.375,-1.875 1.875,-1.375 1.125,-2.125 -0.125,-0.875 1.75,0.375 1.25,-1.25 1.625,-1 1,-0.75 -1.875,-0.125 -0.75,-0.625 0.75,-2.125 -0.875,0 z"
+ id="path3701"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 476.01332,68.26662 -1.5,-1 -1.625,-0.375 -1.875,0.5 2.125,1.25 0.5,1.5 0.125,1.75 1.375,1 1.75,-1.25 0.125,-1.625 -0.75,-1 -0.25,-0.75 z"
+ id="path3703"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 484.63832,75.64162 -3.375,0.5 -0.625,-1.375 -1.75,-0.75 0.125,2.5 0.125,1.5 -1.875,1.5 c 0,0 1.25,1.25 1.5,0.875 0.25,-0.375 2.375,-2 2.375,-2 l 1.875,-0.75 0.875,-1 0.75,-1 z"
+ id="path3705"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 488.88832,71.14162 0.5,1.875 1.625,1 1.125,1.125 -0.5,1.375 1.375,1 1.875,0.125 -0.75,-2.125 -0.875,-1.875 0.5,-1.375 -1.875,-1.25 -1.625,-0.125 -1.375,0.25 z"
+ id="path3707"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 484.76332,78.39162 -1.125,0.125 -0.625,0.875 -0.375,2.5 -1.5,0.5 -0.75,0.625 1.625,1.5 1,0.875 c 0,0 -0.125,1.375 0.25,1.25 0.375,-0.125 1.75,-0.75 1.75,-0.75 l -0.875,-1.5 -0.25,-2.5 1.75,-1.375 0.125,-1.75 -1,-0.375 z"
+ id="path3709"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 487.51332,77.64162 -1.25,1.125 0.5,1.5 -0.75,1.375 -1.25,0.875 0.375,1.375 1.5,-0.125 0.75,-0.875 0.625,0.625 2,-0.375 0.125,-1.375 -2.125,-0.25 -0.125,-1.375 0.125,-1.5 -0.5,-1 z"
+ id="path3711"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 489.88832,74.89162 -1.125,0.75 0.5,1.625 -0.25,2.25 1,-0.25 0.75,1 0.5,1.875 1.25,-0.75 0.875,-0.5 -0.75,-2.25 -0.125,-1.25 -2,-1.25 -0.625,-1.25 z"
+ id="path3713"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 485.38832,87.89162 -1.75,1.125 -1.375,0.375 0.875,1.625 -2.625,0.125 -1.5,1.125 -0.125,2.75 0.375,1 -2.25,0.75 2.125,1.75 1.75,-1.25 -0.75,-1.125 -0.25,-0.75 1,-1.5 0.875,-1.5 1.125,1.375 1.5,-0.125 1.125,0.125 -0.5,-1.625 1.125,-0.375 1.5,1.75 1,1.5 -0.875,1.625 1.5,2.625 1.75,0.375 2.25,-0.625 -0.375,1.375 c 0,0 1.25,1.125 1.25,0.375 0,-0.75 0.5,-1.75 0.5,-1.75 l -0.75,-2.125 0.375,-1.25 0.75,-0.875 1.125,1.25 1.125,1.125 0.75,-1.875 0.5,-1.875 -0.625,-2.5 -0.375,-1 0.3 [...]
+ id="path3715"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 475.63832,99.76662 -1.75,-0.375 -1.5,0.75 1.125,1.625 1.25,-1 0.875,-1 z"
+ id="path3717"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 483.88832,70.89162 -0.375,1.5 0,1.125 2.25,-0.5 1.625,0.875 -0.5,-1.75 -1.75,-0.75 -1.25,-0.5 z"
+ id="path3719"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 488.51332,64.39162 0.125,1.5 0.625,0.75 1.75,-1.125 -1.25,-1.625 -1.25,0.5 z"
+ id="path3721"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 393.34632,26.058626 2,1.333 1.333,1.5 0.167,2.167 1,2 4.833,-0.334 0.667,1.5 0.667,1.834 1.333,0.666 -2,1.167 -2,0.5 0,2.5 2,1.5 2.167,1.667 3.167,4.5 2.833,2 1.5,2.333 2,2.167 0,2.333 0.5,1.833 0.167,2.334 0,2 0.667,2.5 0.167,4 -1,1.833 -2.667,1.5 -2.667,0.667 0.333,2 1.167,1.666 -1.833,-0.166 -2.667,-0.334 -1.833,1.334 -2.167,0.666 -1.333,0.167 -1,0.667 2.167,0.666 1,1 1.5,0.167 -1.167,2.667 -0.167,1.666 0,1.834 -0.5,0.666 2.5,-1 1.333,-1.833 1.833,-1.833 2.5,-0.5 -0.5, [...]
+ id="path3723"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 388.01332,29.391626 -1.167,1.833 -2,0.333 0.167,2 -1.167,1 0,1.334 2.333,-0.5 0.167,2.5 2.333,0.833 0.667,3.167 -0.5,2.666 -1,3.5 5,-2.666 2.167,1 1.667,-0.167 0.667,-1.833 1.667,0.5 1.667,1.833 2.333,1.167 1.667,3 0.167,3.166 2.5,3 0.833,3.5 -1.333,1.5 2.667,1.667 2.333,-1.833 2.167,0.5 1.667,-0.833 -0.667,-4.167 0,-2.333 -3.5,-4.5 -3.333,-2.167 -2.667,-4.333 -4.167,-3.167 0,-2.5 3.333,-1.5 -0.667,-0.833 -1.333,-3.334 -4.833,0.334 -1,-2 -0.167,-2.167 -3.333,-2.833 -1.833 [...]
+ id="path3725"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 406.84632,62.057626 -4.167,-0.166 -3.833,0.5 -2.667,0.666 -1,3.334 0.667,2.666 0.333,2.834 -0.333,3.166 1.333,3 1.833,-0.666 -0.5,2.166 0.333,1.167 2,-0.666 1.667,-0.834 4.667,-2 3.833,0.333 -0.833,-3.499 5.333,-2.167 1,-2.375 -0.667,-4.292 -0.167,-3.666 -1.667,0.833 -2.167,-0.5 -2.333,1.833 -2.665,-1.667 z"
+ id="path3727"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 383.26332,96.891626 1.375,0.125 1.125,-1.375 1.25,1.25 1.625,0.25 -0.25,2.25 2.875,-0.875 0.875,-0.125 -2.875,-3.125 -1.625,0.25 -1.375,-1.125 -1.5,-1.125 -1.125,-1 1.125,-0.75 -0.625,-3 -1.125,0.5 -0.625,-3.25 -1.75,0.25 -1.5,-2.25 0.75,-2.875 0.5,-1.5 1,-1.125 0.25,-2.25 1,-1.625 0.25,-0.875 0.75,-0.5 0,-2.875 -0.5,-1.75 0.875,-2.125 2.625,0.5 0.875,-0.625 -0.75,3 0.375,2 2.5,-0.375 1.75,0.25 1.875,1.625 -0.25,1.375 1.875,-1.125 1,1.25 0,-4.25 -1,-3.375 1.292,-3.459 4.3 [...]
+ id="path3729"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 400.88832,117.76662 -1,1.25 -2.625,0 -2.875,-2.125 -2.5,-1.375 -3,-2.5 0.25,-1.125 -2.75,-3.375 -0.875,-3.5 -0.375,-2.75 -0.625,-2.625 -1.75,-2.75 1.875,0.125 1.125,-1 1.25,0.875 1.125,0.625 -0.125,1.75 4.125,-0.875 3.125,2.125 2.25,2.75 0.375,3.25 -0.5,4 0,2.375 2.5,1.875 0.75,1.75 0.25,1.25 z"
+ id="path3731"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 425.26332,116.89162 1.625,2 1.5,2 3.5,-0.125 3.25,-0.125 3.125,-2.25 1,-0.5 3.5,1.125 2.125,-0.75 3,-2.75 1.5,-2.875 2,-2.875 0.75,-3 2,-0.875 3,0.75 3.125,0.625 2,-0.375 1.875,-0.625 -1.75,-1.375 0,-0.625 2.875,0 1.375,-1 -0.875,-1.875 -3.125,-1.25 -1.875,0.25 -0.875,0 0,-2.5 -2,-1.375 -0.75,-1.375 -0.75,1.625 -0.875,-1.5 -1,3.125 -0.25,1.875 -1.125,0.375 -2.125,0.625 -1.5,0.875 -0.125,1.5 -1.125,0.75 -1.375,-0.5 -0.625,1.75 -2.25,0 -0.375,2.75 -2.5,2 -2,2 -5,0.375 -2.5, [...]
+ id="path3733"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 532.67932,149.39162 -1.5,1.667 -0.333,2.333 0.667,2.5 1.167,-1.833 -0.833,-1.167 2.167,0 -0.5,-2.333 -0.835,-1.167 z"
+ id="path3741"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 519.84632,157.22462 -1.5,1.334 0,2.5 2.5,-2.5 -1,-1.334 z"
+ id="path3743"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 372.76332,102.89162 -3.875,-0.125 -3.25,-0.25 -1,-1.125 -2.25,-0.625 0.125,3.25 2.25,3 2.875,1.75 1.625,1.625 1.625,0.875 1.75,2.875 0.625,2.5 3.375,0.875 1.5,3 1.625,3.25 0.25,1.375 1.875,0.625 2,3.125 1.875,3.375 0.875,3.25 2.875,1.75 2,3.375 2.875,2.5 2.5,2.5 3,1.125 1.5,2.125 1,2.125 1.875,-1.125 2.625,-0.125 1.5,1.375 0.125,-3.375 0.125,-4.75 -0.125,-2 1.125,-1.625 -0.625,-2 -3.125,-1.25 -1.75,-0.625 -0.875,-2.5 -0.625,-3.25 -3.5,-0.125 -1.25,-0.75 0.75,-1.125 0.875, [...]
+ id="path3745"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 406.17932,133.55862 1.167,-1.834 1.5,1 1,-1.333 1.5,4.5 2,1.167 0,1.833 -2.167,-0.333 -1.167,-1.834 -1.667,-1.166 -2,-1.334 -0.166,-0.666 z"
+ id="path3747"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 416.84632,136.55862 -0.167,2.666 1.667,-0.166 0.5,-1.334 -2,-1.166 z"
+ id="path3749"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 425.26332,116.89162 -2.25,0.667 -1.167,2.5 0,2.333 0.5,2.667 2,2 -0.333,2.666 2.5,0.334 0.667,3 -0.5,2 0.833,3.166 3.667,-0.166 2.667,-0.334 0.833,2.167 0.167,1.167 4,-1.334 1.167,-1.166 2.5,2 2.833,-0.334 1.167,1.667 -0.333,2.5 4.833,-3 3.667,-1.833 -0.5,-2.5 1.167,-1.5 -1.333,-3.667 2,-1.5 2.167,-0.667 1.333,-2 -0.167,-1.666 1.333,-4 4.833,0.166 -4.333,-4.666 -1.833,-1.334 1.667,-0.166 -0.667,-3.334 -1.333,-2.5 0.167,-2 0.333,-1 -5.375,-1.333 -2,0.875 -0.625,2.125 -0.83 [...]
+ id="path3751"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 408.34632,152.05862 -0.167,1.333 -2.5,1.833 2.333,0.667 1.833,0.167 0.333,2 3,-0.167 3.167,0.667 2.667,1.5 2.667,-1.5 5,1 1.167,1.833 c 0,0 0.833,1.5 1.333,1.5 0.5,0 4.5,-0.167 4.5,-0.167 l 3,-1 4.333,1.167 1.5,-0.5 2.5,1.167 1.167,-0.167 -1.333,-2.167 2.333,1 1.333,0.667 1.167,0.833 1.5,-1.166 1.833,0 -0.667,1 2.5,0.5 0.832,-0.832 0,-0.002 0.667,1.334 c 0,0 -1.667,0.999 -0.333,1.166 1.334,0.167 5,0 5,0 l 1.167,-1.166 c 0,0 0.167,-1.169 0.667,-0.834 0.5,0.334 2.333,0.5 2. [...]
+ id="path3753"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 492.17932,117.72462 -1.333,1.834 -2.5,1.833 -3.5,-0.5 -4.5,0.333 -3.333,-1.5 -3.5,-0.5 -1.667,2.334 -1.5,0.833 -1.5,1 0.167,3 0,2.833 -2,1.5 0.167,3.334 -1,2.333 -2.667,0.667 1,3.333 1.167,0.5 1.167,-0.833 1.333,2.166 0.5,3 -1.5,2.5 0.667,2.5 4.333,-0.333 -1.167,-2.5 0.667,-2.5 0.167,-3.167 -0.667,-2.5 0.333,-1.5 1.667,-0.833 1.333,-0.167 0.167,3 c 0,0 -1.167,1.334 -0.667,1.334 0.5,0 2.333,1.333 2.333,1.333 l 0.833,1.167 -0.167,2.333 2.667,1.667 1,-2 0.167,3 1.667,-1.334 [...]
+ id="path3755"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 561.01332,136.22462 0,8.167 0.5,7.667 -1.333,2.166 1,2.167 0.333,9.167 -3.833,-3.667 -0.833,-1.167 -2.333,0.667 -2.667,-0.333 -4.167,0.666 1.667,-3 2,-0.666 1.333,-1.5 -1.5,-1.5 -1.333,-2.834 -1.333,-2.5 -1.833,-1.666 -5.333,-1.667 -5.5,-1.667 -1.5,0 -2.667,-1.833 -2.167,-1.667 -1.5,2 -1.667,0.167 -1.5,-2.5 -0.333,-1.833 -4.667,-1.834 1.167,-1.166 5.333,0.333 2.5,-0.167 1.667,-1 -2.167,-0.666 -4.333,-0.167 -1.667,0 -1,-1.833 -2.333,-1 -2.833,-0.167 -0.333,-1.833 c 0,0 0.8 [...]
+ id="path3757"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 504.84632,115.72462 -2.167,3.167 -0.5,3.333 1.333,1 -0.167,3.167 3.333,2.833 -1.333,-4.833 2.167,-0.667 -0.5,-2.5 1.333,-1.833 -2.5,0.667 -1.667,-1.167 0.668,-3.167 z"
+ id="path3759"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 504.84632,138.72462 2.333,-1 5.5,1.167 3.333,0 1,2.167 -1.5,1.666 -3.5,-2.166 -4.167,0 -2.5,-0.167 -0.499,-1.667 z"
+ id="path3761"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 497.51332,138.89162 c 0,0 -2,0.5 -1.667,1 0.333,0.5 1.333,2.5 1.833,2.5 0.5,0 3.167,-1.167 3.167,-1.167 l 0.5,-1.666 -1.5,-1.167 -2.333,0.5 z"
+ id="path3763"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 491.84632,164.55862 0.333,2.833 -1.833,2.167 -1.833,0.5 -1.833,0.833 -0.167,-2.5 1.833,-2.333 2.333,-0.834 1.167,-0.666 z"
+ id="path3765"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 469.84632,166.55862 -2.667,0.166 c 0,0 -2.833,0.168 -2.167,0.334 0.666,0.165 3.667,1.833 3.667,1.833 l 2.167,-0.833 0.667,2.5 2.167,0 0.167,-2 -2,-1.167 -1.333,-0.5 -0.668,-0.333 z"
+ id="path3767"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 491.84632,164.55863 0.417,2.458 2.5,-1.25 2.75,-0.5 2.875,-1.375 1.875,-1.375 -1.75,-1 -3.875,0.25 -1,1 -3.125,0.5 -0.667,1.292 z"
+ id="path3769"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 373.67932,-2.4413739 -3.667,3.16600005 1.5,2.16699995 -3,-0.5 -3,0.667 -2.667,3.666 -0.667,4.8339999 -2.167,5 -0.833,2.5 -2.333,-1.5 -2.333,-0.167 0.333,5.167 -0.5,3.5 -1.333,1 -0.833,2.666 -0.5,1.167 -1,-0.333 0.167,2.666 0.5,2 2.333,2.334 1.667,0.5 1,3.166 -0.333,1.5 1.667,-1.166 1.5,3.333 0.667,3.667 0.667,3.166 -2,1.334 0.167,2.333 3.167,1.333 2,-0.666 2.833,-1.834 2.167,-0.833 0.167,-3.333 2.167,2 0.833,1.5 0.667,1.5 0.5,3.666 2,4 0.667,2.667 1,3 0.167,3.667 0.833,3 [...]
+ id="path3771"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 333.84632,5.7246261 -0.833,3.167 -0.667,0.833 2.667,1.8339999 0.5,1.5 -1.5,0.666 -1,1.667 -1,-0.167 1.5,2.667 1.5,0 0.333,2.5 1,2.5 0.167,3.333 -0.167,3.5 3.167,-0.5 3.167,-1.5 0.167,-2.666 0.667,1.666 1.667,-0.833 0.167,-1.167 2,-0.333 1.167,2 0.333,2.667 0,2.166 2,2 -0.667,-3.166 1.5,0.333 0.833,-3.667 -1.167,-4.833 -1.5,-2.167 -1,3 -1.333,-0.333 -1.333,-1.333 0.667,-3 1.5,-0.667 1.333,-0.833 2,-3.5 -3.667,0 -7,0.166 -0.833,-2 -1,-3.6659999 -1.833,1 -1,-2 -0.833,0.333 - [...]
+ id="path3773"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 336.68032,1.2246261 -0.167,2.334 2.667,0.5 2.5,1.166 1.5,-1 2.833,0.334 3.333,0 0.5,-2.334 -1.667,-1 -0.167,-1.66599995 -4.5,-1.66700005 -2.833,0 -2.333,1.66700005 -1.666,1.66599995 z"
+ id="path3775"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 332.34632,-0.10837385 -1.167,1.83299995 0.833,3.167 -1.667,1.667 -2.167,0 -2.833,-1.167 -2,0.333 -2.333,-1.666 -3.5,-0.334 0,-2 -7.167,-0.666 -2.833,-1.66699995 -3.833,-1.83300005 -3.167,-1.667 -2.5,-1.667 4.167,-6.8330001 2.5,0.167 1.667,0 2.333,1.666 2.667,1.3340001 0.667,0.666 1.167,1.834 2.5,-0.667 3,1.167 1.167,1.333 1,1.167 4.5,0.166 2.667,3.00000005 4.332,0.667 z"
+ id="path3777"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 286.17932,90.224626 c 0.833,0 3.333,-0.833 3.333,-0.833 l -0.167,-2.833 1.833,-0.667 2.667,-0.333 -1,-1.5 1,-2.667 1,0.333 1.5,-2.333 -0.833,-5.5 1.833,-2.833 1.667,-2.5 -1,-4.5 -0.833,-2.667 1.667,-5 2,0.833 2.333,-2.833 3,0 1.333,-2 0,-2.333 1.833,-1.5 4.333,-3 3.833,-2 1.833,-4.334 1,-0.833 1.167,0.667 4.167,-1.334 2,-3 0,-3.5 2.833,-1.5 1.667,-4 0.5,2.834 0.833,1.333 2.833,-0.167 0.167,-4.833 -1.167,-4 -0.333,-3 -1.5,0 -1.5,-2.667 1,0.167 1,-1.667 1.5,-0.666 -0.5,-1.5 [...]
+ id="path3779"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 297.17932,83.224626 -0.333,4.5 -1.167,3 0.667,3.834 0.333,3.5 0.833,1.333 4.833,-0.5 2.333,-1.667 0.5,-4.666 -2,-1.667 -0.667,-2 -1.667,-2.333 -1,-1.667 -1.667,-0.833 -0.998,-0.834 z"
+ id="path3781"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 245.51332,20.391626 -2.667,-1 -1.667,-2.667 -2,-4 -2,0 -4.333,0.334 -2.667,0 -4,-0.667 -5.667,1 -3,0.333 -0.333,-1.666 0.667,-4.3339999 2.667,-1.666 2.333,-2 1,-1.334 -1.333,-0.333 -0.333,-2.99999995 -2.667,-3.33300005 -5,-5.667 4.667,2.333 3.333,0 2.667,-0.333 4.667,0.333 5,-2 2.333,-0.333 2.667,-8.0000001 3.333,-0.333 2.667,-2 2.333,0 0.667,1.333 3,-7.333 3,-0.667 -0.667,-5.333 4.667,-0.333 0,-2 1.667,-3 0.333,-3.667 -0.333,-3 3.667,-1.667 4.667,-2 3.333,1.333 2.167,-1. [...]
+ id="path3791"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 215.34632,-8.7743739 -0.167,-2.0000001 2.333,-3.334 0.333,-3.666 -2.833,-0.667 -0.833,-5.667 -1.167,-2.5 0.667,-2.333 -1,-1 0.333,-2.833 1.333,-3.167 1.5,-4.167 2,0.833 2.333,0.333 0.667,1 2.333,-0.833 1.333,-3.333 4.833,-1.5 1.667,-3.167 1,-2 2.167,-0.167 2.333,-0.5 2.167,0.167 2.667,0.333 3,0.833 4.333,-0.167 1.167,0.167 2,-2 2,-0.5 2.5,-4 1.833,0.167 0.667,2.333 0.833,0.167 0.667,2.833 -0.167,2.333 1.667,0.333 3.5,-2.167 2.167,-1.167 2,-0.333 1.167,1.167 3.167,-0.833 0 [...]
+ id="path3793"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 244.34632,-48.109374 1.667,-3 0.167,-2 -0.167,-4.5 -1.667,-1.167 -0.667,-0.667 -0.167,-1.167 3.667,-0.333 0.5,-2.667 1.5,-3.333 1.5,0.5 0.167,-1.667 1.167,0.333 3.667,-1.833 0.5,2 -1,1.167 1.167,1.167 -2,0.333 -2.333,0.5 -0.833,1 -2,-0.167 0.333,1.5 1.667,0 1.667,0.333 1.5,0.833 3.667,0 2,-0.667 0.833,0.167 1.5,1.333 3,-0.833 1.5,-0.667 2.833,0.833 0.167,1.5 0.833,2.333 0.167,1 2.167,-0.167 2,2 0.333,3.167 -1,0.833 -3,1 -1.833,-1 -2,0.333 -5.667,3.333 -1.667,-0.333 0.333, [...]
+ id="path3795"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 256.70032,-65.296374 4.188,-0.125 2.125,-1.25 2.313,-1.563 1.25,-1.25 -2.438,-1.375 -1.625,0.688 -1.313,-0.125 -1.5,-1.875 -2.625,0.938 -2.625,-1 0.25,-0.75 2.375,-1.125 1.563,-1.438 0.813,-0.625 -1.063,-1.438 1.625,-1.938 2.938,0.063 3.375,0 3.188,1.438 0.813,-0.875 -0.25,-2.875 2,-1.25 1.938,0.063 1.688,1.188 3.063,0.875 3.188,-0.375 2.5,-0.313 3.563,-0.125 2.375,-0.5 2,0.375 1.688,2.188 1.5,1.813 2.125,-0.063 0.375,1.188 -1.375,2.063 -2.5,0.813 -3.063,1.75 -3.188,2.125 [...]
+ id="path3797"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 184.01332,-49.484374 -0.875,-5.25 -0.25,-1.75 1.25,-2 -1.625,-0.625 -1,-1.375 0.75,-2.625 -3,-0.25 0.25,1.25 -1.375,-1.125 0.25,-3 0.75,-1.625 2,0.25 2.5,0.375 2.375,-0.25 1.125,-1.625 -0.125,-1 -2.25,-1.625 -1.375,-1.75 -0.875,-1.875 -2.5,0.75 -0.75,1.25 -0.25,2.75 -1.5,-2.375 0.75,-2.875 2.125,-1.5 3.625,-0.75 2.5,0.25 2.125,1.125 1.375,2.5 1.5,1.375 2.875,0.25 2.5,0.125 1.375,0.125 -0.25,-3.875 3,-0.75 1,-1.25 0.75,-0.5 0.625,-0.875 1.75,-0.125 1.75,1.625 0.75,1.25 1.3 [...]
+ id="path3799"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 194.13832,-73.359374 -0.625,-22 10.75,-2.25 -0.875,3.125 -1.125,3.625 0.25,1.875 0.625,3.25 3,0.5 1.625,-0.125 1.25,1.75 1.75,-1 0.5,-0.875 1.25,0.125 0.5,-2.375 1,0.25 3.75,2.875 4.75,-0.375 3.25,1.25 3.5,-0.625 2.875,2.75 1,5.125 1,2.375 -0.25,1.625 -1.75,1.375 2.25,1.625 5.125,0.5 3,0.75 1.125,1.375 2.375,0.875 1,-2 1.125,-3.125 2.125,-2.5 3,-0.375 3.25,-1.625 1,0.75 -2.813,1.875 -0.25,0.75 2.625,1 2.625,-0.938 1.5,1.875 1.313,0.125 1.625,-0.688 2.438,1.375 -5.188,4 -5 [...]
+ id="path3801"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 194.01332,-72.942374 -2.5,0.083 -1.5,-1.375 -1.375,-2.5 -2.625,-1.542 -2.667,0.333 -1.667,0.167 -1.667,0.833 -1.75,1.083 -0.583,1.917 -1,-0.833 0.333,-1.667 0.833,-2.333 0,-1 -3,-0.167 -1,-1.667 -1.5,0 -0.333,-1.667 -0.833,-2.167 -1.333,-2.5 -1.833,-0.5 -0.667,-2.667 2.5,0.5 3,0.5 -0.833,-1.833 2.5,-3.5 0.5,2.333 1,-2 3.167,0 0.667,1.333 3,-0.667 -1.5,1.833 -1,2.167 0.333,1.167 1.5,-1.5 1.667,-2.167 3.5,0.167 -0.5,-3 -1.5,-1.5 -2,-1.167 -0.667,-2.332996 -2.333,-3 -2,-2.5 [...]
+ id="path3803"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 217.51332,13.724626 -1.75,0.667 -4.25,-1.75 -4.75,0.5 -6.75,-2 -1.75,-0.5 -1,-5.2499999 -3,-0.75 -1.25,1.25 -3.25,1.25 1.25,-2 -5,2.25 -3.25,-2.5 -4.75,-1 -2.5,-3.49999995 -4,-0.25 -0.5,-4.00000005 -2,-3 -1.75,-3 -2.25,-0.5000001 -0.25,1.0000001 -2.5,-2.0000001 -1.5,0.25 -2.5,-2 0,-3.25 -2,-1.75 1,-3.5 -4,-4 -3.25,-0.5 -2.25,-6.5 0.5,-3.75 2,-2.25 0,-2.75 0,-1.25 -2,-0.5 -2.25,-2 0,-2.5 -2.25,-3 -1.25,-3.75 0,-3 -0.5,-3 1.5,-3 2.5,0.25 2.5,1.5 1.25,1.25 1.5,1.75 2,0.25 1. [...]
+ id="path3805"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 153.51332,-58.942374 0,-2.167 c 0,0 -0.333,-2.333 0.333,-1.833 0.666,0.5 1.333,1.167 1.333,1.167 l 0.333,-2.167 -1.167,-1.5 -2.167,-1 0,2.333 -1.333,0.667 -0.667,-2 -0.667,-1.833 -1.333,-0.5 -2.5,-2 -0.333,-2.5 4.5,1.667 1.333,-1.5 -1.5,-1.333 -1.167,-2.167 1.167,-0.333 3.833,1 2.667,2.5 1.833,0.667 2,-2.167 3,3.167 1.333,2.667 3.167,1.667 -3.167,2.667 -0.667,3.333 -0.5,2 -1.667,0.5 0.5,4.083 -3.25,-3 1.583,-2.417 -1.167,-0.833 0.833,-1.25 -1.333,-1.25 -5.163,3.665 z"
+ id="path3807"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 143.51332,-63.359374 -1.667,-1.583 -2,-0.5 0,-2.667 -0.333,-2 -1.5,-2 7.333,-0.167 0.333,2.5 2.5,2 1.333,0.5 1.333,3.833 1.333,-0.667 0,-2.333 2.167,1 1.167,1.5 -0.333,2.167 -1.333,-1.167 -0.333,4 -0.667,0.833 -1.583,-0.5 -1.5,-1.75 -2.083,-1.583 -1.667,-1.167 -1.333,-0.167 -1.167,-0.082 z"
+ id="path3809"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 138.01332,-72.109374 -2,-0.5 -0.667,-2 -3.167,1.333 -1.833,-0.5 -0.667,-3.833 -1.333,-2.333 -3.333,-1 -1.99991,-1.833 -1.5,-1.667 3.66691,-0.167 4.167,0 3.667,2 3.333,1 2.667,0.333 2.667,2.167 2.167,-0.167 3.333,0.333 1.833,2.833 -0.5,0.5 1.167,2.167 1.5,1.333 -1.333,1.5 -4,-1.5 -1.333,-0.5 -6.502,0.501 z"
+ id="path3811"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 144.01332,-49.775374 -2.167,0.333 -1.667,-0.5 -2.833,0.833 -2.167,0 -3,2.667 -2,2.167 -0.333,4 -0.333,3.5 -0.833,2.167 -10.33291,7 0.5,1.167 0.167,4.167 0.833,0.167 0.167,0.833 7.66691,0.834 16.667,13.8330001 6.833,0.333 5,-4.3330001 4.583,-0.5 -2.5,-2 0.083,-2.833 -2.083,-2.167 1,-3.5 -4,-4 -3.25,-0.5 -2.25,-6.5 0.5,-3.75 2,-2.25 -0.417,-3.833 -1.583,-0.667 -2.25,-2 0,-2.5 -2.001,-2.168 z"
+ id="path3813"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 132.17932,-49.109374 -1.333,1.5 -4,-0.333 -5.66691,2 -3.667,-1.5 -4.833,1.5 -1.667,-1.5 -1.667,0.833 0,2.5 -3.333,3.167 -1.5,2.167 0.833,0.167 0.5,4.167 2,0 0.5,1.833 -1.833,1.333 -0.333,2 -0.833,1 -0.333,3.167 1.833,1.167 0.667,1.333 2.167,-0.167 3,-1.333 15.99991,-10.5 0.833,-2.167 0.333,-7 4.833,-4.833 -1.333,-0.5 -1.167,-0.001 0,0 z"
+ id="path3815"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 151.84632,-6.6083739 3.833,0.5 2,2 1,-0.5 1.333,-2.333 0.667,-1.5 -1.833,-1.167 1.5,-0.333 1.917,-1.4170001 -6.083,0.75 -4.334,4.0000001 z"
+ id="path3817"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 105.34641,-28.275374 -2.167,-0.5 0.667,-2.333 1,-1.667 1,-1.667 1.5,0 1,1.833 -1.833,1.333 -0.333,2 -0.834,1.001 z"
+ id="path3819"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 105.01341,-25.109374 -0.5,1.5 -1.667,-0.167 -0.167,2.167 -0.333,2.5 1.167,0.833 -0.667,2.834 -0.667,7.5000001 6,2.166 2.333,-3.333 2,-0.5 1.667,-1.6670001 0,-1 1.167,-0.166 0,-0.667 -3.833,-3.5 0,-1.167 8.667,-3.166 -0.333,-1.167 -0.833,-0.167 -0.167,-4.167 -0.5,-1.167 -8.667,4.833 -2.167,0.167 -0.667,-1.333 -1.833,-1.166 z"
+ id="path3821"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 100.67941,-1.1083739 1.833,0.83300005 1.667,2.49999995 2.333,3.834 2.667,4.1659999 2,2.667 c 0,0 -0.333,1.167 -0.167,1.667 0.166,0.5 1.5,2.666 1.5,2.666 l 4.333,2.667 3.333,6 -1,3 0.833,2.5 0.333,2.167 3.333,2.5 2.49991,2 2.167,4.833 2.167,3.833 2.167,2.167 3,5.167 1.333,-1.667 0.833,-3.333 1.167,0 1,1 c 0,0 4.167,-0.666 4.833,-0.5 0.666,0.166 3.333,1 3.333,1 l 4.667,0.333 1.333,1.167 1.5,-1 2.167,-4 3.333,-2.167 5.167,-1.5 6.5,-0.333 3.333,-1 13.333,-5.334 1.5,-9.5 -0.66 [...]
+ id="path3823"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 180.67932,52.891626 3.333,-1 2.5,-0.667 1.667,0.667 1.833,-3.167 0.5,-1.833 2.667,0 1.833,-0.333 1.333,-3.834 4.667,-0.5 -0.667,-4.166 1.833,-2.5 0.667,0.666 1.167,-1.166 1.667,-3.334 2.333,-2.333 1.833,-3.333 -2.667,-2.334 -1.5,-1.833 -2.333,-1.167 -2.5,-0.166 -3.667,-1.667 -2,-3 -0.667,-1.167 -1.5,0.167 0,2.5 0.833,0.833 -1.833,0.334 -1.667,2.166 -0.833,3 1.5,3.5 -1.5,9.5 -12.833,5.5 -0.5,1.334 2.833,9.5 1.668,-0.167 z"
+ id="path3825"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 174.59632,19.308626 3.333,-0.334 1.083,-1 2.917,0.167 1.667,0.583 1.75,-0.916 1.583,-2.25 0.833,-1.667 1.917,-0.5 1.667,-2.333 1.25,-0.584 1,-0.083 0.083,-1.6669999 1.083,-0.833 0.667,1.417 -0.917,1.8329999 0.083,1.917 -0.083,1.666 -1.583,0.584 0.083,2.083 0.667,0.833 -2.083,0.584 -1.5,2.333 -0.75,2.917 -1.667,1.333 -8.667,-1.833 -3.25,-2.667 -1.166,-1.583 z"
+ id="path3827"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 173.26332,15.641626 -2.417,-1.833 -0.167,-2.167 0.333,-0.75 0.75,-2.2499999 1.417,0.583 0.833,2.3339999 -0.083,1.75 -0.666,2.333 z"
+ id="path3829"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 169.51332,6.9746261 -1.417,1.25 -0.083,1.667 1.167,1.4169999 1.667,-0.834 -0.25,-1.3329999 0.667,-1.25 -0.917,-1.167 -0.834,0.25 z"
+ id="path3831"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 176.17932,43.558626 2.833,9.5 -2,1.833 -0.167,3 -3.167,0.5 -1.333,1 -5.333,1.833 -4,1.167 -1.167,2.167 -5,0.333 -2,2.333 -4.333,0.167 -3.333,0.667 -0.833,1.5 -2,1.333 -2.833,-0.5 -0.667,0.333 -2.167,-0.5 -1,-2.833 -0.333,-2.167 -1,-2.166 0.333,-1.5 -1,-1.5 -0.667,-3.167 0.667,-1.333 0.167,-1 1.167,-2.167 0.667,-2.833 1.333,-0.5 1,1 4.833,-0.5 3.333,1 4.667,0.333 1.333,1.167 1.5,-1 2.167,-4 3.333,-2.167 5.167,-1.5 6,-0.167 3.833,-1.166 0,1.5 z"
+ id="path3833"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 101.76341,-7.3583739 -0.75,-4.7500001 -1.749996,-4.167 0.583,-1.083 0.249996,-1.833 0.083,-2.5 1.25,-0.917 0.167,-2.417 0.75,-1.75 0.833,-2 2,0.75 -0.333,3.25 -0.333,1.167 -1.667,0.083 -0.667,4.5 1.083,0.834 -0.5,2.416 -0.667,8.1670001 -0.332,0.25 z"
+ id="path3837"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 130.63832,-73.234374 -2.5,2.625 -1,0.125 -3.125,1.375 -1.49991,-0.375 -2.5,-0.25 -3.375,1.125 -2.375,-0.375 -2.375,-0.625 -0.5,0.375 -2.875,-1.5 -1.625,-0.375 -0.75,-1.875 -2.75,-0.25 -1.375,-1.75 -2.999996,0.375 -7.875,0.125 -1.875,2.125 -2.5,1.25 -0.625,1.75 -3.375,-0.125 -5.75,-0.5 -0.875,0.25 -2.75,-1.5 -2.375,-1.75 0.125,-2.25 -3.75,-0.5 -1.875,1.25 -0.25,2.5 -1.125,2.625 -1.5,1.125 0.375,1.25 3.125,0.125 1.5,0.125 2,-2.5 2.5,0.25 2.375,-0.25 1.375,-0.125 0.75,1 0.87 [...]
+ id="path3839"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 89.596414,-35.942374 1.917,-1.167 1.833,0 1.333,-0.917 2,0 3.083,-1.917 0.416996,1 -2.666996,2 -0.083,1.333 0.25,1 -1.583,0.417 -1.917,-0.083 -1.25,0.333 -1.083,0.5 -1.25,-0.167 -0.417,-1.333 -0.583,-0.999 z"
+ id="path3841"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 100.01341,-18.441374 -3.166996,2.333 -3.667,0.833 -2.667,-0.333 -2.667,-1.333 -0.5,-1.5 -2.667,1 -2,1 -0.833,-1.5 -2.5,1.666 -3.333,2 -2.833,-1.5 -3.5,0 -3,-1.333 -4,-1.167 -1.833,0.334 -1.667,-0.167 -0.5,-0.667 -1,1.167 0.167,1.333 0.667,1.167 -0.333,2 -0.667,1 1,3.0000001 0.333,2 -0.167,35.4999999 25.833,0 0,-1.167 1.333,0.167 0,1.167 8.333,-0.167 1,0.667 2,0 1.167,-2 1.666996,-0.334 1.5,-2.5 1.333,-0.166 1.667,-1.334 -0.833,-3.166 1.5,-0.834 -2.667,-1.833 -4.166996,-7. [...]
+ id="path3843"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 567.51332,172.05862 -2,5.333 -1,4.667 -0.667,9.333 -0.667,5.333 -1.667,5 -3.333,1 -3.667,-1.333 -1.333,-2.667 -3,-0.666 -4.333,-2.334 -2.333,-1.333 -3,-2 -2.333,-1.667 1.667,-4.666 1.333,-1.334 0.833,3.292 1.75,0 -0.375,-2.5 -1.375,0 -0.625,-2 1.375,-1.125 0.125,-1.375 1.375,-2.125 -1.5,-0.125 -1.125,-1.75 -0.875,1.25 0.125,1.625 -1,-2.25 -1.375,-0.375 -2.625,1.625 -2.5,-1.125 -2.625,0.125 -3.125,-1 -1.625,-1.625 -2.25,-0.5 -3,-0.25 -3,0.25 -2.75,-0.25 2.375,1.875 1.125,1 [...]
+ id="path3845"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 591.63832,312.76662 -0.625,1.75 1.5,2 0.125,1.875 -1.75,0.25 -2.75,0.5 -1.875,2.25 -2.375,-0.375 -2.75,-2.125 -2.375,-0.625 -1.375,0.875 0.875,3.375 0.5,2.75 1.375,1.625 -0.25,2.125 0.125,3 1.375,-0.75 0.75,1.875 1.5,0.5 c 0,0 -1.125,1.375 -0.5,1.5 0.625,0.125 3,0 3,0 l 1.5,0.625 0.5,-2.5 1.125,0.875 -0.25,-2.875 1.875,1.5 c 0,0 2.5,0.625 2.375,0.25 -0.125,-0.375 -0.875,-2.875 -0.875,-2.875 l 0.25,-2.5 0.375,-0.875 0.375,1 0.75,-1.25 -0.25,-2.625 -0.375,-2.75 -0.625,-2.37 [...]
+ id="path3847"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 561.51332,136.39163 3,2 4.167,1.833 5.167,1.667 1.667,1 1.5,0 4.333,4 0.5,3.833 6.333,1.667 2.333,0.5 2,-1.833 0.333,-2 5.167,0 1.833,-1 1.5,1.833 2.5,0 2.333,-2.667 1.666,-0.333 -0.5,-3.5 2.5,0 1,2.667 0.834,-1.667 -1.167,-2.833 -6.667,-3.834 0.167,-1.5 3.167,1.334 5,3.333 2.833,3.667 -1,2.5 -2.667,-0.167 -1.833,0.833 0.833,2 -3.166,0.667 -1.334,1 -3.667,1.5 -3.667,0.333 -2.5,-0.833 -2.333,-1.5 -1.833,1.5 -1,1.5 -0.5,1.667 -2.833,-0.167 0,1.833 2.5,2 1.667,1.834 1,2.5 1. [...]
+ id="path3849"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 698.76332,283.39163 1.75,5 3.25,4.5 2.25,2.75 1,2.25 0.75,4.75 0.5,4 -2.75,3 -3.25,0.75 0.5,3 4,0 3.75,2.25 -1,4.5 -2,1.5 -2.25,-0.25 -0.75,-2.5 -2.75,2 -1.5,-3 -0.25,-1 -3.25,2.75 0,4.75 -4,2.5 -2,4.25 -7.75,5.5 -3.25,1.75 -3,5 -3.25,4.5 0.25,2.5 5.5,0.75 2.5,2 3.5,0.75 4.5,-2.75 1.75,-3.25 1.25,-4.25 1.25,-0.75 0.25,-5 4,-0.75 2.25,-0.25 -0.5,-2.5 0.25,-1.5 2.75,-1.25 2.25,-4.75 0.75,-3.25 0.25,-1 2.25,-0.25 1.25,0.75 3.75,-1.25 2,-3.75 1,-1.75 1.5,-2.5 -0.75,-1.75 1.25 [...]
+ id="path3853"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 619.84632,147.39162 0.834,4.667 2.833,2.333 1.667,2.167 1.5,-2.5 -2.334,-2.334 -2.5,-1 -2,-3.333 z"
+ id="path3851"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 628.68032,155.22462 2.333,3.167 3,0 2.5,0.667 0.833,1.833 4.167,1.667 1.667,0.666 c 0,0 2.333,-1.166 2.833,-0.333 0.5,0.833 0.833,2.5 0.833,2.5 l 2.334,2.167 0.666,1.333 -1,0.5 -2.5,-2.167 -3.666,-1.333 -1.5,0.5 1.333,1.5 2.5,0.667 2.833,0.5 1.5,2.5 2.667,1.5 1.667,-0.834 -2.334,-2.5 -1.333,0 0.333,-1.833 -1,-2.833 -1.333,-2.667 -2.167,-0.167 -2,0 -2,-1.166 -2.166,-1.5 -1.5,-1.334 -1.834,0.167 -2.166,-0.5 -1.834,-0.833 -1.333,-1.167 -1,-1 -1.333,0.333 z"
+ id="path3861"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 720.34632,200.72463 -1.833,3.834 2.167,2.166 3.166,0.167 2.167,-2.333 -1.333,-1.667 -1.834,-1.333 2,-1.667 3.334,-0.167 2.833,0.167 -1.5,-1.667 2,-2.5 -3.833,1 -2.667,2.167 -2.333,2.333 -2.334,-0.5 z"
+ id="path3863"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 669.01332,218.39163 -7.5,-4.5 2.75,5.5 4.75,4.5 4.25,0 -3,-3.25 -1.25,-2.25 z"
+ id="path3869"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 761.01332,184.72463 3.5,2.167 0.833,-1.167 1,1.667 2,-1.333 -1.333,-1.667 -1.5,0.5 -2.167,-1.167 -2.333,1 z"
+ id="path3879"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 88.679414,-141.10937 -3.917,1.125 -1.75,3.375 -0.25,2.5 -2.5,-1.25 -2.25,-0.5 -1.625,-0.625 -1.375,0.75 -5.25,-0.75 -2.75,-0.75 -3.125,0 -6.375,-0.625 -3.25,1.625 -1.25,0.875 1.25,3.375 0.75,2.875 -0.625,2 -2.875,1.875 -1.75,2.375 -0.5,1.625 -2,0.375 -0.75,4.75 2.5,3.75 1.5,-1 3.25,0.875 3,0.375 1.5,0.75 2.375,-1.25 2.25,-0.25 3,-1.625 2,-1.125 1.625,-0.625 2.875,1.375 3.125,0.75 1.5,1.5 1.125,3 1.375,2 0.125,4.25 -1.875,1 -1.375,0.375 -0.625,2.374996 -1.25,0.875 -2.125,0 [...]
+ id="path3881"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 66.763414,-114.73437 0.625,1.125 1.25,2.125 1.875,1.625 1.5,3 0.5,2.75 -0.125,4.874996 0,0.625 2.125,-0.125 1.25,-0.875 0.625,-2.374996 3.25,-1.375 -0.125,-4.25 -1.375,-2 -1.125,-3 -1.5,-1.5 -2.75,-0.75 -3.25,-1.375 -2.75,1.5 z"
+ id="path3883"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 48.763414,-111.98437 -0.5,1.625 -2.375,1.125 -1.125,1.125 -0.75,1.875 -1,3 -2,1.625 -3,0.625 1.5,2.624996 1.875,2.25 1.5,0.75 0.5,1.5 1.75,2.25 2,0.5 1.5,-0.375 -0.375,1.75 1,1.625 0.5,1.375 5.75,0.75 3.75,0 1.875,0.25 4.5,-1.625 1.625,-1.25 2.5,0.875 0.75,0.25 1.125,0 0.75,1.25 1.375,0.25 1.125,-4.125 0.375,-2 0.75,1.5 1.875,-1.125 0.625,-2.125 -0.25,-2.625 -1.25,0.25 -1.625,0.125 -1.25,0.625 -1.75,-1.625 0,-3.249996 0,-4.5 -0.75,-2.25 -1.125,-2.75 -1.875,-1.625 -1.875,- [...]
+ id="path3885"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 66.013414,-74.734374 -1.875,-0.375 -0.375,2 -1.875,0.875 -3.125,-0.125 -2.375,-1 -1.625,-0.375 -2.5,1.375 -1.625,0 -0.25,-3.5 -2,-1.25 -0.5,-1 0.5,-3.75 1.375,-1.125 -1.375,-3 0.375,-2.625 1,1.875 2.75,0.375 5.125,0.375 1.625,0 1.875,0.25 3,-0.875 1.5,-0.75 1.625,-1.25 2.875,1.25 1.5,-0.125 0.75,1.25 1.375,0.25 0.125,2.875 -2.125,0.125 -0.625,0.625 -0.125,3 -1.5,1 -0.75,1.125 1.75,0.125 0.625,1.875 -2.875,-0.5 -2.25,1 z"
+ id="path3887"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 49.63836,-71.60938 -2.75,0.75 -1.125,-0.25 -1.25,1.5 -3.25,0.375 -0.625,3 -1.5,2.25 -0.25,1.25 -4,0.5 1.5,2.875 0.875,-1.625 1.125,2 1.375,0.75 0.375,1.5 -1.25,0.875 1.75,0.25 0.875,1.625 2.125,-0.125 3.75,0.125 1.875,1.375 -1.875,0 -2.375,-1 -2.5,0.375 -1.625,1.375 -1.125,-1.375 -1.25,-1.25 -0.625,1.5 1.25,1.125 0.625,0 -0.5,1.5 1.5,0.25 0.625,-0.75 0.25,-0.75 1.375,1.75 0.25,1.375 0.375,1.375 0.75,1.875 0.375,-1.625 1.875,1.125 0.5,2 c 0,0 0.875,-2 1.25,-1.5 0.375,0.5 1 [...]
+ id="path3889"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 51.51336,-38.48438 1.875,1.25 2,0 1.625,1.25 2.25,0 2.875,-0.125 2.375,-1.125 1.875,-1.125 1.625,0.125 0.625,-1.375 1.5,-1.75 1.125,0.5 1.25,-2.125 -1.125,-0.875 -1.75,1.5 -0.375,1.25 -1,1 -1.625,0.5 -0.875,1.125 -1.75,0.875 -1.25,0.625 -1.125,-0.625 -1.875,-0.5 -1.875,-0.125 -1.125,-0.375 -1.25,-0.75 -1.375,0.5 -2.125,-0.375 -0.5,0.75 z"
+ id="path3891"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 61.888414,-59.484374 1,1.125 1.25,0.75 1.125,-1.125 -1.375,-1.375 -2,0.625 z"
+ id="path3893"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 61.888414,-55.734374 -0.25,2.375 2,0.5 0.625,-1.625 -1,-1.5 -1.375,0.25 z"
+ id="path3895"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 58.388414,-63.484374 -0.375,1.75 1.75,0 0.75,-1.25 -2.125,-0.5 z"
+ id="path3897"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 41.263414,-69.234374 -1.75,-2.208 0.333,-3 1,-1.167 0.5,-1.5 2.167,-0.167 2,-1.5 1.5,0.667 0.875,0 1.125,1.333 1.375,0.917 0.25,3.5 -1,0.75 -2.292,0.5 -1.583,0 -1.75,1.667 -2.75,0.208 z"
+ id="path3899"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 35.513414,-62.775374 0,-1 -1.167,-1.667 -0.333,-3.667 0.167,-2.167 0.167,-1.167 0.333,-1.667 -0.333,-0.5 0.5,-4.667 2.5,0 1.333,1.167 1.333,1.167 -0.167,2.5 -0.167,2 0.333,1.667 1.25,1.542 -0.583,1.792 -0.042,1.208 -1.125,1.958 -0.625,1.542 -3.374,-0.041 z"
+ id="path3901"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 34.388414,-74.109374 -1.25,-1.125 -2,-1.625 -0.5,-2.625 0.5,-2.5 1.75,-1.625 1,-1.625 0.5,-0.5 1.25,1.125 2.25,2.125 -1.125,3 -1.875,-0.25 -0.5,5.625 z"
+ id="path3903"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 35.013414,-86.359374 -0.625,-3 -0.375,-3.25 -0.125,-2.625 0.25,-1.5 -1.375,-2.625 2.375,-1.374996 2.75,0.125 2.875,3.999996 2.125,1.25 1.125,2.125 1.125,1.625 2,0.5 1.5,-0.375 -0.375,1.75 0.625,1.5 -0.5,2.25 1.375,3 -1.375,2 -0.5,2.875 -1.375,-0.125 -1.375,-0.5 -1.625,1.458 -2.167,0.167 -1.458,2.375 0.125,-2.208 -1.5,-1.542 -1.75,-1 1.125,-3 -2.25,-2.125 -1.25,-1.125 0.625,-0.625 z"
+ id="path3905"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 27.638414,-80.984374 -1.375,0.5 0,-2 -1.625,-2.875 -2.875,-1.875 -1,-2.75 -1.125,-2.25 -0.75,-1.625 0.5,-1.375 2.125,0.875 1,-0.875 3.25,0.625 1.25,0.75 1.75,-0.5 1.625,0.375 2,1.625 1.625,-0.25 0.375,3.625 0.625,2.625 -1.125,1.125 -1.25,2.125 -1.5,1.125 -0.5,2.5 -1.25,-0.125 -1.75,-1.375 z"
+ id="path3907"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 16.263414,-96.859374 -3.125,-0.25 -2.875,0.25 -1.0000001,1.25 -1,1 2.2500001,2.5 0.125,-2.25 1,-0.625 2,1.5 0.625,1.375 1.125,0.375 c 0,0 -1.875,1.375 -1.5,1.5 0.375,0.125 2,1.25 2,1.25 l -0.375,1 -0.125,0.75 1.5,1.625 1.5,1.125 0.625,1.5 1.75,-0.75 1.625,0.25 1.25,1 0.375,1.5 0.875,0.375 1.25,0.75 1.25,0.875 1.375,1 1.375,1 1,0.125 -1,-2.25 -0.75,-0.5 -1.75,-1.375 -1,0.625 -0.375,-2.125 -1.625,-2.875 -2.875,-1.875 -2.875,-6.625 0.5,-1.375 2.125,0.875 1,-0.875 3.75,0.875 [...]
+ id="path3909"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 25.638414,-113.10937 -1.125,0.25 -0.5,2.25 -1.75,0.375 -1,3 -1,1.625 1.125,2.125 1.75,0.375 3.875,3.749996 5.75,0 2.375,-1.374996 2.75,0.125 3.125,-1 2,-1.625 1.75,-4.875 1.25,-1.5 2.25,-1.125 0.75,-1.625 -2.5,-3.75 -1.5,0.25 -5,-0.375 -1.75,1.25 -1.625,0.75 -3.5,0.625 -1.25,2 -2.5,0.25 -2.875,-0.125 -0.875,-1.625 z"
+ id="path3911"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 9.7634139,-97.109374 -0.375,-1.75 -1,-2.124996 0.75,-2.5 2.1250001,0.375 2.125,0.375 2.875,-1.25 1.625,-1.125 2.375,-0.5 1.125,2.125 -1.875,1.625 -2.875,4.124996 -0.375,0.875 -2.5,-0.125 -2.875,0.125 -1.1250001,-0.25 z"
+ id="path3913"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 24.513414,-112.85937 -1,-0.875 0.375,-1.75 -0.25,-1.375 -0.25,-1.375 1,-1 3,-0.375 2.875,-1.875 0.875,-1.25 0.125,-1.5 1.75,2.125 2.125,-0.875 1.75,1.375 1.875,-0.25 1.375,0 2.25,-0.375 1.375,-0.625 1.75,1.25 1.75,1.375 -0.75,4.125 -1.5,0.25 -2.75,-0.375 -2.25,0 -1.75,1.25 -1.625,0.75 -3.5,0.625 -1.25,2 -5.375,0.125 -0.75,-1.25 -1.25,-0.125 z"
+ id="path3915"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 53.388414,-135.48437 -0.375,-1.75 0.5,-3 -1.625,-0.875 0.625,-2 1.5,-1.75 0.125,-3.25 -1.25,-4.125 3.25,-0.75 0.625,-1.625 3.125,-1.875 1.125,0 1,-4.125 4,-3 -0.375,-2.375 1.375,-1.25 1.75,-0.875 2.5,0.125 1.125,-2 1,-1 0.625,0.875 5.375,0.5 1.125,1.833 3.5,-0.5 1.333,6.333 1.5,5 2.333,2.333 0.167,2 2.042,2.125 -0.875,3.042 -3.333,-0.167 1.5,6.5 -3.917,1.125 -1.75,3.375 -0.25,2.5 -2.125,-1.125 -2.625,-0.625 -1.625,-0.625 -1.375,0.75 -5.25,-0.75 -2.375,-0.75 -2.75,0.125 -7 [...]
+ id="path3917"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 71.138414,-184.35937 -1.375,1.625 -2.375,-0.375 -2.25,0.5 -4.5,-3.375 -4,0.875 -0.875,0.125 0,-2.5 -1,0 -0.625,1.625 -1.5,-1.875 -1.125,-1.875 -1.375,0.625 -0.375,1.625 -2,1.125 -1.25,0.5 -0.625,1.5 -0.75,-1.625 -0.625,-1.75 0.75,-1.375 1.625,0 0.375,-1.25 -0.75,-1.25 -1.5,-0.25 0.875,-0.75 2.375,-0.875 1.125,1.25 -1.25,1.75 -0.125,0.875 1.25,-0.125 1.25,-0.125 0.875,-0.875 -0.375,-1.375 -0.875,-0.5 1.375,-1.625 1.375,-1.5 1.75,-0.375 2.25,-1.875 0.75,0.625 2.875,0.125 1. [...]
+ id="path3919"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;stroke:#ffffff" />
+ <path
+ d="m 54.138414,-175.85937 -3.25,0.25 -1.125,-2.625 -1.75,-2.125 -1,-1.5 -3.875,1.875 -0.875,2.5 -0.375,2.5 -1.125,2.25 0,3.25 4,-2.5 9.875,-0.375 1.875,0.375 1.5,-0.5 1.625,1.75 3,1 3,3.75 1.375,-1.25 1.75,-0.875 2.5,0.125 1.125,-2 1,-1 -0.542,-1.125 0.042,-4.25 -0.042,-4.083 -0.833,-3.167 -0.875,-0.75 -0.875,1.625 -2.875,-0.375 -2.25,0.5 -4.5,-3.375 -4.875,1 -0.375,6 -0.375,2.625 -0.875,0.5 z"
+ id="path3921"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 40.513414,-168.23437 0.625,2 0.375,2.125 1.125,0.5 1.5,1 2.625,1 2.75,0.5 0.375,2.375 -0.125,1.625 1.875,1.375 0.875,1.75 0.375,1.75 3.25,-0.75 0.625,-1.625 3.125,-1.875 1.125,0 1,-4.125 4,-3 -0.375,-2.375 -3,-3.75 -3,-1 -1.625,-1.75 -1.5,0.5 -1.875,-0.375 -9.375,0.5 -4.5,2.375 -0.25,1.25 z"
+ id="path3923"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 30.513414,-125.98437 -3.125,-0.625 0.875,-1.75 -0.75,-0.875 -1.375,0.75 -2.5,-0.375 -0.5,1.375 -1.625,-1.5 0.25,-1.125 -3.125,-0.125 -2,-0.375 -0.75,-1.25 -0.875,-0.75 0.125,-2.875 -1,-2.25 -0.5,-4.875 -0.25,-1.25 -1.25,-1.75 0.125,-1.625 0.125,-1.25 -1.5,-2.625 0,-0.75 0.75,-1 1.5,0.625 -0.4566,1.08316 0.4163,0.91632 -0.2097,-0.87448 0.75,-2.125 2.5,-1 3.125,-0.875 1.875,-1.75 2.625,-1.25 3.875,-0.5 2.25,-0.25 1.5,1.375 -1.5,0 0.875,1.25 2.125,1 0.875,0.125 2.625,-2 2.62 [...]
+ id="path3925"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff"
+ sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
+ <path
+ d="m 21.638414,-117.98437 -1.125,-0.125 -1.5,-0.875 -3.5,-0.5 -0.25,1.75 -2.125,1.125 -2.75,-1 -5.0000001,-4.75 -1,-1.75 0.125,-1.75 -1.125,-2.375 2.625,-0.25 2.625,-1.5 2.1250001,-1.25 1.25,-0.125 0.375,-1.75 0.875,0.125 1.375,1.625 0.375,-1.25 1.125,1.375 0.5,0.625 5.125,0.5 -0.25,1.125 1.625,1.5 0.5,-1.375 2.5,0.375 1.375,-0.75 0.75,0.875 -0.5,1.875 2.75,0.5 0.75,1.75 -0.125,1.5 -0.875,1.25 -2.875,1.875 -3,0.375 -1,1 -1.75,0.25 z"
+ id="path3927"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 9.2634139,-116.35937 -3,2.75 0.5,2.125 -0.625,1 -3,-0.25 -2.62499997,1.125 -1.25,-0.25 -0.75000003,1 -1.875,-0.75 -2,0.25 -1.125,0.25 -1.375,0 0,1.625 0.75,0.625 1.125,0.5 0.875,-0.125 1.375,0.625 -0.125,0.75 1.75,0 2.00000003,-0.625 1.62499997,-0.5 1.125,-0.875 1.25,0.125 0.875,1 0,1.25 1.75,0.125 2,0.5 1.125,0.625 3.7500001,0.75 3.25,-1.5 1.25,-0.875 2,-0.375 1.375,-1.75 1,-3 1.75,-0.375 0.5,-2.25 -1,-0.875 0.375,-1.75 -0.5,-2.75 -1.75,0.25 -1.125,-0.125 -1.5,-0.875 -3. [...]
+ id="path3929"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 17.38836,-63.73438 -1.25,0.25 -1.625,-0.875 -0.5,-1.75 -0.875,-1.125 -1.5,0.625 -1,-1.5 -0.125,-1.375 -1.5,-1 -2.75,-0.125 -2.25,-1.25 -2,-2.25 -1.5,-1.25 -1.625,-1.25 -1.375,-1.625 -2.375,-2 0,-3.5 -0.75,-1.5 -0.875,-1.375 -1,-1.125 -0.875,0.25 -1.375,-1.125 -1.75,-0.25 -1.75,0.5 -0.875,1.75 -1.375,-0.625 -0.125,-1.375 -1.75,-0.125 -1.375,-0.75 -0.375,-3.375 -0.75,-1.125 1.5,-2.125 -0.25,-3.5 3.375,-1.25 0.875,0 1.25,-1.875 1.375,1.75 1.125,1.5 0.875,-1.125 -0.375,-1.625 [...]
+ id="path3931"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -10.32064,-70.35938 -1.667,1.083 -1.417,1.167 -0.833,-0.417 -0.833,-0.667 0.167,2.25 0.833,0.5 0.25,2.167 0,1.5 0.583,0.167 -0.833,1.25 0,1.75 0.833,2.083 1.083,0.583 1.5,-1.25 1.667,-0.167 1,-0.75 -0.417,-3.167 0,-2.083 -0.583,-0.667 1.167,-0.5 -0.083,-1.417 -0.667,-1.167 0.083,-1.083 -0.667,-0.75 -1.166,-0.415 z"
+ id="path3933"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -18.153586,-99.526374 -0.583,-0.916996 -0.333,-2 -1.333,-0.667 -1.917,0.667 -0.417,0.583 0.917,-2.333 1.667,-2.833 1.167,-1.667 1.833,-1.167 0.75,-0.333 2.5,0.417 1,0.167 1.5,-1.083 2.3329999,0 1.333,0.167 -0.083,1.083 -0.167,0.917 0.125,1.042 1.375,1.458 1.375,-0.458 1.125,0.542 0.417,1.333 -2.167,2.25 -4.167,0 0.167,1.75 -0.8749999,1.124996 -1.708,-2.374996 -1.083,-0.5 -0.75,1.5 -1.083,0 -2.918,1.331996 z"
+ id="path3935"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -16.903586,-110.69237 -0.167,-2.833 0.667,-2.417 1.583,-1.833 1.083,-2.083 -3.917,-0.25 -2.083,-0.75 -1.583,-0.417 -0.5,-0.917 0.167,-2.833 -0.667,-1.417 -0.417,-1 1.25,-2.167 -1.333,-1.333 -0.583,-1 0.333,-1.75 0.417,-1.833 -0.083,-2.083 -0.083,-1.167 1.667,-0.25 1.333,-1 1,-1.667 0.333,-2 0,-1.833 0.583,-1 -0.417,-1.083 -1.5,-0.417 -0.333,-0.917 1.083,-0.917 1.083,-0.833 2.333,-0.083 0.5,0.583 0.5,1.25 1,-0.167 -0.167,-1.583 0.333,-1 1.25,0 1.417,0.417 0.5,-0.583 -1.083 [...]
+ id="path3937"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -20.153586,-148.94237 -1.667,1 -3.167,-0.167 -2.167,0 0.167,1.833 2.167,1.667 0.333,2.333 -2.167,2.167 -1.167,-2.167 -0.333,-2.5 -1,-1.833 -0.833,1.5 -0.333,2.333 0,2 -1.5,1 0.333,2.167 1.833,0.333 -0.333,0.833 1.333,0.833 1.667,0 1.167,1.5 2.417,2.167 0.583,-3 -0.5,-4.167 2.167,0.083 1.833,-1.25 0.5,-1.417 0.333,-3.833 0.583,-1 -0.417,-1.083 -1.5,-0.417 -0.332,-0.915 z"
+ id="path3945"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -31.320586,-135.77537 -2,0.833 -0.833,0.5 -1,-0.333 -1.667,1.5 -1.333,0.667 1,1.5 1.167,0.167 0.833,1.333 2.333,0.167 2,2.667 0.5,1.5 2.167,-1.333 0.333,1.667 1.667,1.333 1.5,1.5 0.5,-3 1.167,-1.833 1.5,-2.667 -1.917,-2.333 -2.417,-2.167 -1.167,-1.5 -1.667,0 -1.333,-0.833 -1.333,0.665 z"
+ id="path3947"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -21.486586,-121.77537 -1.5,-0.167 -1.667,-0.167 0.5,-3 1.167,-1.833 1.333,1.917 0.167,3.25 z"
+ id="path3949"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -15.028586,-86.942374 c 0,0.76 -0.616,1.375 -1.375,1.375 -0.759,0 -1.375,-0.615 -1.375,-1.375 0,-0.76 0.616,-1.375 1.375,-1.375 0.759,0 1.375,0.616 1.375,1.375 z"
+ id="path3951"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -43.73664,-134.10938 -3.25,0 -1.25,-1.25 2.25,-1.5 1.75,-2.5 1.75,-0.25 0,-4.25 -2.75,-2 -2.75,0.25 -0.5,1.5 -1.25,-1.5 0.5,-2.5 -1,-2 -0.25,-2.25 -2.5,-3.5 -3,-2.75 -1.5,-1.75 -0.75,-5 -3,-3.25 -1.5,0.25 -1.5,0 1.25,-1.75 1.25,-0.25 -0.75,-2.5 1.75,-1.5 1,-3.25 1.5,-1.5 -0.75,-2.5 -5.5,0 -3,0.75 -0.5,-2 1.75,-2.25 2.5,-2.25 -0.25,-2.25 -2.167,0.5 -2,0.667 -3.333,0 -1,0.833 0,2.167 -1.833,1.333 0.167,1.833 c 0,0 -1.833,0.333 -1.5,1 0.333,0.667 0.5,2.833 0.5,2.833 l -2.333 [...]
+ id="path3953"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -54.82064,-207.27538 -1.833,1.333 0,2.167 -1.667,1.167 1.833,1 -0.167,1.5 1.833,-3 0.667,-2.5 -0.666,-1.667 z"
+ id="path3955"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -62.82064,-194.27538 -1.667,0.5 0.333,1.667 2.833,-0.167 -1.499,-2 z"
+ id="path3957"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -78.98664,-161.44238 -1.167,0.333 -0.833,0.167 -0.833,1.5 -1.333,1.5 -1.5,0 0.667,2.167 1.833,1.667 2.333,-1.5 0.667,-0.667 1.333,1.5 2.5,0.833 1,-1.5 -0.833,-2.333 0,-1.667 -1.5,-2 -2.334,0 z"
+ id="path3959"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -70.153586,-155.27537 -0.667,2.5 2.667,-2 -0.667,-1.333 -1.333,0.833 z"
+ id="path3961"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -77.861586,-140.48437 0,-1.875 1.625,-2.75 -0.125,-2 -0.75,-2.25 0.125,-2.75 1.667,-1.833 -2.5,-0.833 -1.333,-1.5 -0.667,0.667 -2.333,1.5 -1.958,-2 -0.542,-1.833 1.5,0 2.167,-3 -0.375,-1.667 -1.875,0 -1.375,0.75 -2.375,0.5 -1.125,1.5 0,2.125 1.75,0.25 0,1.375 -1,0.625 -0.5,1 -1.75,-0.25 -1.5,-0.375 -1.25,0.125 -0.5,2 -1.25,2 0.25,1.875 1,1 1.375,0.75 1.75,0.5 -1.5,1.625 -0.625,2 2.625,0.125 -4.25,1.125 -0.5,1.75 -1.25,0.5 1.875,0.75 -1.875,1.125 1.125,1.125 1.875,-1.125 - [...]
+ id="path3963"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 69.138414,-204.73437 -2.75,-0.125 -4.25,0 -2.875,0.625 -2,1.25 -1.875,1.25 -2.875,1 -3,0.625 -3.5,-1.25 1.5,-2.125 -1.5,-1.25 -2.5,-1.625 -1.75,-0.625 0.25,-3 0.875,-1.25 0,-2.375 0,-2.75 -0.875,-2.875 -0.25,-1.75 0.125,-1 -0.75,-1.75 0.625,-2.875 2.375,-2.625 0.625,-2 2.25,-2.625 2.5,-2.625 1.75,-1.625 2.625,-2.5 0.75,-2 2,-3.875 2.75,-0.5 0.25,-0.875 -0.5,-2.5 0.25,-2.625 -1.625,-2.25 -1.75,-1.5 -1.5,-1 -1,-3 -0.5,-1.625 0.875,-3.875 -1.125,-2.5 -0.125,-3.375 0.875,-2.6 [...]
+ id="path3969"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;stroke:#ffffff" />
+ <path
+ d="m 40.013414,-293.60937 -2.75,0.5 0,2.75 -0.5,2 0.5,2 -2,-0.25 -2.75,-0.5 -2.25,-1.25 -1.25,2.25 -0.5,3.75 -3,1 -2.75,1.5 -0.75,4 -1.5,2 0,2.75 -2.5,4.75 -1.5,4 -1.5,2.5 -2.25,0.25 -0.75,8.5 -2,4.25 -1.2500001,3.25 3.0000001,2.5 -1.5,2 -4.7500001,0.25 -1.5,3.5 -0.5,4 -1.5,3.75 1.5,4.75 -0.25,4.25 1,4.5 0.5,2.5 -0.5,1.75 0.25,5.25 -0.75,4 -2.625,3.625 -0.62499997,4.5 -2.37500003,-1.375 0.5,4.125 0.37500003,3.125 0.75,3.25 1.125,1.625 0.49999997,2.375 0.875,1.375 1.625,3.375 1 [...]
+ id="path3971"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;stroke:#ffffff" />
+ <path
+ d="m 32.388414,-183.48437 -2.5,1 -2.125,1.75 0.375,4.125 0.625,1.5 2.5,-4 0.125,-1.625 1,-2.75 z"
+ id="path3973"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 23.138414,-178.85937 -1.625,3.375 -0.875,5.125 2.375,-4.375 0.125,-4.125 z"
+ id="path3975"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 89.17936,-300.60938 -3.292,-0.375 -1.875,1.542 -3.333,-0.667 -1,2 -2.833,1.667 -1,3.333 -0.958,-0.25 0.375,-2.875 1.125,-2.75 0.625,-2.875 -2.25,-0.625 -3.125,-3.5 -3,1.125 -2.625,0.25 -2.75,3.5 -0.875,3.75 -0.125,2.25 -2.375,5.875 -2.125,1.5 -3.625,-2.375 -0.875,2.125 -2.625,0 -3.625,-1.25 -0.875,-2.75 -1.5,-3.125 -1.375,-1.875 -1.25,0 -0.875,4 -1.125,-0.625 -2.75,0.5 -0.125,3.125 -0.375,1.625 0.5,2 -4.75,-0.75 -2.25,-1.25 -1,1.75 -0.75,4.25 -5.75,2.5 -0.75,3.625 -1.5,2 [...]
+ id="path3977"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;stroke:#ffffff" />
+ <path
+ d="m 48.17936,-491.27537 -2.333,7.33299 -4.667,-1.333 -7,-5.66699 -4,8.99999 -2.333,-1.667 2.333,7.333 -0.667,3 8.333,0 5.333,-1 -5.333,4.333 -1,1.667 3.667,4.667 3.667,-1 6,3 0.333,2 7.333,-6.333 3.667,-5 5.333,-6 -3.333,-6.667 -5,0 -5.667,2 -1.667,-4.33299 -2.999,-5.333 z"
+ id="path3979"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;stroke:#ffffff" />
+ <path
+ d="m 19.84636,-480.60938 -2.667,6 1.333,8.667 0.333,9.667 -4.667,-10.667 -2,-6.333 -3.333,5.333 0.333,4.333 -3,-4.667 2.667,-3.333 0.333,-6.333 -7,3.333 -3.333,-1 -3.667,5 3.667,6 -1,4.667 3.667,-3 -0.333,9.667 -1.667,2.667 c 0,0 4.333,8 5,9 0.667,1 4,5.333 4,5.333 l 5,-5.333 1,-7.667 3.667,-1.667 -1.667,7 3.667,-4.333 0.667,4 1.667,3 -6.333,2 -2.667,6 c 0,0 -5.667,-1.333 -5.333,0 0.334,1.333 2,7.333 2,7.333 l 7.333,-3 4.667,-0.333 -8,3.333 4.333,4 -7.667,-0.667 0.667,5.667 5, [...]
+ id="path3981"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;stroke:#ffffff" />
+ <path
+ d="m -87.98664,-67.98438 -0.375,3.875 -1,2.5 -1,2.875 -0.125,2.75 0.875,1.125 1.75,-0.625 -0.5,2.5 -0.125,3.375 -0.875,1.875 2.875,0.25 2.75,0.25 2.5,-1.25 0.25,-3.875 1.5,-1.375 -1,-1.5 0.5,-3.75 -1.5,-2.5 1.75,-0.875 0.875,-2.75 0.25,-2.625 -0.125,-3.125 2,-1.125 0.5,-1 -1.25,-1.25 -0.125,-1.125 -1.375,-0.25 -1.625,0.625 -4,-0.25 -0.375,-1.75 -2.75,2.5 -0.375,2.5 0.25,2.5 -0.125,1.5 z"
+ id="path3985"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -161.73664,-51.85938 -2,0.75 3.125,1.75 1.375,-1.875 -2.5,-0.625 z"
+ id="path3989"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -56.15364,-84.94238 -1.333,2.333 -3.75,-0.25 -3.5,-0.5 -2.75,-0.25 -2.5,0.5 -8.5,-0.5 -3.75,-0.5 -1.75,-1 -2.375,0.75 -0.5,1.125 -3.75,0.5 0,2.375 1.25,1.25 1.25,1.625 0.25,2.625 2.875,-2.125 0.375,1.75 4,0.25 1.625,-0.625 1.375,0.25 0.125,1.125 1.25,1.25 -0.875,1.25 -1.625,0.875 0.125,3.125 -0.25,2.625 -0.875,2.75 -1.75,0.5 1.5,2.875 -0.5,3.75 1,1.5 -1.5,1.375 -0.25,3.875 c 0,0 1.5,0.125 2.25,1.125 0.75,1 1.75,2.375 1.75,2.375 0,0 -0.375,2.125 0.875,2.625 1.25,0.5 2.125, [...]
+ id="path3991"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -36.73664,-63.35938 c -0.5,0.25 -3.125,1.625 -3.125,1.625 l -0.5,1 c 0,0 1.375,0.25 1.75,0.5 0.375,0.25 1.75,1.125 1.75,1.125 l 1.875,-2.125 -1.125,-0.75 -0.625,-1.375 z"
+ id="path3993"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -33.98664,-63.48438 2.125,1.25 1.125,-1.375 -1.875,-1 -1.375,1.125 z"
+ id="path3995"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -43.98664,-59.10938 -1.375,2 1.625,1.625 1.125,-2.5 -1.375,-1.125 z"
+ id="path3997"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -111.23664,-4.35838 -1.75,3.75 2.5,-0.5 0.25,-2.625 2.25,-1.75 -0.875,-1.375 -1.625,1.375 -0.125,1.125 -0.625,0 z"
+ id="path3999"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -121.36164,-3.23338 -1.75,1.375 -1.25,1.125 1.875,1.125 1.875,-1.875 -0.75,-1.75 z"
+ id="path4001"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -118.23664,-0.98338 -0.625,2.125 1.5,0.875 1.125,-2.125 -2,-0.875 z"
+ id="path4003"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -128.23664,-5.35838 -0.5,2.25 1.75,0.375 0.875,-1.875 -2.125,-0.75 z"
+ id="path4005"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 58.679414,-18.775374 -2.917,-1.583 -4.5,-0.75 -1.5,-2.25 -4.5,-1.75 -5.75,0.5 -2.5,3 0,4.5 -1.25,3 -3.5,2.5 -3.25,-2.75 -9.25,-1.75 -3.5,-1.75 0,-3.25 -4.5,-2.25 -4.5000001,-1 -3.5,0 -3.49999997,-1.25 -0.5,2.5 -5.50000003,3.5 -0.25,5.75 -2.75,0.5 -0.25,1.75 1,3.0000001 1.5,3.25 -0.5,3 0.25,3.00000005 0,4.24999995 -2.25,2.75 2.25,2.25 2.25,5.9999999 2.75,0 3,3.25 1.5,2 6.25,1.5 2.2500001,2 8.25,-3.25 34.25,17.75 0.75,-2.25 4.25,0.5 -0.083,-9 0.167,-35.4999999 -0.833,-3.750 [...]
+ id="path4007"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -8.7365861,-13.358374 -1.7499999,-8.5 -3,-2.25 -0.75,-2.25 -2.5,-5.25 3.25,-4.75 -0.25,-7.5 -0.5,-1.5 0.5,-0.75 2.25,-1 1.7499999,-1 3,-0.5 1.25,1.75 2.5,1.25 -0.75,1.75 -0.25,2.5 2.25,3.25 -1.25,2.25 -2.5,2 -2.25,1.75 1.75,1.5 3,-0.5 1,1.75 0.25,1.5 -0.25,1.75 2.25000003,0.5 -0.5,2.5 -5.50000003,3.5 -0.25,5.75 -2.75,0.5 z"
+ id="path4009"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -35.736586,41.391626 10.75,-3.25 26.7499999,-18 -3.5,-4.25 -2.75,0 -2.25,-5.9999999 -2.25,-2.25 2.25,-2.75 -0.25,-7.25 0.5,-3 -2.5,-6.2500001 0.25,-1.75 -1.7499999,-8.5 -3,-2.25 -3.25,-7.5 3.25,-4.75 -0.25,-7.5 -0.5,-1.5 -2,-1.25 -3.5,-0.5 -3,0.25 -3,0.5 -4.25,0 -3.25,-0.75 -3.25,1 -3.75,0.75 -3.75,0.5 -3.25,1 -3.5,3 -3.5,0 -4.25,3.75 1.75,3 0.75,7.75 1.75,1.25 -0.5,3 -5.75,1 -1.75,1.5 -3,0.75 0.25,3.25 -5.5,3 -2.25,2.7500001 -3.75,1.25 -1.5,2 -2.25,-1 -4.5,2.5 -2.75,1.5 [...]
+ id="path4011"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -87.736586,0.14162615 -18.500004,-0.25 6,-2.50000005 2.750004,-2.5 3.75,-1.5 1,-5.2500001 0,-5.5 1.5,-3 1.75,-1.75 -0.5,-1.25 3.5,-4 3.5,-1.75 4.25,-2.5 1.75,-3.75 1.25,-5 1.25,-0.5 2,2.25 2,1.25 3,-0.25 2.25,0.25 2.75,0.25 4,0 1.75,3 0.75,7.75 1.75,1.25 -0.5,3 -5.75,1 -2.5,1.75 -2.25,0.5 0.25,3.25 -5.5,3 -2.25,2.7500001 -3.75,1.25 -1.5,2 -2.25,-1 -7.25,4 -0.25,3.75000005 z"
+ id="path4013"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -122.73659,31.391626 16.75,-0.75 -1,-6.75 1.5,-2.5 3.5,-0.5 0.5,-12.2499999 14.000004,0 -0.25,-8.49999995 -18.500004,-0.25 -1.75,3.74999995 -1.5,2.5 -3,1.25 -0.75,3.4999999 -1.25,3.25 -2.5,3 -2.75,3.25 -1.5,5.5 -1.75,2 0.25,3.5 z"
+ id="path4015"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -92.236586,58.391626 2.5,-1.25 2.25,0.5 15.25,-0.25 0.25,-3 -1.5,-0.75 -3.75,-40 5,-0.25 -15,-10.4999999 -0.25,5.75 -14.000004,0 -0.5,12.2499999 -3.5,0.5 -1.5,2.5 1,6.75 -16.75,0.75 0,1.75 1,4 -0.25,2 0.75,2.25 1.5,1.75 0,3.5 -0.75,3.5 -1,3.25 4,-0.25 3.25,-0.25 2,1.75 2.75,0.5 1.75,2.25 4.25,4 2,-1 2.250004,-3 2.25,1.25 2.25,-1 2.5,0.75 z"
+ id="path4017"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -102.23659,63.141626 2.750004,2.25 0.75,2.25 0.5,4 4.5,2 2.5,-2.25 2,0 2.75,3.25 -0.25,3 3.75,1.75 3.75,0.75 2,-2 c 0,0 0.25,2 1,2 0.75,0 2.5,-1.5 2.5,-1.5 l 0.25,-2.75 1,-2.5 2.75,-1.75 1.5,-3.75 1.75,-2 2,0.25 5.25,-2.75 5.75,-4.5 5.75,0 7.25,0.5 6,-1.25 1,-2.5 2,-5.25 0.25,-0.75 0.25,-9.5 -4.75,1.25 -0.25,-3.75 -5.25,-2 -1,-1.75 -30,-20.5 -5,0.25 3.75,40 1.5,0.75 -1,3 -15.5,0 -1.25,-0.25 -3.25,1.5 -1.75,-1 -3,1.25 -1.5,-1.5 -2.250004,3 -2,1 1.25,1.75 z"
+ id="path4019"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -47.986586,60.141626 0.25,4.5 2,2 0.75,2 5.25,2 0.25,1 1.5,0.25 3,2.5 0.5,-3.75 3,-3.5 1,-2.5 8.75,0.5 2,2.75 5,-0.75 5.4999999,2.5 5.5,-2.25 4.75,-0.75 3.5,0.75 4.25,-2.75 2.0000001,-5 6,-8 0.25,-11 2.25,-4.5 -3.25,-6.25 -0.75,-6.25 -4,1 -2.2500001,-2 -6.25,-1.5 -1,-1 -26.7499999,18 -6,2 -0.25,9.5 -3.25,8.5 -5.25,1.25 -8,-0.5 -0.25,1.25 z"
+ id="path4021"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 9.2634139,65.391626 2.2500001,2.75 1.75,1 1.75,4.75 0.5,4.5 1.75,2.25 -6,1 0.5,3.25 3.75,2.25 2.25,4.5 4,0.25 1.5,0.5 8.5,-2.25 0.5,-3.5 5.25,-0.75 3.25,-2.5 2.25,-3.25 2.75,-2.75 4.5,-0.5 -2.25,-2.25 -0.5,-4.75 -3,-1 2.5,-3.25 -0.5,-2.75 2.75,-3.75 1,-3 3.5,0.25 0,-17.25 -34.25,-17.75 -4.25,2.25 0.75,6.25 3.25,6.25 -2.25,4.5 -0.25,11 -6,8 -2.0000001,5 0.5,0.75 z"
+ id="path4029"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 108.51341,62.391626 2.75,-0.25 2.125,1.375 1.75,-1.75 1.75,1.375 3.25,-0.75 1.375,1 2.62491,0.75 2.875,2.5 1.75,1.375 1.75,-0.125 3.625,2.5 1.875,-0.5 -3.625,-3.375 -2.5,-2.375 -3.75,-3.375 -2.49991,-1.125 -0.625,-1.5 -1.375,-0.5 -1.375,-4 -1.5,-5.375 -1.75,-2.125 -3.5,2.75 -1,0.625 -0.75,0.5 -2.875,9 -0.375,3.375 z"
+ id="path4033"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 103.51341,102.14163 2.625,0.75 0.375,3.25 4.75,0 4.5,3.5 6.75,0.875 0.875,-2 3.49991,-2.25 1.125,1.875 2.875,0.5 2,-1.375 2.25,-0.375 3.375,-2.375 6,-0.375 13.875,-13.500004 -4.625,0.25 -13.625,-5.375 -4.375,-4.75 0.125,-3.75 -2.375,-0.125 -1,0.75 -0.625,-4 1.125,-3.5 -2.5,-2.25 -1.75,0.125 -4.75,-3.5 -2.49991,-1.125 -1.375,-1 -3.25,0.75 -1.75,-1.375 -1.75,1.75 -2.125,-1.375 -2.75,0.25 -1,6.5 -2.25,0.75 -2.75,4.75 -0.5,3.5 -3.249996,0.75 -1.75,9.5 -2.375,0.5 0,3 2.375,1 4 [...]
+ id="path4035"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 137.38832,75.766626 -1.5,1.25 -2.375,-0.125 -1,0.75 -0.375,-3.625 0.875,-3.875 1.125,0.25 1.875,-0.5 1.375,2.375 -0.125,2.75 0.125,0.75 z"
+ id="path4037"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 138.38832,76.891626 1.625,2.125 3.25,1.75 3.5,-0.375 2.5,-1.5 3.375,0.375 2.875,-2.125 2.25,0.25 3.375,-0.5 5.375,-0.625 2.5,-2.25 3,0.5 -0.5,1.75 0,3.125 1.125,1.125 -2,0.75 -0.25,2.5 -0.75,3.125 c 0,0 -1.375,0.125 -1.375,0.5 0,0.375 -2.625,4.375 -2.625,4.375 l -2.75,5 -1.875,4.500004 -3,2.875 -0.375,2.5 -9.125,8.875 -4.75,2.625 -5.875,4.375 -3.375,4.25 -4,5.25 -2.5,-3.875 0.375,-15.875 2.5,-2.125 0,-1.5 2,-1.375 2.25,-0.375 2.75,-2.125 6.25,-0.5 14.25,-13.625004 -4.625, [...]
+ id="path4039"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 99.263414,109.26663 0.625,2.75 1.749996,3.5 0,3.75 -4.624996,5 0.125,5.25 16.999996,9.25 0,2.125 6.5,4.375 2.875,-4.5 3.24991,-6 3.75,-2.75 -2.5,-3.875 0.5,-15.5 2.375,-2.5 0,-1.5 -2.875,-0.5 -1.125,-1.875 -3.49991,2.25 -0.875,2 -6.75,-0.875 -4.5,-3.5 -4.75,0 -0.375,-3.25 -2.625,-0.75 -5.624996,4.875 1.375,2.25 z"
+ id="path4041"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 79.013414,131.26663 3,-1.375 14.75,-0.625 0.25,-5 4.624996,-5 0.125,-3.25 -1.999996,-3.625 -0.5,-3.125 -1.375,-2.25 -3.375,2.375 -9.75,0.75 -1.125,0.125 0.125,4.375 2.125,0.875 -1.125,1.625 -6.125,6.375 0.375,7.75 z"
+ id="path4043"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 76.763414,132.76663 -0.75,2.375 0.75,3 1.25,-0.25 1,0.125 1.125,-2.25 3.625,-0.375 0,-2.875 -1.75,-2.625 -3.125,1.75 -2.125,1.125 z"
+ id="path4045"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 76.513414,139.64163 1.25,5.125 1.75,-0.125 3.875,-3.875 -0.125,-1.875 -0.5,-1.25 1,-2.25 -3.625,0.375 -1.125,2.25 -1,-0.125 -1.25,0.25 -0.25,1.5 z"
+ id="path4047"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 77.513414,146.89163 1,3.5 0.125,2.75 3.25,3.25 c 0,0 1.375,4.625 1.75,5.125 0.375,0.5 4.75,2.875 4.75,2.875 l 4.625,0.875 5.125,1.875 1.375,2.25 0.999996,5.25 3.125,0 3,-0.625 0.75,1.125 6.375,-0.375 1.375,-1.75 1.75,1.25 2.5,-1.25 6.37491,-1.25 -3.49991,-3.625 -0.125,-3.125 -1.625,-3.125 -0.125,-4.375 1.125,-2 -3.5,-2.875 1.25,-3.5 1.375,-3.875 -6.5,-4.375 0,-2.125 -17.374996,-9.5 -14.75,0.625 1.75,2.625 0,2.875 -1,2.25 0.625,3.125 -3.875,3.875 -1.75,0.125 -0.25,2.125 z"
+ id="path4049"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 17.179414,92.391626 -2.333,4 -1.333,2.667 -1,0 1.333,4.000004 2.167,3.833 0.5,3.167 4,3.5 3.167,-5 6.667,0.5 0.833,-2.167 3.167,-4.167 5.333,2.334 8.167,1.833 1.667,-2.667 4,1 2.833,-2 1.5,0.667 3.833,-1.5 2.333,1 2.833,-0.667 3.917,1.667 -0.5,-2.75 -3.75,-3.000004 -1,-3.5 -4.5,-1.5 -1.833,-1.417 -0.917,-2.583 -3,-0.5 -0.5,-2.5 -1.75,-0.5 0,-5 -2.625,-2.25 -0.542,-2.167 -3.667,0.5 -3.833,4.167 -2.167,2.5 -2.667,2 -5.25,0.75 -0.5,3.5 -8.5,2.25 -1.917,-0.667 -3,0.167 -1.166,0.5 z"
+ id="path4051"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -121.31959,55.391626 -0.167,2.666 -2.833,2 2.167,5.334 4.667,0 2.833,-1 2,1.833 2.167,0.333 -0.167,0.667 -3.167,0 -1.667,-0.667 -4.667,1.167 -2.667,0.333 -0.333,3.334 5.5,-0.334 2.5,-1.5 7.667,0.167 3.167,1.167 6.083004,0.75 -0.25,-3.084 -1,-3.166 -2.333004,-1.667 -1.667,-2.333 -4.833,-4.167 -1,-1.667 -2.5,-0.833 -2.417,-1.833 -7.25,0.5 0.167,2 z"
+ id="path4053"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -122.15359,72.224626 2.833,1 1.833,0.833 0.833,3.834 1.5,-1.334 2,-2.333 2.833,-0.5 -0.167,-1.833 1.333,-2 -6,-0.334 -2.5,1.5 -5.5,0.334 1.002,0.833 z"
+ id="path4055"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -122.15359,65.391626 -0.667,2.666 6.833,-1.5 2.667,0.5 2.667,0.167 0.167,-0.667 -2.167,-0.333 -2,-1.833 -2,1 -5.5,0 z"
+ id="path4057"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -115.81959,78.391626 1.5,-0.834 1,2.334 2.167,2.333 1.833,1 0.667,2 2.667,0.333 1.667,-2.333 1.5,-1.5 2,0.333 1.667004,-1.333 0.833,0.5 2.167,5.167 -0.333,2.5 2.5,-1 1.833,0.166 1.5,3.334 0.167,1.5 2,0 2.167,-1.5 1.5,-1.5 0.333,-2 1.667,-0.667 -1.167,-4.167 -0.667,-2.333 1,-1 -3.083,-2.083 0.25,-3 -2.75,-3.25 -2,0 -2.5,2.25 -4.5,-2 -6.083004,-0.75 -3.167,-1.167 -1.667,0.167 -1.333,2 0.167,1.833 -2.833,0.5 -3.5,3.667 0.831,0.5 z"
+ id="path4059"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -100.48659,96.391626 2.000004,-3.667 2.333,-1.667 1.167,-1.166 0.167,-1.334 -1.5,0 0.167,-2.166 -2.167,-5.167 -0.833,-0.5 -1.833004,1.667 -1.833,-0.667 -1.5,1.5 -1.667,2.333 -2,0 0,2.667 1.167,2 1.333,0.667 0.667,2.666 4.332,2.834 z"
+ id="path4061"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -71.486586,80.724626 3.5,1.833 0.833,-0.833 3.5,0.333 1.833,2 -0.167,-7.166 10.333,-0.334 1.5,-0.333 2.167,0.667 2.833,0.166 1.833,-1.666 2.333,-0.334 1.667,-2.666 -0.417,-1.75 -5.25,-2 -0.75,-2 -2,-2 -0.417,-5.75 -5.333,0 -5.333,4.5 -5.667,2.75 -2,-0.25 -1.667,1.666 -1.667,4.5 -2.667,1.334 -1,2.5 -0.25,2.75 2.253,2.083 z"
+ id="path4063"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -87.320586,97.224626 3.333,1.333 2.667,2.334004 -0.833,4.333 -0.5,1.5 -6.5,-2.333 -3.167,-3 -3.333,-2.667004 -2.333,-1.167 -2.500004,-1.166 2.000004,-3.667 3.5,-2.833 0.167,-1.334 2.667,-0.5 1.5,3.334 0.167,1.5 2,0 1.667,-1 0.833,2.833 -0.167,1.5 -1.168,1 z"
+ id="path4065"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -79.820586,106.39163 6.333,-3 7,-0.167 3.5,-0.333 1.333,-0.334 -0.167,-2.5 -1.667,-4.000004 1.667,-4.833 1,-3.833 -1,-3.334 -1.333,-1.833 -4,-0.5 -0.833,0.833 -5.75,-3.916 -2.5,1.5 -1,-2 -2.417,2.083 -4,-0.5 -1,1 1.833,6.5 -1.667,0.667 -0.333,2 -2,2 0.833,2.833 -0.167,1.5 -1.167,1 6,3.167004 -1.333,6.333 2.835,-0.333 z"
+ id="path4067"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -48.486586,79.724626 -0.333,4.334 1.167,-0.167 0,4 0.5,4.833 0.333,3 2.333,2.834 -1.5,1.666004 -4.167,0.5 -3.833,2 -3,1 -2.5,1.167 -1.667,-1 -3,-0.833 2.5,-0.501 -0.167,-2.5 -1.667,-4.000004 2.667,-8.666 -1,-3.334 -0.167,-7.166 10.333,-0.334 1.5,-0.333 0.667,1.667 1.001,1.833 z"
+ id="path4069"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -46.153586,78.891626 2.5,3.833 1,5.167 0.667,7.667 0.5,2 -3,1 -2.333,-2.834 -0.833,-11.166 -1.167,-0.5 0.5,-4 -1.833,-3.834 4.167,1 -0.168,1.667 z"
+ id="path4071"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -37.486586,97.058626 -0.167,-11.834 3,-3.333 1,-3.5 0.5,0 -1.833,-4 -3,-2.5 -1.5,-0.25 -1,3.25 -2.833,0.5 -2,2.167 -0.667,-0.334 -0.167,1.667 2.5,3.833 0.833,4.167 0.833,8.333 0.5,2.334 4.001,-0.5 z"
+ id="path4073"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -31.320586,97.558626 3.833,3.666004 0.833,5.334 5.833,0.166 5.833,-1.333 1.373,-0.823 1.961,-1.177 1,-4.000004 5.4999999,-5 4.66700003,2.333 4.16699997,-7.833 2.167,-2.667 1.667,-3.5 1.333,-3 1.5000001,-3 2.333,-1.5 -0.5,-3.333 -0.833,-4.167 -2.8330001,-2.5 -4,2.167 -3.5,-0.75 -4.667,1.25 -5.5,2.167 -5.5829999,-2.917 -4.583,0.583 -2.417,-2.583 -8.75,-0.5 -1,2.5 -3,3.5 -0.5,3.75 1.667,3.333 -1.333,4.167 -2.5,3 -0.333,12.167 6.165,0.5 z"
+ id="path4075"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -7.9865861,110.89163 0.167,4.5 21.1670001,0.167 4.333,1.166 2.667,1.334 -0.167,-2.167 0.333,-2.333 -4,-3.5 -0.333,-2.667 -3.667,-8.333004 1,0 4.25,-7.417 -2.083,-4.083 -3.917,-2.667 -0.5,-3.25 6,-1 -1.75,-2.25 -0.667,-5.167 -1.583,-4.083 -1.583,-0.583 1,6.666 -2.333,1.5 -4.5000001,10 -2.167,2.167 -4.16699997,7.833 -4.16700003,-2.166 -5.9999999,4.833 -1,4.000004 -2.333,1.5 1,2 0.833,-0.667 1.167,2.167 2.6669999,-0.667 -0.667,2.334 1,0.833 z"
+ id="path4077"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -0.48658607,115.55863 -0.66700003,5.666 -4.833,-0.5 -0.667,1.334 -1.5,-1 -1.667,-0.667 2,-5 7.33400003,0.167 z"
+ id="path4079"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 7.5134139,115.55863 0.333,4.5 4.6670001,-0.667 -0.167,2.5 -1.167,1.833 -0.667,1.834 0.5,1.833 2.167,0.667 -0.5,6 -1.667,1.833 -2.0000001,-0.667 -2.5,0 -2.5,-2 -0.167,2.5 -2.333,-0.5 -1.33299997,1 0.667,2.5 1.33299997,0.5 -0.833,2.5 -2.16699997,-0.166 -1.16700003,1 -8.4999999,-9 -2.167,-4.667 2.333,-1.333 -0.167,-4.5 2.3329999,-2 1,1 1.167,-1.334 4.833,0.5 0.66700003,-5.666 8.00199997,0 z"
+ id="path4085"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 30.346414,109.05863 -0.167,2.666 -2.167,6.5 -1.667,4.334 0,4.166 -6.833,8 -0.167,6 -4.833,5 -2.167,-2 -2.5000001,1.5 -2,1.167 -1.5,0 -1.5,2.167 -1.833,1.833 0,2.333 3.833,-1.5 1.167,-1.5 2.8330001,1.334 10.833,-0.167 1.5,6.167 3.333,2.666 7.833,-0.166 0.167,-1.834 -0.333,-1.666 5,-0.834 0,2.167 5.5,-0.333 -0.333,2.166 0.833,4 -1.333,3 2.667,4.334 0.167,1.666 7.167,0.834 1.667,0 0.5,1 2.5,-1 2.333,1.833 4.667,1.833 1.667,-1.666 2.833,2.166 1.333,1 1.667,1.667 2.667,2.333 2 [...]
+ id="path4087"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 23.679414,108.55863 6.167,0.5 0.333,2.666 -3.833,11.334 0,3.666 -6.833,8 -0.167,6 -4.833,5 -2.667,-2 -4.0000001,2.667 -1.5,0 0,-1.667 -1.5,-0.166 -3.167,2.5 -1.49999997,-2.334 -2.16700003,-2.166 1.16700003,-1 2.16699997,0.166 0.667,-2.166 -1.16699997,-0.834 -0.667,-2.5 1.33299997,-1 2.333,0.5 0.667,-2.333 1.833,1.333 2.667,0.5 2.0000001,0.667 1.667,-1.833 0.5,-6 -2.167,-0.667 -0.5,-1.833 0.667,-1.834 1.167,-1.833 0.167,-2.5 -4.6670001,0.667 -0.333,-4.5 5.8330001,0 4.333,1 [...]
+ id="path4089"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 53.346414,173.05863 0,3.5 0.333,2.666 -0.5,2 -8,-0.333 0.333,15.5 2.333,1.833 2.167,1.5 0.667,1.334 6.833,-0.334 1.167,1.334 7.333,1.166 6,-5.333 2.333,-0.667 1,-3.5 5,-1.666 -0.5,-1.667 13.167,-4.833 -0.667,-2.334 0.833,-3.166 1.333,-1 0,-5.167 1.833,-2.5 -3.333,-6.125 -4.625,-0.875 -5.708,-3.333 -7,1.666 -1.833,3.334 0.333,2.333 0,3.5 -1.167,2.667 0.667,1.833 2.333,2.5 2.833,-1.167 0.667,4 -0.833,0.5 -3,0 -4.333,-4 -4.167,-3.166 -1.667,1.666 -4.667,-1.833 -2.333,-1.833 [...]
+ id="path4091"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 99.346414,188.05863 0.5,3.666 -0.667,3.5 2.499996,2.834 0.833,1.666 1,-4 1.333,-1.5 0.833,-5.666 -4.5,-5 -1.666996,-3 0.999996,-5.917 -0.999996,-5.25 -1.375,-2.25 -5.125,-1.875 2.833,5.625 -1.333,3 0,5.167 -1.333,1 -0.833,3.166 0.667,2.334 2,1.5 1,1.5 1.667,-0.667 1.667,0.167 z"
+ id="path4093"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 81.346414,192.39163 1.167,2.167 4,0.166 3,1.667 2.333,1 1,3.833 0,4.834 -1.5,1.666 1.5,2.334 0.167,2.833 -2,3.5 -1.5,3.167 -3.667,5.166 2.167,3.334 c 0,0 -1,2.166 -0.333,2.666 0.667,0.5 2.5,7.334 2.5,7.334 l -0.667,3.166 0.333,3.834 2.667,-0.334 -0.333,-2.666 -0.667,-0.167 1,-2.333 4.667,-1.5 4.666996,-3 1,-5.334 0.5,-7.333 -2,-1.333 -0.167,-3.667 -1.999996,-2.667 0.999996,-2.666 3.5,-1.5 2.333,-2.834 2.667,-0.166 0.833,-4 5.167,-2.5 4.833,-1.5 2.333,-2.334 2.83291,-3.333 [...]
+ id="path4095"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 163.17932,177.39163 -2.5,3.833 c 0,0 0,2 -0.5,2 -0.5,0 -4,0.5 -4,0.5 l 0.333,3.5 -1.667,2.334 -1.833,2.166 -3,1.334 1.333,2.5 -3,-1 -4.667,0.833 -1.5,0.833 0.333,1.834 -2.333,2.833 0.333,4.5 1,3.5 1.5,3.333 -1.5,3.167 -1.5,2.333 -1.333,2 -1.667,2.167 0.833,6 2.167,2.167 -1.333,2.666 2.5,3.5 c 0,0 2,1 2.333,1.667 0.333,0.667 2.333,2.333 2.333,2.333 l 2.5,-2 3.333,-0.333 3.167,-3.167 2.333,-8.666 3.5,-12.167 3.5,-9.667 0.333,-4 0.833,-2.666 -0.167,-3.5 0.667,-1.167 1,1.667 [...]
+ id="path4097"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 59.680414,202.72463 0.5,2 1.167,0.834 1.833,4.333 1.167,2 2.833,1 2,1.667 1.5,1.166 0.167,2.5 3.667,2.334 2.167,1.666 4,0.167 5.167,2.333 4.167,-5.833 3,-6 -0.167,-2.833 -1.5,-2.334 1.5,-2.333 0,-4.167 -1,-3.833 -5.333,-2.667 -4,-0.166 -1.167,-2.167 -1,-0.333 -5,1.666 -1,3.5 -2.333,0.667 -6,5.333 -6.335,-0.5 z"
+ id="path4099"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 0.84641393,200.22463 3.83299997,-0.666 3,-0.334 3.3330001,1.5 17.667,0 4.667,1.834 11.667,0.666 5.667,-2.166 6.833,-0.334 2.167,2 -2.167,0 -1.833,0.834 -3.333,2.166 -1.833,-1.666 -8.333,1.333 -0.833,0.333 0,16.167 -4,0.333 0.167,30.834 -2.667,0.666 -0.667,1.167 -4.167,0 -4.167,-0.5 -1.833,-2.5 -1,0 -1.667,2.333 -4.667,-4.833 -2,-5.333 -1.167,-4.667 -0.167,-3.667 -1.167,-4 -0.167,-4.5 0.167,-1.666 -1.667,-3.334 -1.8330001,-2 -3,-7 -1.167,-3.666 -3.5,-3.5 -0.16599997,-5.834 z"
+ id="path4101"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 9.8464139,171.89163 -1,6 -2,3.5 c 0,0 -2.833,2.999 -3,3.666 -0.167,0.667 -1.833,7 -1.833,7 l -1.83299997,5.334 0.667,2.833 6.33299997,-1 3.8330001,1.5 17.667,0 4.667,1.834 11.667,0.666 5.667,-2.166 -0.667,-1.334 -4.167,-2.833 -0.667,-16 8,0.333 0.5,-2 -0.333,-6.166 -6.667,-0.834 -0.167,-1.666 -2.667,-4.334 1.333,-3 -0.833,-4 0.333,-2.166 -5.167,-0.001 -0.333,-1.833 -5,0.834 0.333,1.666 -0.167,1.834 -6.833,0.166 -4.333,-2.666 -1.5,-6.167 -10.833,0.167 -2.8330001,-1.334 -1. [...]
+ id="path4103"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 1.6794139,147.05863 1.333,3.333 2.333,-2.667 1,-1.333 0,-1.667 -1.5,-0.166 -3.166,2.5 z"
+ id="path4105"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 37.513414,236.64163 2.75,3.25 0,3.75 0.25,1.75 6.25,-0.75 0.75,-2.75 3.25,-4 1.25,0.75 5.75,1 3.5,0 2,-4.25 1.5,-0.5 2.25,-5 4.5,-4.25 3,-2.25 2.167,-1.167 -5.833,-4 -0.167,-2.5 -3.5,-2.833 -2.833,-1 -3,-6.333 -1.167,-0.834 -0.5,-2 -2.167,0 -5.167,3 -1.833,-1.666 -9.167,1.666 0,16.167 -4,0.333 0.167,14.417 z"
+ id="path4107"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 45.513414,281.64163 4.5,0 2.5,-0.75 4.5,1.5 2.75,-1.75 2,-1.25 4.5,-0.5 3.25,-2 2.75,-2.5 4.75,-4.25 3.5,-4 5.75,-9.25 4.5,-4.5 1.75,-7.667 -2.667,0.334 -1.333,2.583 -4.75,-0.75 -0.25,-3.5 1.5,-3.25 4.25,0 0.917,-2.083 -1.917,-6.917 -1,-1.5 0.75,-1.583 -2.167,-3.334 -5.167,-2.333 -4,-0.167 -9.667,7.667 -2.25,5 -1.5,0.5 -2,4.25 -5.25,-0.25 -4,-0.75 -1.25,-0.75 -3.25,4 -0.75,2.75 -6.25,0.75 -0.25,-5.5 -2.75,-3.25 0,16.417 -2.667,0.666 -0.667,1.167 -4.167,0 -4.167,-0.5 -1.83 [...]
+ id="path4109"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 73.763414,253.76663 -1.75,1.25 -1.75,0.5 -3,3 0.75,1.875 1.5,2.375 1.75,1.25 0.875,-1.875 2.125,-1 1.75,-0.875 0.25,-2.25 0.5,-1.625 -1.5,-1.375 -1.5,-1.25 z"
+ id="path4111"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 89.513414,242.14163 0.375,-2.5 -4.5,0.375 -1.625,2.75 0,4.125 4.875,0.375 1.208,-2.208 -0.333,-2.917 z"
+ id="path4113"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 121.51336,-84.44238 7.83296,-0.167 3.667,2 6,1.333 2.667,2.167 5.5,0.167 1.833,2.833 4.5,1.167 2.667,2.5 1.833,0.667 2,-2.167 -2,-4.167 -2.75,-4 1,-3.5 -1.5,-0.75 -1.25,-2.5 -2.25,-0.75 2.5,-2.75 2,-5.25 0.75,-2 2,2.25 1.667,-1.583 0.333,-2.5 2,-2.667 -1.167,-2 -7.167,-6.833 -1.667,-2.833 2.5,-13.167 5.167,3.667 0.833,-2.5 -0.833,-2.333 1.5,-2 0.083,-3.25 3.083,0.417 3.833,-2.167 0.5,-1.667 3,1 -0.5,2.167 2.167,-1.5 2.333,0.167 2.667,-0.833 2.833,0.833 3.333,3.333 0.667,3 [...]
+ id="path4123"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 731.51332,-324.94238 -7.333,5 1,4.333 7.333,-2 5.333,0.667 2,-5.333 -4.666,-3.667 -3.667,1 z"
+ id="path4125"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 570.51332,-349.27538 -10.667,-1.333 -5,-0.667 4,-3.667 0.667,-4.333 -4.667,-2.333 1.667,-4.667 4.333,0 -0.667,6.333 1.667,1.333 2.667,-1 4.667,1.667 2.667,4 0.333,5 -1.667,-0.333 z"
+ id="path4127"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 553.51332,-377.94238 -1.667,4 -5.667,-4.667 0,-6.667 -2.333,-3.333 3.667,-5.667 2.667,-5 5.667,3 1,5.667 2,2 2.667,-1.333 -0.333,-5 3.333,-1 6.333,4.667 2.333,1.667 5,1 2,1.667 -3.333,4 -1.667,4 -4,-2 0,-5.667 -5,-2.333 2.333,6.333 1,3 3.333,1.333 -3.333,2 -4.333,-0.333 -3.333,0.333 -5.667,2 -0.667,-3.333 -2,-0.334 z"
+ id="path4129"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 584.51332,-387.94238 2,5.333 1.667,4.333 6.667,4 6,1 2.667,-3.333 -3.667,-4.667 -4.667,-1 -3.667,-2 -7,-3.666 z"
+ id="path4131"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 364.51332,-513.10937 -2.5,9.49999 -12,4.5 -0.5,8.00001 4.5,7.49999 2.5,3.5 -5.5,2 -6.5,-2.5 3,8.5 5.5,-1.5 4,-3 1,2 -5,7 5.5,4.5 2,5 5.5,0.5 3,5 8.5,1 5.5,-4 6,2.5 -4,9.5 -1.5,9 5.5,-2.5 11.5,-0.5 5.5,-6 0.5,-6.5 -6,-6 -4,-3 -1,-5 -4.5,-1 -1.5,7 -0.75,4 -4.75,-2 -2,-5.25 0.5,-6 0.75,-5 -1.25,-5.5 -3.25,-2.25 -2.5,2 -3.5,-3.75 -1.5,-1.5 -8,1.75 -4,2.75 0,3 -2.25,-2.25 0.25,-2.25 2.25,-1.25 3,-2.5 2.75,-2.74999 4.75,0 1.5,-1.25 -0.75,-4.75 2.75,-4.50001 -1.5,-5 -3.75,-1.75 [...]
+ id="path4133"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 243.17932,-413.27538 -5.667,3 -7,6.333 -7.333,5 -5,-1 -6.667,3.333 -5.667,4.667 -6.333,5.667 -1,5 -7,1.667 0.333,6.333 0,5.333 -3.667,3 -3,6.667 3,2 -3.667,4 -0.667,3 -4.333,5 -2.667,3.667 2,4 -2,4.667 -4.333,-0.667 1.333,6 3.667,3.333 1.333,-1.667 3.667,4 -1,2.667 0.667,3 5.667,1.333 4.333,1.333 4.667,-1 2,1.667 1,-2.333 -4,-2.667 -2.333,-4.333 -2.333,-7 -0.333,-5 -0.333,-8.333 4,-3.667 1.667,-5.667 2.333,-6 1.333,-5 2.333,1 1,-5.333 1.333,-4.333 2.667,-0.667 2.667,1.333 [...]
+ id="path4135"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 160.84632,-297.27538 -3.667,3.667 1.333,4.667 6,-1 3,-4.667 -3,-2.667 -3.666,0 z"
+ id="path4137"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 49.26336,-156.10938 -4.125,0.125 -3.625,-1.25 -3.875,0.125 -1.25,0 1.25,-1.375 -0.75,-1.375 2.75,-0.625 0.25,1.25 1.375,-1.125 -0.375,-2.25 1,-0.5 -0.375,-1 1.875,1.25 2.75,1 3.5,1.125 0.25,2 -0.125,1.625 -0.5,1 z"
+ id="path4139"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 228.26332,-516.60937 -4,3.75 -3.25,6.74999 3,4.5 2.75,-3 5.25,-0.5 -2,-5.75 0.5,-5.49999 -2.25,-0.25 z"
+ id="path4141"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 166.26332,-503.10938 -1.75,4.25 -4.5,2.75 -2,-4.75 -10,-0.75 -7,4.5 c 0,0 1,4.00001 1.75,4.00001 0.75,0 5.5,2.25 5.5,2.25 l 0.5,-6.75001 3.25,-1.5 4,2 2.5,1.5 -5,1 c 0,0 -3,2.00001 -2,2.00001 1,0 5,1 5,1 l -1.5,2.75 -5.25,2 3.25,4.49999 3.75,-1.25 -0.25,3.5 3.25,-1.5 c 0,0 1.75,-2.75 1.75,-3.5 0,-0.74999 -0.25,-3.24999 -0.25,-3.24999 l 4.25,0.25 1.25,-4.25 3.5,-1.5 1.75,-4.00001 -5.25,0.25 c 0,0 0.75,-3 1.5,-3 0.75,0 3,-1.5 3,-1.5 l -3,0.25 -2,-1.25 z"
+ id="path4143"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 208.76332,-500.60938 -1.25,4.75 -1,7.75001 7.5,-0.5 c 0,0 2.75,-0.25 2.25,-1.75 -0.5,-1.5 -3,-6.00001 -3,-6.00001 l 3.25,-2 1.25,-3 -4.25,0.5 -4.75,0.25 z"
+ id="path4145"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 185.51332,-507.35938 c 0,0 -0.25,2.75 0.5,3 0.75,0.25 4,0.75 4,0.75 l 2.75,3.25 4,1.75 2.75,0.75 -1.75,-3.5 -5.5,-2.75 -0.25,-1.5 -6.5,-1.75 z"
+ id="path4147"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 197.51332,-521.60937 -2,2 4.25,3.25 3.25,-1.75 -2.75,-2.5 -2.75,-1 z"
+ id="path4149"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 194.01332,-516.35937 -0.5,2 c 0,0 -5.75,0.75 -5,1.25 0.75,0.5 4.75,1.49999 4.75,1.49999 l 3.25,-1.74999 c 0,0 3.5,1 3,0.25 -0.5,-0.75 -1.75,-2.75 -1.75,-2.75 l -3.75,-0.5 z"
+ id="path4151"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 193.51332,-488.60937 -1.75,1.75 c 0,0 -0.5,6.49999 0.25,6.24999 0.75,-0.25 5,0.25 4.75,-0.75 -0.25,-1 -0.25,-2.25 -0.25,-3.25 0,-0.99999 0,-2.74999 0,-2.74999 l -3,-1.25 z"
+ id="path4153"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 198.51332,-490.60937 c 0,0 0.25,3 0.5,4 0.25,1 1.75,4.74999 1.75,4.74999 l 1.75,-4.49999 1.5,-1 -3.5,-2.5 -2,-0.75 z"
+ id="path4155"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 192.51332,-507.85938 c 0.75,1 2,2.75 2.75,3.25 0.75,0.5 3.5,2 3.5,2 l 1.25,-2 -3.25,-3.25 -4.25,0 z"
+ id="path4157"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 211.01332,-507.60938 0.25,2.5 3.5,2 1.75,-3.5 -2.5,-1 -3,0 z"
+ id="path4159"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m 179.51332,-488.35937 -1.5,2.5 c 0,0 -5.25,2.74999 -1.5,2.99999 3.75,0.25 7.25,0.5 7.25,0.5 l -0.5,-3.49999 -3.75,-2.5 z"
+ id="path4161"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -38.15364,-132.60938 -2.5,1.333 -2.333,1.167 -1,3.333 -0.833,1.667 -3.833,1.667 -0.167,2.167 -1.5,0.5 -3.167,-0.167 -1.333,0 -1.667,-1.5 -2.167,0 0.833,2.667 0.833,1.5 0.333,2.667 -2.5,0.167 -2.333,-0.167 -2.167,-1.5 -2.333,0.167 -2.833,1.5 -2.667,0.333 c 0,0 -2.5,0 -1.833,0.333 0.667,0.333 2.167,1 2.167,1 l 1.667,1 -0.833,1.167 2,1.333 1.667,-0.167 2.333,1.5 1,1 1.167,-0.167 1.833,0.167 -0.5,2.167 1.333,1.5 0.667,1.333 2.167,2 1.5,1.667 -0.167,1.167 0.5,2.167 0.5,0.833 - [...]
+ id="path4253"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -9.98664,-81.10938 -0.5,1.667 -1,0 -1.333,1.333 -0.5,1.833 0.833,1.667 1.333,2 1,1.167 1,-2.5 0.5,-1.833 -0.5,-3.167 0,-1.5 -0.833,-0.667 z"
+ id="path4255"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -672.46094,-297.1288 -0.167,95.333 4.667,0.833 2.167,-1.333 2,1.667 0.5,2 6.333,6.333 0.5,2.667 2.167,-2 1,-1.5 1.666,-0.333 0.5,-1.5 3.167,-1 1.667,0.833 0,1.667 6.833,7.5 0.167,2.667 3.5,5.5 1.833,4.5 3.167,4 6.5,4.333 -0.834,1.833 0.167,2.5 -1.167,3 -3.166,2.583 -0.334,1.417 3.5,-1.5 0.667,2.75 -1.167,1.5 1,1.25 0.417,1.917 -2.333,0.167 1.916,2.667 1.667,-1.083 1.167,-0.417 2.416,-1.25 1.084,1.083 -1.667,2.25 -0.75,1.75 0.833,3.417 0.584,-2.583 1.916,-1.25 0.667,3.417 [...]
+ id="path4163"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -407.21094,-170.7958 -2,4.5 1.5,3 3.75,-4.75 -3.25,-2.75 z"
+ id="path4165"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -433.71094,-252.5458 -1.25,4.5 -1.5,10 -2.25,3.5 -1,3.5 6.25,-1.75 0.25,4 4.5,-0.25 2.75,-3.5 3,-3.5 1.25,1.25 3.5,2.25 4,2 4.5,-3.25 -2.5,-2.25 -4,0.25 -1.25,-6 -6.25,-2.5 -3,-4 -3.75,0.25 -3.25,-4.5 z"
+ id="path4167"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -419.21094,-224.7958 -3,1.5 -2.75,-0.5 0,4.75 4.75,0.25 2.25,-4.75 -1.25,-1.25 z"
+ id="path4169"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -409.96094,-218.7958 0.25,2.75 2,3 1.5,-5.25 -2,-0.75 -1.75,0.25 z"
+ id="path4171"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -391.46094,-281.0458 -3.75,1.25 -2,4.75 0.25,4 1.75,1.75 5.5,-0.75 1.5,-5 0.5,-4.25 -3.75,-1.75 z"
+ id="path4173"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -419.46094,-300.5458 5.5,0 4,3.5 3,-1.25 -4.5,-2 -3.75,-2.5 7,0.5 4.25,2.25 0.25,-4.75 -1,-3 5,2.5 1.75,4.75 1.5,2.5 2,2.75 3.75,2.75 -2.75,2.5 0,4 3.75,-2.25 2.75,1 1.25,1.75 2.25,1.5 0.75,0 2,4.5 1.75,1.25 1.75,7.5 -0.25,4 -1.75,2.25 3.75,1 3.25,0.25 2.5,-3.75 5,4.75 c 0,0 1.5,0.75 0.75,1.25 -0.75,0.5 -7.5,2.75 -7.5,2.75 l -2,-3.25 -5.75,-0.5 -2.25,3 -2.25,3.5 -0.25,3 -3,2.5 -6,0.75 -6.75,-0.25 c 0,0 0.25,4 0,4.75 -0.25,0.75 0.75,5.25 0.75,5.25 l 6,2 3.5,-3.25 3.75,0.5 [...]
+ id="path4175"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -564.21094,-350.7958 -5.25,4 -4.75,4.5 -4.75,6.25 -3,5.25 -4,3 -0.75,6.75 -5.25,2 -4,3.5 -2.75,-3.5 -2.25,-6.25 -6.25,-2.25 2.25,-7.25 1,-8.25 c 0,0 2,-2.75 2,-3.75 0,-1 -0.75,-6.25 0,-6.75 0.75,-0.5 4.25,-4 4.25,-4 l -4.25,-7.5 8.25,-1 3.5,-1 5.25,1 2.75,4.25 2.5,2.75 2.5,-3.75 3.75,-0.25 c 0,0 4.25,3.5 4.5,4.25 0.25,0.75 3.75,4.25 3.75,4.25 l 2.5,3 -1.5,0.75 z"
+ id="path4177"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -559.71094,-347.5458 -4.25,2.25 -5.75,2.5 -5.75,6.25 -0.75,3.75 1.5,0.5 -3.25,4.25 0.25,4 3.75,-0.5 0.25,2.75 7.75,-0.25 2.75,1.5 -6.75,2.25 -6.75,1.5 4.5,5.25 5.25,2.25 7.5,-0.5 3.75,-0.25 3.75,3.5 -1.25,1.25 -11.25,0 -6.25,3.25 3,4.5 4.5,3.25 6,0 c 0,0 2,2.5 2,3.25 0,0.75 1.75,5.5 1.75,5.5 l 5.75,0.75 8,-1 c 0,0 4.5,-2.25 5.25,-2.5 0.75,-0.25 2.75,-1.75 4.5,-1.75 1.75,0 3.75,0 4.25,-1.25 0.5,-1.25 2,-4.5 3,-4 1,0.5 4.25,3.5 4.25,3.5 -0.25,1.25 2.25,3.25 2.25,3.25 l 5.5, [...]
+ id="path4179"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -487.21094,-357.0458 -2.5,1.25 -5.5,1 -1,-2 -2.25,1.25 -1.25,2.25 -0.75,2 c 0,0 3.5,2.5 2.5,3 -1,0.5 -4.25,1.75 -2.75,1.75 1.5,0 3.5,-0.5 3.5,-0.5 0,0 2.25,1.75 1.25,2 -1,0.25 -1.25,2 -1.25,2.75 0,0.75 -0.75,3.25 -0.75,3.25 l -2.25,0.75 c 0,0 -2.75,-4.25 -3.5,-4.25 -0.75,0 -1.5,-0.75 -2,0 -0.5,0.75 0,4.5 0,5.25 0,0.75 1,3.75 1,3.75 l 4,2.5 2.5,0.25 c 0,0 1.5,2 2,3 0.5,1 1.75,4.5 1.75,4.5 l 2,3.25 2.5,0 c 0,0 3.25,-1.75 2.5,-2.5 -0.75,-0.75 -1.25,-4 -1.25,-4 l 3.75,4.25 2. [...]
+ id="path4181"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -476.71094,-386.0458 -1.75,4 -1.75,2.75 -1,3.75 7.5,6.75 4.25,-0.75 c 0,0 1.75,-2.75 1.75,-3.75 0,-1 -0.25,-7.5 -0.25,-7.5 l -3.5,-3.75 -5.25,-1.5 z"
+ id="path4183"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -479.71094,-412.2958 c 0,0 -3.25,-1.25 -2.5,1 0.75,2.25 3.5,4 1.5,4.5 -2,0.5 -2,0.5 -2,0.5 l 2.25,4.25 2,0.75 -0.5,1.75 2.5,1.25 -0.25,1.75 c 0,0 2.75,-2.5 4.25,-1.75 1.5,0.75 4.75,1.75 4.75,1.75 l 0,-2.25 1.5,0.25 1,4.25 1,3.25 -0.25,3.25 2.25,2 0.25,1 -1.25,1.25 c 0,0 -0.25,2 -0.5,2.75 -0.25,0.75 0.25,3.75 0.25,3.75 l 1,0.5 0,3.75 4.25,2.75 c 0,0 4,-0.5 4,0.25 0,0.75 0,1.5 0.75,1.75 0.75,0.25 3.25,0.25 3.25,0.25 l 0.5,-2.5 2.5,-0.25 c 0,0 2,-2.75 1.5,-1.25 -0.5,1.5 -1,4 [...]
+ id="path4185"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -490.21094,-403.2958 -2,2 -3.5,-1.75 -3.5,0.25 -0.25,3.75 c 0,0 4,3.5 3.5,4.25 -0.5,0.75 1,4.5 -0.5,3 -1.5,-1.5 -4.75,-5 -4.75,-5 l -3,-3 c 0,0 -1.5,1 -1.5,1.75 0,0.75 1.5,5.25 1.5,5.25 0,0 1.25,3.25 0.25,2.75 -1,-0.5 -2.25,-0.25 -2.5,-1.5 -0.25,-1.25 1,-3 -0.5,-3 -1.5,0 -2.75,0.75 -3,0 -0.25,-0.75 0,-3.5 0,-3.5 -0.5,-1.75 -1.75,-4 -1.75,-4 l -2.5,-1 c 0,0 -2,2.5 -1,3.5 1,1 3.5,3.5 3.5,3.5 l -3.5,1 3,2 0.75,0.5 c 0,0 -2.25,2.75 -1.5,2.75 0.75,0 4.25,0 4.25,0 l 0.5,1.25 2. [...]
+ id="path4187"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -523.71094,-392.0458 c 0,0 -3.5,4 -4.25,3.5 -0.75,-0.5 -3.75,-3.25 -3.75,-3.25 0,0 -0.5,-3.25 0.5,-4.5 1,-1.25 0.75,-4 0.75,-4.75 0,-0.75 -3,-6 -3,-6 l -4,3.75 -2,3.5 2.5,4.5 1,3 c 0,0 -3.25,2.25 -1.75,3 1.5,0.75 3.5,2.5 3.5,2.5 0,0 -0.25,3.5 -1.25,3 -1,-0.5 -6,-1.5 -6,-1.5 l -3,-2 -3,-3.75 c 0,0 -2.5,-1.25 -3,-2 -0.5,-0.75 -1.5,-4 -1.5,-4 0,0 -2,0 -2.75,0 -0.75,0 -4,-1 -4,-1 0,0 0.75,-2.75 -1,-2.75 -1.75,0 -5,-1 -5.25,0 -0.25,1 1,5 1,5 0,0 2.5,0.5 1.25,0.25 -1.25,-0.25 - [...]
+ id="path4189"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -513.96094,-382.0458 c 0,0 -2.75,2.25 -2.75,3 0,0.75 -0.25,2.75 1,2.75 1.25,0 3.25,1 3.5,0 0.25,-1 0.25,-3 0.25,-3 l -2,-2.75 z"
+ id="path4191"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -565.21094,-417.7958 -4.25,-2.75 c 0,0 -0.5,1.25 -0.5,2 0,0.75 -1.25,2.25 -3,1.75 -1.75,-0.5 -6,-1.5 -6.5,-0.5 -0.5,1 -2,5.25 -2,5.25 0,0 -0.25,1.5 -1.5,2.5 -1.25,1 -3.5,2 -4,3.25 -0.5,1.25 -1.25,3.75 -1.25,3.75 l -1.25,2 c 0,0 -4,0.5 -4.5,1.25 -0.5,0.75 0,4 0,4 0,0 1.5,-0.25 0.75,1.75 -0.75,2 -0.5,7 1,3.5 1.5,-3.5 1.25,-6.25 2.5,-4.75 1.25,1.5 1,4 1.75,4 0.75,0 3,-3.5 3,-3.5 l 3.25,2.25 c 0,0 4.25,2.25 3.25,-1 -1,-3.25 -3.25,-6.75 -1.75,-5.5 1.5,1.25 4.25,4.25 4,2 -0.25, [...]
+ id="path4193"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -572.71094,-394.5458 -4.75,4.5 -2.5,2.25 2,2.75 3.5,-3.75 1.75,-5.75 z"
+ id="path4195"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -560.71094,-408.2958 0.75,2.5 5.75,0 -1,-2.25 -5.5,-0.25 z"
+ id="path4197"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -559.21094,-432.7958 -0.75,2.75 2.75,5 0.5,-3.75 -2.5,-4 z"
+ id="path4199"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -549.46094,-442.7958 -4.25,3.75 -0.25,1.5 4.5,-0.5 2.75,2.25 1.75,-2.5 3,1 3,-2 0,-4 -1.75,-1.5 c 0,0 -1,-2.75 -2.25,-1.75 -1.25,1 -5,3.5 -5,3.5 l -1.5,0.25 z"
+ id="path4201"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -539.71094,-432.2958 -7,1 -3.25,1.25 -3.75,2.75 1.25,3.75 0.75,5 c 0,0 4,-1.25 4.25,0 0.25,1.25 -2,4 1,1.25 3,-2.75 6.75,-5.75 6.75,-5.75 0,0 1.75,-3 0,-3.25 -1.75,-0.25 -4,-0.75 -4,-0.75 0,0 1.75,-1.75 3,-2.25 1.25,-0.5 2,-2 2,-2 l -1,-1 z"
+ id="path4203"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -514.96094,-460.2958 -2.75,0 -5.5,1.75 c 0,0 1,3.5 1,4.25 0,0.75 2.75,1 2.75,1 0,0 2,0.5 1.75,1.25 -0.25,0.75 -0.25,3.75 -0.25,3.75 l 5,-4 0.5,3.25 c 0,0 -1.5,0.75 -1,2 0.5,1.25 1.75,2 1.75,2.75 0,0.75 -1.75,3.75 -3,3 -1.25,-0.75 -2.5,-2.5 -2.5,-1 0,1.5 2,7 2,7 l 3.25,-2 2.5,-2 c 0,0 1,0 1.5,0.75 0.5,0.75 0.25,1.25 1.5,1.5 1.25,0.25 3.25,0.25 3.25,0.25 l 3,3.5 2.75,2.5 0.75,3.25 5.5,-2 -2,-6 -2.25,-3.5 0.25,-4.75 c 0,0 0,-2 -0.25,-3.25 -0.25,-1.25 -2,-3.25 -2,-3.25 l -4,- [...]
+ id="path4205"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -521.46094,-425.5458 3.75,5.5 c 0,0 0,4 0.75,5 0.75,1 4.75,2.25 4.25,1.25 -0.5,-1 -0.5,-4.75 -0.5,-4.75 l -3,-3.75 -5.25,-3.25 z"
+ id="path4207"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -505.96094,-429.2958 0.25,2.75 3.75,-0.75 c 0,0 2.25,-0.5 1.25,-1.25 -1,-0.75 -3.25,-1.75 -3.25,-1.75 l -2,1 z"
+ id="path4209"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -487.71094,-449.2958 -0.25,4.5 c 0,0 1,3 0.25,3.25 -0.75,0.25 -1.5,-1.75 -0.75,0.25 0.75,2 4,7 4,7 0,0 1.25,-2 1.75,-1 0.5,1 0.75,2.25 -0.5,2.25 -1.25,0 -4.75,-1.75 -3.25,0.5 1.5,2.25 1.25,3.75 1.75,4.5 0.5,0.75 1.75,4.25 2,2.5 0.25,-1.75 1.5,-3 2.75,-3 1.25,0 5.25,1 5.5,0 0.25,-1 1,-3.5 1,-3.5 l -2.25,-3.25 2.75,-2 c 0,0 0.25,-1.25 -0.5,-2.5 -0.75,-1.25 -3.5,-3 -3.5,-3 0,0 -0.25,0 -0.75,-1 -0.5,-1 -0.75,-2.75 -2,-3.25 -1.25,-0.5 -6.5,-2.25 -6.5,-2.25 l -1.5,0 z"
+ id="path4211"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -469.46094,-425.5458 -3.75,-0.5 -4.5,0 -0.25,3 c 0,0 3,3.75 4.75,3.75 1.75,0 6,0 6,0 l 0.75,-4.25 -3,-2 z"
+ id="path4213"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -455.96094,-423.5458 c 0,0 -0.25,3.25 0.25,4 0.5,0.75 2.75,4.75 3.5,4.75 0.75,0 2.25,-1 1.75,-2.5 -0.5,-1.5 -0.75,-4.25 -0.75,-4.25 l -4.75,-2 z"
+ id="path4215"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -461.46094,-508.5458 -4.75,-4 -3.75,0 -1.5,1.25 c 0,0 -1.75,1 -0.5,1.5 1.25,0.5 2,0.25 3.25,0.75 1.25,0.5 2.75,0.5 2.75,1.25 0,0.75 -0.5,2.25 -1.75,2.25 -1.25,0 -5.5,-2 -3.75,0.25 1.75,2.25 3.25,3 0.75,2.75 -2.5,-0.25 -3.5,-1 -3.5,-0.25 0,0.75 -1.5,5.5 -0.75,6.5 0.75,1 5,2.75 5,2.75 0,0 -1.5,2.75 -2.25,2 -0.75,-0.75 -5,-2.75 -5,-2.75 0,0 -2.5,2 -1,3.5 1.5,1.5 2.25,4 2.25,4 l -2.75,1.5 0.5,3.25 2.5,-0.5 c 0,0 1.25,-0.25 1,1.25 -0.25,1.5 -0.25,1.75 1.5,1.75 1.75,0 4.25,0 4, [...]
+ id="path4217"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -433.71094,-484.5458 -4.25,-0.25 -0.25,4.75 c 0,0 0,2.5 1.25,2.75 1.25,0.25 2.5,0 3,0.75 0.5,0.75 2,2.25 -0.5,1.75 -2.5,-0.5 -4.5,-2 -4.5,-1 0,1 0.5,4.25 1.5,4.5 1,0.25 2.5,1.25 3.5,1.75 1,0.5 2.75,1.25 3,2 0.25,0.75 1.5,3.5 1.5,4.75 0,1.25 0,2 0.75,3.75 0.75,1.75 3.25,4.5 3.25,4.5 0,0 -1.25,1.5 -2,1.25 -0.75,-0.25 -0.75,-0.25 -0.75,-0.25 0,0 -5.75,-2.25 -3.5,-0.25 2.25,2 5.5,3 5.5,3 0,0 4,1.5 5.25,0.75 1.25,-0.75 4.25,-1.5 4.25,-1.5 0,0 0.5,2.5 -0.75,2.5 -1.25,0 -7,-1 -6 [...]
+ id="path4219"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -632.96094,-152.4208 -2.375,2.5 -2.625,-2.75 -2.125,1.375 2.75,5.25 1.5,0.75 0,2.5 3.75,4.625 -1.5,-4.25 -0.25,-3.125 0.375,-2.75 0.875,-1.875 -0.375,-2.25 z"
+ id="path4221"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -559.29089,-16.294794 0.333,5.333 2,4.3340001 4,4 2.333,3.666 2.334,4.667 3.333,4 0.333,5.3329999 2.334,3.667 1.333,2 1,-0.333 1.667,2.333 1.333,2.667 -1.333,1 -4,-3.334 -4.334,-2.666 -2,-2 1,-3.667 -1,-3.333 -2.333,-0.334 -1,-1.6659999 -2,-0.334 -5.667,-5.333 2.667,-0.333 c 0,0 0.666,-1.334 0.333,-2.334 -0.333,-0.99999995 -2.666,-4.666 -2.666,-4.666 l -2.334,-2.667 -2.333,0 -0.333,-4.0000001 -2,-4 -2.292,-3 -0.542,-2.833 8.5,-0.167 16.667,5.833 13.833,0 -0.333,-1.333 6.6 [...]
+ id="path4223"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -448.29089,59.205206 1.083,0.083 1,0.834 0.833,-0.5 0.584,0.666 -0.25,1.167 -3.417,2 -0.417,2.333 -1.5,1.417 -2,1.75 -1.916,-1.167 -2.167,-0.083 -2.333,0 -1.667,-1.375 0.875,-0.625 -1,-1.625 -0.042,-2.125 1.042,-3 5.375,-1.125 0.125,-0.875 -1.875,-2 0.25,-4.417 7.5,-0.333 -0.083,9 z"
+ id="path4225"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -445.29089,56.705206 -1.334,1 -0.75,1.25 -0.916,0.25 0.083,-9 1.125,-0.25 1.125,-1.625 1.25,-0.375 0.5,-1.125 1.875,0.875 -1.542,0.75 -0.083,2.583 -0.333,3.084 -1,2.583 z"
+ id="path4227"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -423.21089,63.205206 -3.083,1.5 -1.667,0.25 -2.083,-0.833 -1.084,1.25 -1.333,0.833 -1.25,1.167 -0.583,0.416 -1.084,-0.333 -1.166,1.417 -2.167,1.083 -0.25,1.583 -2.083,0.834 0.25,-1.167 -1.084,-1.083 -0.666,-1.334 -1.584,-0.25 -1.416,-0.25 -2.084,-1.166 -1.25,-1.334 0.25,-2.083 3.584,-2.25 0.083,-0.917 2,-0.5 1,-1 2,1.084 2.083,-0.917 2.75,-0.417 1.75,-0.583 1,0.917 3.75,0.166 2.334,1.667 -1.25,0.75 1.583,0.75 0.5,-1.083 1.917,0.25 0.333,1.583 z"
+ id="path4229"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -450.38089,69.205206 2.25,0.667 0.75,1.416 2.334,0.084 1.5,-0.334 1.416,-0.916 -0.416,-1.334 -3,-0.5 -1.917,-0.916 -1.417,-1.584 -3.083,2.75 1.583,0.667 z"
+ id="path4231"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -433.96089,79.955206 1.75,-0.333 1.917,0.5 1.083,0 2.167,1.416 2,0.084 -0.417,-1.334 0.083,-3 1,-2.083 -0.5,-2.083 0.834,0.333 0,-4.333 0.916,-1.75 0.417,-2.334 -0.5,-1.833 -3.083,1.5 -1.667,0.25 -1.833,-0.917 -0.834,1.417 -1.833,0.75 -1.833,1.583 -0.834,-0.333 -1.416,1.417 -2.167,1.333 -0.167,1.667 -2.166,0.5 -0.25,0.666 1.916,1.834 1.5,1.666 1.25,1.334 0.834,1.333 1.833,0.75 z"
+ id="path4233"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -419.88089,87.205206 -0.916,0.667 0.166,2.25 -0.916,2.083 -1.167,-1.5 -1.167,0.083 0.5,1.084 -1.75,-0.417 -0.083,-1.833 -1.75,-1.25 -1.5,-0.917 -1.583,-1.75 -0.917,-0.083 -0.083,1.083 -2.084,-1.25 -1.416,-1.667 0.25,-1.5 0.083,-1.166 -0.167,-1.25 2.167,-0.25 1.833,0.75 1.167,-0.25 2.167,1.166 2,0.334 1.416,3 1.417,1.166 2.333,1.417 z"
+ id="path4235"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -399.88089,97.038206 1.917,-0.833 0.667,-2.083 -0.167,-2.084 -0.917,-1.25 -1.583,-1.583 -0.667,-1 -1.583,-0.25 -1.667,-0.333 -1.083,0 -0.833,-0.5 -2.25,0 -0.417,1 -1.583,0.666 -1.417,0.334 -1.667,0.833 c 0,0 -0.834,0.583 -1,0.333 -0.166,-0.25 -1.333,-1 -1.333,-1 l -1.417,-0.416 -0.416,0.916 -1.25,-0.416 -0.084,-1.084 -1,-0.916 -1.166,0.5 0.166,2.25 -0.916,2.083 1.333,0.667 2.5,0.083 1.5,0.5 0.583,0.417 -0.583,1.083 0.167,1.75 0.75,-1.5 2.083,0.167 0.417,1.666 2,-0.166 1.3 [...]
+ id="path4237"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -397.63089,99.205206 0.167,5.667004 -0.667,2 1,4.333 1.334,1 -1.334,2.333 -2.166,1.667 -4.167,1.333 0,4 3.167,3 2.666,2 2,1.834 5.334,-0.667 2.5,0.5 0.333,1 3,1.5 1.833,3.167 2.5,1.666 1.5,2.667 0.5,1.333 5.167,0 2.5,-0.333 2.333,0.5 2.5,2 -1.666,3 1.333,2.333 0.833,1 0.834,-2.333 2.5,-11.167 -1.834,-2.833 -1.166,-2.667 0.166,-1.833 3.167,-0.667 0.167,-1.5 -2.667,-1.333 0.333,-1.667 5.334,-0.5 1,-1 1.5,1 1.5,-1.166 2.333,4.166 1,-0.833 -3.333,-6 -1.334,-1.167 1.5,-2 -1.33 [...]
+ id="path4239"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -368.13089,148.20521 -3.5,1.167 -3.833,0.666 -2.5,2.167 -1,4 -1,2.833 -1.833,1.667 -0.5,2.5 2,3.833 2.166,2.334 -0.666,1.833 2.666,0.833 1.667,1.834 4.5,-0.834 1,-2.666 1.333,5.333 5,0 2.834,4.5 -0.5,5.333 0,4.167 -1.167,3.667 -0.5,4.166 0.833,2.667 0,2.333 -1.333,3.167 -1.667,1.5 -0.166,1.833 -2.5,1.834 -0.334,-1.667 -5.333,-5.833 -3.667,-2.167 -4.666,-2.333 c 0,0 -4.668,-2 -4.834,-2.5 -0.166,-0.5 -7.333,-7.334 -7.333,-7.334 l 1.167,-0.833 -1.5,-2.167 -3.334,-6.666 -3.66 [...]
+ id="path4241"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -403.29089,122.37221 -2.334,1.666 -2.5,1.5 -1.5,0.334 0,4.333 -2,3.667 -0.166,4 1.333,2.5 2.167,-1.5 0.833,1.833 -2,2.833 0.5,2.167 -1.167,2 0.667,1.333 1.667,-0.166 2.166,1.5 2.5,0.5 2.167,-2.167 0.167,-4 2.666,-2.167 3.5,-1.666 2.834,-2.834 3.333,-2.166 -0.167,-2.334 1.167,-0.333 -1.167,-2.167 1.334,-1.166 -0.5,-1.667 -2.5,-0.5 -5.334,0.667 -2,-1.834 -2.5,-1.666 -3.166,-2.5 z"
+ id="path4243"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -458.29089,128.20521 -0.917,1.083 0.417,1.334 1.416,0.083 -1.333,1.083 0,1.5 3.167,-0.333 0.416,-1.917 -0.333,-1.833 -2.833,-1 z"
+ id="path4245"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -370.29089,80.205206 2.833,-0.333 3.5,-0.834 -2.5,-1.833 0.833,-2.333 2.667,1.5 c 0,0 -0.5,1.666 0,1.666 0.5,0 3.167,0.834 3.167,0.834 l 1.333,1.666 1.333,2.334 6.167,0.166 1.667,-0.333 4,2.167 5.166,-0.334 -0.166,-1.666 4.333,0 4.833,-0.334 -2,1.5 0.834,2.667 1,-0.833 3.666,1.833 2.167,2.333 2,0.334 1.833,1.666 0.334,1.667 -2.5,1.833 -0.334,2.167 1.334,0.333 -0.667,1.167 -4.5,1.333004 0.333,1.167 0.667,2.833 1.833,2.167 0.167,1.5 -3,1.833 -4.5,1.5 -3,1.167 -3,-0.833 -2.3 [...]
+ id="path4247"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -322.13089,107.03821 0.667,3.5 2.167,1 -1.5,1.5 -1.667,2.5 1.667,2.667 1.166,0.833 0,2.667 4.167,3 4,-3.833 2.667,-0.667 2.166,0.833 -2,-3 -1,-3.833 -1.833,-0.833 -1.5,-2.5 1,-3.334 3,-2.333 0.167,-2.5 -2.667,-2.667 -3,-1.833004 -1.333,0.667 -0.334,-2.5 -1,-1.834 -2.666,-1.333 -1.5,0.5 -2.5,1.833 -0.334,2.167 1.167,0.833 -0.5,0.667 -4.5,1.333004 1,4.334 1.833,1.833 3,0.333 z"
+ id="path4249"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -303.63089,120.87221 c 0,0 -0.667,-1.834 0,-1.834 0.667,0 3.834,-1.333 3.834,-1.333 l 3.333,-1.833 0.5,-2.834 -2.167,-2.833 0.5,-2.667 1.334,-3.166 -2.834,-1.334 -2.666,-0.166 -2.5,0.5 -4.5,-0.667 -0.167,2.5 -3,2.667 -1,3 1.5,2.5 2,1.333 0.833,3.333 2,3 3,-0.166 z"
+ id="path4251"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -297.29089,120.70521 2.833,-0.167 2.5,0.167 1.5,-3.5 1.833,-3.5 3.5,-3 -0.833,-2.333 -1.667,-0.167 -3,-2.167 -3.666,-1.5 -2,-0.166 -1.334,3.166 -0.5,2.667 2.334,3.167 -0.667,2.5 -3.333,1.833 2.5,3 z"
+ id="path4257"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -361.96089,175.20521 4.25,2.25 0.75,-2.5 6.25,-1.5 3.75,0 2.25,3.5 4.75,5.25 5.5,0.75 6.25,4.75 4,1 0.75,6.75 -0.75,1.25 4,4.25 5,-0.5 1.25,4.75 2.5,2.25 -0.25,9 -1.75,1.5 0.75,9 9.25,0.25 2,7.25 4.75,-0.5 -1.5,8 3.25,2.25 0.25,6.5 -6.75,5 -3.25,3.5 -5.5,5 3,2.25 3.25,3.5 2,0.5 8.75,6 0.5,2.75 4.25,-4.75 6.5,-6.75 -2.5,5.5 2.25,-1.5 3.25,-5.5 1,-4.5 3.5,-3.75 3.25,-4.75 -0.75,-7 0.5,-5 6.25,-3.5 6.25,-3.5 3.75,-3.75 9,-0.5 3.75,-2 2.75,-2.75 1.25,-4.75 3.75,-4.5 1.25,-1.2 [...]
+ id="path4259"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -362.21089,207.95521 2,5 2.5,0.75 -1.25,2.5 -0.25,3.75 0.5,1.75 1.5,0.5 1.75,7.75 3.25,-0.5 4.25,-4.25 3.25,1 2.5,0.75 1.25,2.25 2.75,-4 3.5,0.5 1,1.75 2,-4.5 3,-8 4.75,-0.25 4.5,-0.75 5.25,2.25 0.75,1.75 1.75,-1.5 0.25,-9 -2.5,-2.25 -1.25,-4.75 -5,0.5 -4,-4.25 0.75,-1.25 -0.75,-6.75 -4,-1 -6.25,-4.75 -5.5,-0.75 -7,-8.75 -10,1.5 -1.5,2.5 -4.167,-1.75 2.834,4.5 -0.667,6.25 0.167,3.25 -1.167,3.667 -0.5,4.166 1.25,3.417 -1,3.75 -1.5,1.5 1,1.75 z"
+ id="path4261"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -332.21089,228.70521 3.25,3 5.25,5 4,0.25 3,1.75 4,2.5 1,1.75 -2.75,3.25 -0.75,3.75 10.25,1.75 2.75,-1 0.5,-2 3.25,-2 -0.25,-3 2.25,-0.5 -1.75,-1.25 1.5,-8 -4.75,0.5 -2,-7.25 -9.25,-0.25 -0.75,-9 -0.75,-1.75 -5.25,-2.25 -3.75,0.75 -5.5,0.25 -5,12.5 1.5,1.25 z"
+ id="path4263"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -352.21089,229.45521 -0.5,4 -1,2 -4.25,2.5 -0.5,4 -1.25,2 2.5,5.75 -0.5,2 -3,-0.25 -2.75,4.75 -1,5 -0.5,3.5 -1.5,3.75 -1.75,4.5 1.75,4.75 2.75,4 -0.5,3.5 -2,3.5 -0.75,7 -2.5,1 -1.75,2.5 0.75,6.75 1.75,3.75 -2.25,2.75 -1.75,6 -0.25,6.25 0,6.5 -1,2.5 0.5,2.5 -0.25,2.75 0.75,6 2,2.5 -1.25,3.75 0.75,5 -1.5,5 -2.75,1.5 -0.5,5 -1.5,3.75 -1.75,2.75 1,4 0.25,3.5 0,2.75 3.75,-0.75 0,3 0,3.5 2,2.74998 4,-0.25 4.25,1 3.25,0.75 2.75,0.5 -2.25,-3.99998 -1.75,-1.75 0.75,-3 -0.75,-3.25 [...]
+ id="path4265"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -359.33089,397.83029 0.5,15.62505 1.875,0 -0.25,0.875 0.375,2 3,0 1,-1.375 -2,-1 2.5,0.75 2.5,0.875 3,-1.25 2.125,-0.875 -0.375,-1.62505 c 0,0 -2.75,-0.25 -3.125,-0.375 -0.375,-0.125 -3,-1.5 -3,-1.5 l -2.75,-1.25 -1.125,-2 -1,-2.125 -0.625,-1.375 -1,-1.375 -0.125,-1.125 0.625,0.375 0,-1.875 -2.125,-1.375 z"
+ id="path4267"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -313.28947,386.15257 0,3.67842 -2.31008,1.74238 -2.11758,2.71042 -0.1925,2.90403 c 0,0 3.27261,1.35521 3.08011,0.1936 -0.19251,-1.16161 -0.19251,-3.29123 1.34754,-3.09763 1.54006,0.19361 3.08011,0.19361 3.08011,0.19361 l -0.1925,-2.71042 3.85013,-0.38721 1.73257,-2.90399 -3.65763,-2.90402 -1.92507,0.77441 -2.6951,-0.1936 z"
+ id="path4269"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -317.13961,387.12057 -1.54005,-1.54881 -3.27262,0 -0.1925,3.09762 -2.88761,1.16161 1.15504,3.09759 -2.69509,-0.5808 -1.34755,-1.93598 0.19251,3.29119 3.08011,2.51682 3.27261,-1.16161 1.54006,-3.48483 1.73256,-0.96797 2.31008,-2.12962 -1.34755,-1.35521 z"
+ id="path4271"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -230.30809,402.77339 7.2553,7.1813 4.9642,6.75905 0.3819,-6.75905 -3.8186,-4.2243 -8.7828,-2.957 z"
+ id="path4273"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -429.46089,31.205206 2,-0.333 0,-2.334 3.833,-1.5 3.5,-0.5 2.5,-1.5 2.5,0.167 3.5,0.667 2.167,1.666 c 0,0 1.333,-0.999 1.833,-0.666 0.5,0.333 1.834,2.833 1.834,2.833 l 3.833,-0.333 2.333,1.5 3.167,2.833 2.833,0.833 4.5,1.167 -1.333,1.667 4.167,0 2.166,0.5 0.167,1.333 -2.5,2 -4.833,0.167 -7.5,-0.834 2.666,-2 -2.166,-1.166 -2.667,-0.334 -1.667,-3 -2,-1.333 -3.166,0 -4,-1.833 -2.334,0 -3.833,-1.667 1.333,-0.833 -0.833,-0.5 -3.667,0.5 -2,1.833 -2.5,0.5 -2.333,1.833 -1.5,-1.333 z"
+ id="path4275"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -421.96089,31.538206 -0.5,2 1.833,-0.166 0.667,-1.5 -2,-0.334 z"
+ id="path4277"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -392.29089,49.205206 -2.334,-1.167 -3.833,-0.5 -3.167,0.5 2.667,1.667 -0.167,1.667 3.667,-0.834 3.167,-1.333 z"
+ id="path4279"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -373.46089,41.372206 0.333,1.666 -0.333,1.5 0.167,1.334 0.833,0.333 -0.667,0.667 -0.333,2.333 -1.667,-0.5 -2.5,0.333 -1.833,-0.666 -2.5,-0.167 0,0.833 -1.167,-1.166 -1.666,-0.334 c 0,0 0.333,-0.833 0.833,-0.833 0.5,0 3.5,0.167 3.5,0.167 l 2.833,0.333 1.667,-0.5 -0.667,-1 -0.5,-2.333 -1,-0.834 -2.5,-0.666 0.667,-0.834 2.333,0 2.5,1 1.667,-0.666 z"
+ id="path4281"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -372.96089,50.372206 1.667,0.666 1.333,-2.333 2.333,-1 c 0,0 -1.166,1.001 -0.166,1.167 1,0.166 3.5,-0.167 3.5,-0.167 l 2,-1.333 1.833,0.333 1.167,1 1.666,-2.167 -1.333,-2.333 -4.167,0 -1.166,-2 -2.167,-1.167 -3.333,0 -2.167,0.334 -1.667,-0.5 0.5,2.166 -0.5,1.834 0.5,1.666 -0.333,2.667 0.5,1.167 z"
+ id="path4283"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -738.21094,39.9552 0,4.125 0.5,1.875 2.5,-1.625 1.25,-1.75 -1,-1.625 -3.25,-1 z"
+ id="path4285"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -741.96094,36.4552 1.5,1.875 2.125,-0.625 -1.25,-1.25 -2.375,0 z"
+ id="path4287"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -748.21094,33.4552 1.125,2.25 0.875,-1.375 -0.5,-1.25 -1.5,0.375 z"
+ id="path4289"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -744.83094,35.9552 2.25,0.125 -0.125,-1.875 -1.75,0.25 -0.375,1.5 z"
+ id="path4291"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -754.83094,30.4552 c 0,0 -1.625,1.75 -1.125,1.875 0.5,0.125 2.5,0.375 2.5,0.375 l 0.5,-1.25 -1.875,-1 z"
+ id="path4293"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -675.46094,-298.2958 -6.5,-3.5 -6.5,-2.5 -4,3.5 -7,-4 -11.5,-2 -7,0 -5,-2 -0.5,-3.5 -6,0 -5,-2.5 -2,-0.5 -3,-3 -4.5,-0.5 -2.5,3.5 -7,2.5 -5,2.5 -3,5.5 -5,1 -3,6.5 -1,6 -5,3.5 -7,0.5 -2.5,4.5 5,5.5 5,3.5 3.5,6 4,1.5 3.5,1 c 0,0 -0.5,3 1,3 1.5,0 4,-0.5 4,-0.5 l -0.5,5.5 -4,-2 c 0,0 1.5,2 0,2 -1.5,0 -6.5,0 -6.5,0 l -3,0 0.5,-4 -4.5,0.5 -3.5,2.5 -2.5,2.5 -4,3 -3.5,2 6,6 1.5,4 3.5,1.5 8,-1 3.5,2 7.5,-2.5 -1,3 2,2.5 -1.5,4.5 -4.5,1.5 -5.5,4 -3.5,-0.5 -3.5,4 c 0,0 0,0 -1.5,3 -1. [...]
+ id="path4295"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -805.96094,-230.5458 -0.25,3.25 3,0 3.5,1.25 1.25,2.75 2.25,-2 1.75,-2.25 -3.75,-1.5 -2.5,-2.25 -2.75,0.5 -2.5,0.25 z"
+ id="path4297"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -724.71094,-184.5458 -3,3.75 -3.75,3.75 -1.75,1.5 1.5,3.75 2.5,-2 1.5,0.5 2.5,-3.25 3,-0.25 -1,-4.25 2,-1.25 -3.5,-2.25 z"
+ id="path4299"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -592.79094,-114.1288 0.333,2.167 1.667,3.5 -0.834,3.667 -1.833,-2.333 -1.167,-2.667 -2.666,-0.5 -4.167,-0.5 -1.167,0 0.667,2.333 2.333,3.333 0,3.333 0.667,3.667 3,0.333 1.167,1.667 -3.667,-0.5 -1.167,0.833 0.5,3.5 -0.666,3.833 0.166,4.5 -1.166,3 -1.334,4.333 1,3 0.667,3.833 0.5,2.833 -0.667,3.833 0.5,2.667 1.167,2.667 1,3.333 0.833,2.167 3.5,2.833 1.667,-0.167 2.333,0.333 -2.5,0.667 0.667,1.167 -2.167,0.333 2,2.167 2,2.167 -0.666,1.833 2.666,3.833 2.834,2.333 0.333,2.833 [...]
+ id="path4301"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -353.29089,47.205206 2.333,-0.167 3.833,1 2.334,0 -2.167,1 -2.333,0.834 -2.834,0 -1.166,-1.667 0,-1 z"
+ id="path4303"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -400.79089,15.872206 -2,3 1.833,1.833 1.333,0.833 0.5,1.667 1.167,-2.333 -0.5,-2.334 -2.333,-2.666 z"
+ id="path4305"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -379.13089,34.372206 -1.833,0.333 -0.333,1.333 2.833,0.334 0.167,-2.167 -0.834,0.167 z"
+ id="path4307"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -366.79089,210.87221 -0.5,8.5 1.666,7.666 -2,5.334 -0.333,8.666 -0.667,4.334 -0.666,8.333 -3,4.667 1,6.333 -1.334,4.333 0.334,7 0,5.334 -2.334,5.666 -2,6.667 -1.666,7.333 -1.667,0.667 -0.333,6 0.666,8.333 -1.333,3.667 -1.333,4.667 1.666,2.666 -2,1.334 -1.666,6.333 0.666,2.333 3.667,-3.333 0.667,-5 0,-2 2.333,-1.333 1,3.666 -2.333,5.667 -0.667,6.333 -2,6.334 -2,-3 c 0,0 -2.001,2.666 -1.667,3.666 0.334,1 1.334,4 1.334,4 l -0.334,1 -2,0.334 -3.666,3 0.333,2.333 4,-2.333 1.66 [...]
+ id="path4327"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -535.29089,249.37221 -4,1 3,2 2,-2 -1,-1 z"
+ id="path4329"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <path
+ d="m -293.96089,281.20521 0.25,2.25 -1.75,4.75 -3.5,1.75 -6.5,0 -3,-1.25 -2.25,-1.25 -2.25,-0.5 -1.25,-2.5 -1,-2.25 0.75,-2.5 -0.5,-4.25 2,-3.25 0.75,-4.75 1.5,-2.5 3.5,1.5 3.25,3.5 2,0.5 8.75,6 0.5,2.75 -1.25,2 z"
+ id="path4331"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff" />
+ <rect
+ style="opacity:0;fill:#000080;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect4652"
+ width="46.024208"
+ height="31.463821"
+ x="-102.03697"
+ y="-363.61978" />
+ <path
+ d="m -135.22523,-233.95112 c -2.63439,0.20501 -6.73325,-0.86574 -7.92636,-1.90462 -1.19311,-1.03888 -4.09067,-1.2993 -6.22055,-1.73147 -2.13124,-0.43356 -5.0288,-1.55833 -3.23845,-2.16504 1.78899,-0.60532 5.53877,0.3463 4.68655,-2.33679 -0.85222,-2.68448 -0.25499,-2.77036 -1.36356,-2.68448 -1.10721,0.0873 -1.61854,-2.85624 -2.89756,-2.85624 -1.27765,0 -6.4769,0.60533 -4.77245,-0.953 1.70445,-1.55832 9.63081,0.0873 9.20401,-1.47106 -0.42543,-1.55832 -0.93676,-1.38518 -1.78898,- [...]
+ id="path1284"
+ style="fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.6871627;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.01163971px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 55.397714,88.459156 1.6955,-4.20113 0.1817,-1.77513 1.8773,-2.72187 3.5122,-0.35502 1.7561,3.13606 0.3028,0.82839 2.18,0.23668 1.2112,-0.5917 3.4517,0.41419 0.8478,0.76922 3.0278,0.0592 1.0294,-1.24259 2.1801,0.17751 -0.6056,-2.07099 2.7857,-1.06507 4.4811,2.78103 1.7562,-0.71005 2.9672,-4.02363 1.9378,-1.4201 -0.7266,-1.06508 0,-2.48518 -0.7267,-1.24259 2.6039,0.0592 -0.06,-0.94673 2.4828,0.17751 -0.6661,2.01181 0.4239,4.55617 3.3912,3.19523 -0.3029,-0.11837 0.4844,-2.89 [...]
+ id="path6487-7-0"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.01163971px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 55.387614,88.418786 1.6954,-4.20113 0.1819,-1.77513 1.8772,-2.72187 3.5122,-0.35502 1.7562,3.13606 0.3028,0.82839 2.1799,0.23668 1.2112,-0.5917 3.4517,0.41419 0.8478,0.76922 3.0277,0.0592 1.0296,-1.24259 2.1801,0.17751 -0.6057,-2.07099 2.7856,-1.06507 4.4812,2.78103 1.7561,-0.71005 2.9672,-4.02363 1.9379,-1.4201 -0.7267,-1.06508 0,-2.48518 -0.7267,-1.24259 2.604,0.0592 -0.06,-0.94673 2.4829,0.17751 -0.6662,2.01181 0.4239,4.55617 3.3911,3.19523 -0.2424,0.44374 -1.4231,7.33 [...]
+ id="path6487-4-9"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccc" />
+ <path
+ d="m -394.78719,48.580936 c 0,2.21859 -1.9011,4.01388 -4.2505,4.01388 -2.3494,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.22151 1.9012,-4.01389 4.2506,-4.01389 2.3494,0 4.2505,1.7953 4.2505,4.01389 z"
+ id="path4313-64-90"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -395.29689,19.297706 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.22151 1.9012,-4.01389 4.2506,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-7"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -354.70559,75.036756 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.22151 1.9012,-4.01389 4.2506,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-02"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -346.65839,78.468676 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-54"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -39.240086,-79.793184 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-06"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -17.483186,-123.6417 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-95"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -1.4165861,-106.5709 c 0,2.21859 -1.9011,4.01388 -4.2505,4.01388 -2.3494,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.22151 1.9012,-4.01389 4.2506,-4.01389 2.3494,0 4.2505,1.7953 4.2505,4.01389 z"
+ id="path4313-64-90-59"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 6.4494139,-89.500104 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.34939997,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.90110003,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-541"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 6.6168139,-75.441804 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.34939997,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.22151 1.90120003,-4.01389 4.2506,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-30"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 19.336214,-36.948824 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.22151 1.9012,-4.01389 4.2506,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-12"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -56.645686,-120.66141 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.22151 1.9012,-4.01389 4.2506,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-47"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -65.082986,-120.97582 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-37"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -65.515686,-152.92983 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.22151 1.9012,-4.01389 4.2506,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-157"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -150.86969,56.940566 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.22151 1.9012,-4.01389 4.2506,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-15-9"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -17.483186,127.06473 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-15-5"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 192.78432,219.94995 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.22151 1.9012,-4.01389 4.2506,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-15-8"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 207.95172,214.25968 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-15-3"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 143.85252,176.93823 c 0,2.21859 -1.9011,4.01388 -4.2505,4.01388 -2.3494,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.22151 1.9012,-4.01389 4.2506,-4.01389 2.3494,0 4.2505,1.7953 4.2505,4.01389 z"
+ id="path4313-64-90-15-4"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 152.55532,182.12642 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-15-7"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 196.73862,144.97233 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.22151 1.9012,-4.01389 4.2506,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-15-2"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 267.53212,114.17795 c 0,2.21859 -1.9011,4.01388 -4.2505,4.01388 -2.3494,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.22151 1.9012,-4.01389 4.2506,-4.01389 2.3494,0 4.2505,1.7953 4.2505,4.01389 z"
+ id="path4313-64-90-15-71"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 445.28582,25.688176 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.22151 1.9012,-4.01389 4.2506,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-15-27"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 454.04312,22.374596 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.22151 1.9012,-4.01389 4.2506,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-15-6"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 403.15602,118.23157 c 0,2.21859 -1.9011,4.01388 -4.2505,4.01388 -2.3495,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.22151 1.9011,-4.01389 4.2506,-4.01389 2.3494,0 4.2505,1.7953 4.2505,4.01389 z"
+ id="path4313-64-90-15-93"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 451.91292,104.03053 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.22151 1.9012,-4.01389 4.2506,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-15-37"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 539.95932,95.273226 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-15-48"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 630.37252,64.267646 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-15-56"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 630.37252,75.155106 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-15-85"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 752.97482,78.705356 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.22151 1.9012,-4.01389 4.2506,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-15-86"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 698.06412,96.930016 c 0,2.21859 -1.9011,4.013884 -4.2506,4.013884 -2.3494,0 -4.2505,-1.795294 -4.2505,-4.013884 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3495,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-15-368"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 716.28882,100.95365 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.221514 1.9012,-4.013894 4.2506,-4.013894 2.3494,0 4.2506,1.7953 4.2506,4.013894 z"
+ id="path4313-64-90-15-0"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 735.46022,106.39737 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.22151 1.9012,-4.01389 4.2506,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-15-79"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 748.47782,130.06576 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.22151 1.9012,-4.01389 4.2506,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-15-24"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 692.85712,189.94678 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.22151 1.9012,-4.01389 4.2506,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-15-46"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 756.99842,222.37247 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-15-00"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 770.01602,212.19506 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-15-28"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 733.56672,164.6216 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-15-869"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 756.52502,175.03569 c 0,2.21859 -1.9011,4.01388 -4.2505,4.01388 -2.3495,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.22151 1.9011,-4.01389 4.2506,-4.01389 2.3494,0 4.2505,1.7953 4.2505,4.01389 z"
+ id="path4313-64-90-15-17"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 770.96282,186.15984 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.22151 1.9012,-4.01389 4.2506,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-15-31"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <g
+ style="fill:#000080"
+ id="g10972"
+ transform="translate(-876.11048,-587.95599)">
+ <path
+ style="fill:#000080;stroke:#ffffff"
+ inkscape:connector-curvature="0"
+ id="path3965"
+ d="m 863.70684,428.01361 -0.833,-1.417 0.25,-3.125 -2.25,-0.25 -0.25,-4.875 0.25,-2.75 2,-0.375 -0.875,-2.875 1.75,-0.875 2.75,-0.75 2.125,-2.75 1.75,-1.75 1.375,-0.125 -0.875,2.125 0.75,1 -1,2.5 -1.125,0.625 1,1.625 -0.25,3 2.75,-0.875 -0.625,2.375 -3,0.625 c 0,0 -0.625,1 -0.5,1.375 0.125,0.375 0.25,2 0.25,2 l -1.25,0.25 -0.625,0.875 1.75,0.25 1.375,-1.125 1,1.5 1.5,0.875 -0.125,1.875 -2.375,0.875 -1.625,0 -0.5,-1.125 -0.25,-2 -0.375,-0.5 -0.75,0.375 -0.25,1.25 -0.125,1 0.2 [...]
+ <path
+ style="fill:#000080;stroke:#ffffff"
+ inkscape:connector-curvature="0"
+ id="path3967"
+ d="m 879.37384,418.97161 -2,0.875 -0.375,2 -1,-1.5 -1.625,1 c 0,0 -1,1.125 -0.5,1.5 0.5,0.375 1,2.625 1,2.625 l 1.375,0.25 1,1.375 -1.25,0.375 -2,0.25 0.5,1.625 1.875,0.625 0.75,-1.875 0.625,-0.75 0.625,-1.375 1.625,-0.75 -0.625,-1.625 -0.875,-1.25 0.625,-1.375 1,-0.125 -0.75,-1.875 z" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path74165-7"
+ d="m 516.08118,168.06867 -1.84094,1.53417 3.86596,4.986 2.57732,3.06835 c 0,0 -3.12958,0.95885 -4.05008,1.15062 -0.92045,0.19179 0.55231,2.49302 0.55231,2.49302 l 3.49777,2.10947 c 0,0 2.20914,1.72592 2.7614,2.49302 0.5523,0.76707 1.10456,1.15062 2.20913,1.53414 1.10457,0.38355 4.05003,0.57532 4.05003,0.57532 l 2.39326,-0.38354 c 0,0 0.92045,0 1.47275,-0.76708 0.55226,-0.76707 3.31366,-2.68479 3.31366,-2.68479 l 3.68189,-0.38353 2.20913,1.53415 c 0,0 1.47276,-1.15062 2.02502 [...]
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:0.68662179;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <path
+ d="m -75.39004,-217.86582 c 0,2.21859 -1.90117,4.01388 -4.25058,4.01388 -2.34941,0 -4.25056,-1.79529 -4.25056,-4.01388 0,-2.22151 1.90115,-4.01389 4.25056,-4.01389 2.34941,0 4.25058,1.7953 4.25058,4.01389 z"
+ id="path4313-64-90-15-83"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -304.84159,-100.88063 c 0,2.218586 -1.9012,4.013876 -4.2506,4.013876 -2.3494,0 -4.2506,-1.79529 -4.2506,-4.013876 0,-2.22151 1.9012,-4.01389 4.2506,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-7-6"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 124.18832,246.68446 c 0,2.21859 -1.90121,4.01388 -4.25061,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.25061,1.7953 4.25061,4.01389 z"
+ id="path4313-64-90-15-3-5"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 162.01182,387.93695 c 0,2.21859 -1.9012,4.01384 -4.2506,4.01384 -2.3494,0 -4.2505,-1.79525 -4.2505,-4.01384 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-15-3-2"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 240.67142,402.66469 c 0,2.2186 -1.9012,4.0139 -4.2506,4.0139 -2.3494,0 -4.2505,-1.7953 -4.2505,-4.0139 0,-2.2215 1.9011,-4.0139 4.2505,-4.0139 2.3494,0 4.2506,1.7953 4.2506,4.0139 z"
+ id="path4313-64-90-15-3-8"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 282.17692,340.40649 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-15-3-1"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.5132829;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m 687.93954,632.29744 -836.17127,0 1.01972,-4.9987 32.97098,-22.21642 12.23665,-2.77706 9.857304,-7.22034 0.679814,-3.88787 -3.738977,-3.05476 -0.679814,-3.88787 3.059163,-1.11082 2.379349,3.88787 5.438513,-6.66493 3.059163,1.94394 2.379349,7.77575 5.438512,-1.94394 -1.359628,-2.77705 1.359628,-3.88788 -1.359628,-2.77705 7.817862,-1.11082 -0.679814,6.66493 13.59628,-1.11082 0,-6.38723 -1.699535,-2.77705 3.738978,-1.66623 6.79814,4.44328 -2.039442,3.61017 6.458233,5.83181 20 [...]
+ style="fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.81929612;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="path3683-1" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m 687.93954,632.29744 -836.17127,0 1.01972,-4.9987 32.97098,-22.21642 12.23665,-2.77706 9.857304,-7.22034 0.679814,-3.88787 -3.738977,-3.05476 -0.679814,-3.88787 3.059163,-1.11082 2.379349,3.88787 5.438513,-6.66493 3.059163,1.94394 2.379349,7.77575 5.438512,-1.94394 -1.359628,-2.77705 1.359628,-3.88788 -1.359628,-2.77705 7.817862,-1.11082 -0.679814,6.66493 13.59628,-1.11082 0,-6.38723 -1.699535,-2.77705 3.738978,-1.66623 6.79814,4.44328 -2.039442,3.61017 6.458233,5.83181 20 [...]
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:0.81929612;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="path3685-7" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -527.22806,632.29744 208.70291,0 -0.67982,0 2.03945,-0.55541 0,-5.83182 4.41879,-4.44328 -3.73898,-12.21903 6.11833,-0.83312 1.35963,-4.44329 -5.09861,-3.88787 1.01972,-4.16558 -4.07888,-3.88787 4.07888,-4.9987 -1.01972,-4.72099 -3.05916,-2.77705 0.67981,-3.61017 -5.0986,-15.82921 -4.4188,-3.61017 -5.43851,0 -2.03944,-4.16558 2.03944,-2.49934 -2.71925,-2.22165 0.67981,-4.99869 3.05916,-3.88788 4.41879,0 -1.35962,-3.61016 2.37935,-2.22165 3.39907,2.22165 3.05916,-9.71969 1 [...]
+ style="fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.81929612;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="path3687-4" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -527.22806,632.29744 208.70291,0 -0.67982,0 2.03945,-0.55541 0,-5.83182 4.41879,-4.44328 -3.73898,-12.21903 6.11833,-0.83312 1.35963,-4.44329 -5.09861,-3.88787 1.01972,-4.16558 -4.07888,-3.88787 4.07888,-4.9987 -1.01972,-4.72099 -3.05916,-2.77705 0.67981,-3.61017 -5.0986,-15.82921 -4.4188,-3.61017 -5.43851,0 -2.03944,-4.16558 2.03944,-2.49934 -2.71925,-2.22165 0.67981,-4.99869 3.05916,-3.88788 4.41879,0 -1.35962,-3.61016 2.37935,-2.22165 3.39907,2.22165 3.05916,-9.71969 1 [...]
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:0.81929612;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="path3689" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -630.5598,632.29744 -25.83293,0 9.5174,-4.9987 10.87702,0 5.43851,4.9987"
+ style="fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.81929612;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="path3691-0" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -630.5598,632.29744 -25.83293,0 9.5174,-4.9987 10.87702,0 5.43851,4.9987"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:0.81929612;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="path3693-9" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -562.23848,632.29744 -43.5081,0 0.3399,0 3.05917,-6.38723 9.51739,-11.10821 -1.35962,-7.49804 5.77842,0 4.75869,6.38722 5.77842,3.33246 0,-5.5541 14.95591,1.11082 1.69954,2.22164 -6.11833,4.44329 0,6.66492 5.43851,6.38723 -0.3399,0"
+ style="fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.81929612;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="path3695-4" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -562.23848,632.29744 -43.5081,0 0.3399,0 3.05917,-6.38723 9.51739,-11.10821 -1.35962,-7.49804 5.77842,0 4.75869,6.38722 5.77842,3.33246 0,-5.5541 14.95591,1.11082 1.69954,2.22164 -6.11833,4.44329 0,6.66492 5.43851,6.38723 -0.3399,0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:0.81929612;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="path3697-8" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -545.92295,632.29744 16.65545,0 -5.09861,-1.66623 -7.81786,-18.05085 -2.71926,4.44328 1.35963,13.60757 -2.71925,1.66623 0.3399,0"
+ style="fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.81929612;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="path3699-8" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -545.92295,632.29744 16.65545,0 -5.09861,-1.66623 -7.81786,-18.05085 -2.71926,4.44328 1.35963,13.60757 -2.71925,1.66623 0.3399,0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:0.81929612;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="path3701-2" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -381.74786,581.47736 -1.35962,2.77706 2.03944,3.88787 4.41879,1.94394 3.05916,3.88787 4.41879,1.11082 1.69954,3.88788 6.45823,1.11082 6.79814,-1.11082 5.09861,-3.05476 2.03944,-9.71969 -0.33991,-5.83181 -8.15777,-22.77183 -6.11832,2.49934 4.41879,15.82921 -1.69954,2.77705 -22.77377,2.77705"
+ style="fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.81929612;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="path3703-4" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -381.74786,581.47736 -1.35962,2.77706 2.03944,3.88787 4.41879,1.94394 3.05916,3.88787 4.41879,1.11082 1.69954,3.88788 6.45823,1.11082 6.79814,-1.11082 5.09861,-3.05476 2.03944,-9.71969 -0.33991,-5.83181 -8.15777,-22.77183 -6.11832,2.49934 4.41879,15.82921 -1.69954,2.77705 -22.77377,2.77705"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:0.81929612;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="path3705-5" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -381.74786,575.92326 9.5174,-1.11082 1.35963,-6.10952 -3.39907,-1.66623 -5.77842,2.49934 0.67981,2.77706 -2.37935,3.61017"
+ style="fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.81929612;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="path3707-5" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -381.74786,575.92326 9.5174,-1.11082 1.35963,-6.10952 -3.39907,-1.66623 -5.77842,2.49934 0.67981,2.77706 -2.37935,3.61017"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:0.81929612;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="path3709-1" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -329.06227,518.99367 4.07889,1.38852 6.45823,-4.16558 -2.37935,-2.77705 -2.37935,4.72099 -1.69953,-2.77705 -4.07889,3.61017"
+ style="fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.81929612;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="path3711-7" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -329.06227,518.99367 4.07889,1.38852 6.45823,-4.16558 -2.37935,-2.77705 -2.37935,4.72099 -1.69953,-2.77705 -4.07889,3.61017"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:0.81929612;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="path3713-1" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -294.05185,507.05234 2.37935,2.22164 4.41879,-0.83312 -3.73897,-3.33246 -3.05917,1.94394"
+ style="fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.81929612;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="path3715-1" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -294.05185,507.05234 2.37935,2.22164 4.41879,-0.83312 -3.73897,-3.33246 -3.05917,1.94394"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:0.81929612;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="path3717-5" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -306.62841,499.55429 1.69954,0.83312 -1.69954,-0.83312"
+ style="fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.81929612;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="path3719-2" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -306.62841,499.55429 1.69954,0.83312"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:0.81929612;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="path3721-7" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -304.92887,500.38741 5.77842,-3.33246 -5.43851,0 -2.03945,2.49934 1.69954,0.83312"
+ style="fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.81929612;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="path3723-61" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -304.92887,500.38741 5.77842,-3.33246 -5.43851,0 -2.03945,2.49934 1.69954,0.83312"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:0.81929612;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="path3725-4" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -307.30822,500.94282 -6.79814,1.38853 2.71926,0.83311 5.43851,-1.38852 -1.35963,-0.83312"
+ style="fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.81929612;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="path3727-2" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -307.30822,500.94282 -6.79814,1.38853 2.71926,0.83311 5.43851,-1.38852 -1.35963,-0.83312"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:0.81929612;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="path3729-3" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -305.94859,501.77594 -1.35963,-0.83312 1.35963,0.83312"
+ style="fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.81929612;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="path3731-2" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -305.94859,501.77594 -1.35963,-0.83312"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:0.81929612;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+ id="path3733-2" />
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.00000095px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman';letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none"
+ x="-325.6788"
+ y="-34.073654"
+ id="text10238"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan10240"
+ x="-325.6788"
+ y="-34.073654" /></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20.00000191px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman';letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none"
+ x="-717.97241"
+ y="46.259476"
+ id="text10242"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan10244"
+ x="-717.97241"
+ y="46.259476" /></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman';letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none"
+ x="-827.76105"
+ y="66.342789"
+ id="text10246"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan10248"
+ x="-827.76105"
+ y="66.342789" /></text>
+ <path
+ d="m -15.861526,-84.460434 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-06-3"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328301;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -628.03313,280.89936 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-6"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51300013;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -157.41464,448.26014 c 0,2.2186 -1.9012,4.0139 -4.2506,4.0139 -2.3494,0 -4.2505,-1.7953 -4.2505,-4.0139 0,-2.2215 1.9011,-4.0139 4.2505,-4.0139 2.3494,0 4.2506,1.7953 4.2506,4.0139 z"
+ id="path4313-64-90-5-9"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328301;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -145.36467,425.49914 c 0,2.2186 -1.9012,4.0139 -4.2506,4.0139 -2.3494,0 -4.2505,-1.7953 -4.2505,-4.0139 0,-2.2215 1.9011,-4.0139 4.2505,-4.0139 2.3494,0 4.2506,1.7953 4.2506,4.0139 z"
+ id="path4313-64-90-5-64"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328301;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -138.00079,320.06178 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.25051,-1.79529 -4.25051,-4.01388 0,-2.22151 1.90111,-4.01389 4.25051,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-63"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328301;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -109.21474,340.14508 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-2"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328301;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -144.3605,152.70101 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-1"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328301;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -95.491156,195.21065 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.349404,0 -4.250504,-1.79529 -4.250504,-4.01388 0,-2.22151 1.9011,-4.01389 4.250504,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-0"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328301;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -350.8837,-14.994484 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-5"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328301;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -371.73447,26.788286 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-8"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328301;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -410.12941,44.920676 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-7"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328301;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -70.721756,-41.102764 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-4"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328301;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 93.961234,-30.726394 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-62"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328301;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 281.74002,176.80096 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-01"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328301;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -745.85512,279.22576 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-6-1"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328313;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -520.92224,105.17055 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-6-6"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328313;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -113.2569,66.188856 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.22151 1.9012,-4.0139 4.2506,-4.0139 2.3494,0 4.2506,1.79531 4.2506,4.0139 z"
+ id="path4313-64-90-15-9-1"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328301;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 207.09472,199.08685 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.22151 1.9012,-4.01389 4.2506,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-15-2-7"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328301;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m 763.77522,110.09371 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2506,-1.79529 -4.2506,-4.01388 0,-2.22151 1.9012,-4.01389 4.2506,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-15-86-4"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328301;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -346.27222,47.609166 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-8-6"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328313;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -337.7516,44.058906 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-8-3"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328313;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -330.4144,39.798596 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-8-1"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328313;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -322.52015,43.334506 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-8-32"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328313;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -320.94704,51.159426 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-8-4"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328313;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -320.19638,59.457716 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-8-7"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328313;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -313.97328,45.490916 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-8-72"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328313;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -312.84482,53.705516 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.34941,0 -4.25051,-1.79529 -4.25051,-4.01388 0,-2.22151 1.9011,-4.01389 4.25051,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-8-2"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328313;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -311.29347,60.796606 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-8-40"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328313;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -305.19916,67.062776 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-8-5"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328313;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -314.80762,67.782266 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-8-61"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328313;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -317.67408,87.501276 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-8-34"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328313;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -318.63517,77.852206 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-8-9"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328313;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -309.8229,74.354446 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-8-0"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328313;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -299.88218,73.881076 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-8-25"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328313;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -339.41948,54.460236 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-8-24"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328313;stroke-miterlimit:4;stroke-dasharray:none" />
+ <path
+ d="m -330.382,55.715446 c 0,2.21859 -1.9012,4.01388 -4.2506,4.01388 -2.3494,0 -4.2505,-1.79529 -4.2505,-4.01388 0,-2.22151 1.9011,-4.01389 4.2505,-4.01389 2.3494,0 4.2506,1.7953 4.2506,4.01389 z"
+ id="path4313-64-90-5-8-43"
+ inkscape:connector-curvature="0"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1.51328313;stroke-miterlimit:4;stroke-dasharray:none" />
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/src/locale/qmapshack.ts b/src/locale/qmapshack.ts
index a83ff7c..06d4526 100644
--- a/src/locale/qmapshack.ts
+++ b/src/locale/qmapshack.ts
@@ -174,13 +174,8 @@
<context>
<name>CCreateRouteFromWpt</name>
<message>
- <location filename="../gis/rte/CCreateRouteFromWpt.cpp" line="65"/>
- <source>Edit name...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gis/rte/CCreateRouteFromWpt.cpp" line="65"/>
- <source>Enter new route name.</source>
+ <location filename="../gis/rte/CCreateRouteFromWpt.cpp" line="68"/>
+ <source>route</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -425,7 +420,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="270"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="738"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="791"/>
<source>none</source>
<translation type="unfinished"></translation>
</message>
@@ -447,18 +442,18 @@ To solve this conflict you can create and save a clone, force your version or dr
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="453"/>
<location filename="../gis/prj/CDetailsPrj.cpp" line="479"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="583"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="673"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="703"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="608"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="726"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="756"/>
<source>Info</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="454"/>
<location filename="../gis/prj/CDetailsPrj.cpp" line="480"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="584"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="674"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="704"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="609"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="727"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="757"/>
<source>Comment</source>
<translation type="unfinished"></translation>
</message>
@@ -468,54 +463,69 @@ 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="602"/>
- <source>distance: %1%2</source>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+ <source>From Start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+ <source>To Next</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+ <source>To End</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="604"/>
- <source>ascent: %1%2</source>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="630"/>
+ <source>distance: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="606"/>
- <source>descend: %1%2</source>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="640"/>
+ <source>ascent: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="666"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="650"/>
+ <source>descend: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="719"/>
<source><h2>Areas</h2></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="696"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="749"/>
<source><h2>Routes</h2></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="724"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="777"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="804"/>
<source>Edit name...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="724"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="777"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="804"/>
<source>Enter new project name.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="733"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="786"/>
<source>Edit keywords...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="733"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="786"/>
<source>Enter keywords.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="882"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="935"/>
<source>Print Diary</source>
<translation type="unfinished"></translation>
</message>
@@ -548,37 +558,27 @@ 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/CDetailsTrk.cpp" line="410"/>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="418"/>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="421"/>
<location filename="../gis/trk/CDetailsTrk.cpp" line="426"/>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="440"/>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="442"/>
- <source>%1 %2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="507"/>
<source>Color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="508"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="427"/>
<source>Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="741"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="651"/>
<source>Reset activities...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="741"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="651"/>
<source>This will remove all activities from the track. Proceed?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="747"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="657"/>
<source>None</source>
<translation type="unfinished"></translation>
</message>
@@ -599,7 +599,7 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/gpx/serialization.cpp" line="1038"/>
+ <location filename="../gis/gpx/serialization.cpp" line="1040"/>
<source>Unknown</source>
<translation type="unfinished"></translation>
</message>
@@ -620,7 +620,7 @@ To solve this conflict you can create and save a clone, force your version or dr
<context>
<name>CElevationDialog</name>
<message>
- <location filename="../helpers/CElevationDialog.cpp" line="83"/>
+ <location filename="../helpers/CElevationDialog.cpp" line="92"/>
<source>No DEM data found for that point.</source>
<translation type="unfinished"></translation>
</message>
@@ -673,13 +673,12 @@ To solve this conflict you can create and save a clone, force your version or dr
<context>
<name>CFitProject</name>
<message>
- <location filename="../gis/fit/CFitProject.cpp" line="44"/>
- <location filename="../gis/fit/CFitProject.cpp" line="62"/>
+ <location filename="../gis/fit/CFitProject.cpp" line="61"/>
<source>Failed to load file %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/fit/CFitProject.cpp" line="86"/>
+ <location filename="../gis/fit/CFitProject.cpp" line="91"/>
<source>Failed to open FIT file %1.</source>
<translation type="unfinished"></translation>
</message>
@@ -797,68 +796,78 @@ To solve this conflict you can create and save a clone, force your version or dr
<context>
<name>CGisItemRte</name>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="63"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="65"/>
<source>_Clone</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="249"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="284"/>
+ <source>track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="311"/>
<source>Changed name.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="255"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="317"/>
<source>Changed comment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="261"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="323"/>
<source>Changed description</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="267"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="329"/>
<source>Changed links</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="285"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="347"/>
<source>Length: %1 %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="289"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
<source>Length: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="296"/>
- <location filename="../gis/rte/CGisItemRte.cpp" line="485"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="559"/>
<source>Time: %1 %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="300"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
<source>Time: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="306"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="372"/>
+ <source>%1%2 %3, %4%5 %6</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="378"/>
<source>Last time routed:<br/>%1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="308"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="380"/>
<source>with %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="487"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="561"/>
<source>Distance: %1 %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="601"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="675"/>
<source>Changed route points.</source>
<translation type="unfinished"></translation>
</message>
@@ -866,7 +875,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="182"/>
+ <location filename="../gis/fit/serialization.cpp" line="247"/>
<source>FIT file %1 contains no GPS data.</source>
<translation type="unfinished"></translation>
</message>
@@ -907,193 +916,247 @@ 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="401"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="394"/>
<source>Length: %1 %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="408"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="401"/>
<source>, %1%2 %3, %4%5 %6</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="428"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="405"/>
+ <source>, %1-, %2-</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="417"/>
+ <source>Time: -, Speed: -</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="429"/>
+ <source>Moving: -, Speed: -</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="435"/>
<source>Start: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="432"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="439"/>
+ <source>Start: -</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="445"/>
<source>End: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="435"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="449"/>
+ <source>End: -</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="453"/>
<source>Points: %1 (%2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="527"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="457"/>
+ <source>Invalid elevations!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="462"/>
+ <source>Invalid timestamps!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="467"/>
+ <source>Invalid positions!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="558"/>
+ <source>Index: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="562"/>
+ <source>Index: visible %1, total %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="573"/>
<source>Ele.: %1 %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="530"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
<source> slope: %1%3 (%2%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="535"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
<source> speed: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="563"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
<source>... and %1 tags not displayed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="574"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
<source>Descend: - (-)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="575"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
<source>Distance: - (-)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="622"/>
<source>Moving: - (-)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="627"/>
<source>Ascend: %1%2 (%3%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1441"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1317"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1330"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1390"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1434"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1599"/>
+ <source>track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1535"/>
<source>Hide point %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1445"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1539"/>
<source>Hide points %1..%2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="573"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="619"/>
<source>Ascend: - (-)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="587"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="633"/>
<source> Descend: %1%2 (%3%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="599"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="645"/>
<source> Moving: %1%2 (%3%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="667"/>
<source>Ascend: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="672"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="684"/>
<source>, %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="615"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="661"/>
<source>Ascend: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="633"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="679"/>
<source> Descend: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="616"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="662"/>
<source>Descend: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="694"/>
<source> Time: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
- <source>Edit name...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
- <source>Enter new track name.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="416"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="413"/>
<source>Time: %1, Speed: %2 %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="423"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="425"/>
<source>Moving: %1, Speed: %2 %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="593"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="639"/>
<source>Distance: %1%2 (%3%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="643"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
<source>Distance: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1286"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1380"/>
<source>Permanently removed points %1..%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1485"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1579"/>
<source>Show points.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2040"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2142"/>
<source>Changed name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2046"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2148"/>
<source>Changed comment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2052"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2154"/>
<source>Changed description</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2058"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2160"/>
<source>Changed links</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2085"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2171"/>
+ <source>Changed elevation of point %1 to %2 %3</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2198"/>
<source>Changed activity to '%1' for complete track.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2143"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2256"/>
<source>Changed activity to '%1' for range(%2..%3).</source>
<translation type="unfinished"></translation>
</message>
@@ -1103,62 +1166,62 @@ 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/filter/filter.cpp" line="143"/>
- <source>Hide points with invalid coordinates at the beginning of the track</source>
+ <location filename="../gis/trk/filter/filter.cpp" line="141"/>
+ <source>Hide points with invalid data.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="159"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="157"/>
<source>Reset all hidden track points to visible</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="193"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="191"/>
<source>Permanently removed all hidden track points</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="243"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="241"/>
<source>Smoothed profile with a Median filter of size %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="279"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="277"/>
<source>Replaced elevation data with data from DEM files.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="302"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="300"/>
<source>Offset elevation data by %1%2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="321"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="319"/>
<source>Changed start of track to %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="340"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="338"/>
<source>Remove timestamps.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="363"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="361"/>
<source>Set artificial timestamps with delta of %1 sec.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="396"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="393"/>
<source>Changed speed to %1%2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="415"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="412"/>
<source>%1 (Segment %2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="438"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="435"/>
<source>Removed extension %1 from all Track Points</source>
<translation type="unfinished"></translation>
</message>
@@ -1171,17 +1234,17 @@ To solve this conflict you can create and save a clone, force your version or dr
<context>
<name>CGisItemWpt</name>
<message>
- <location filename="../gis/gpx/serialization.cpp" line="588"/>
+ <location filename="../gis/gpx/serialization.cpp" line="590"/>
<source>Archived</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/gpx/serialization.cpp" line="592"/>
+ <location filename="../gis/gpx/serialization.cpp" line="594"/>
<source>Available</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/gpx/serialization.cpp" line="596"/>
+ <location filename="../gis/gpx/serialization.cpp" line="598"/>
<source>Not Available</source>
<translation type="unfinished"></translation>
</message>
@@ -1470,54 +1533,59 @@ 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="174"/>
+ <location filename="../gis/CGisListWks.cpp" line="166"/>
+ <source>Convert to Track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="175"/>
<source>Edit Area Points</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="181"/>
+ <location filename="../gis/CGisListWks.cpp" line="182"/>
<source>Create Route</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="625"/>
+ <location filename="../gis/CGisListWks.cpp" line="626"/>
<source>Drop items...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="650"/>
- <location filename="../gis/CGisListWks.cpp" line="1581"/>
- <location filename="../gis/CGisListWks.cpp" line="1619"/>
+ <location filename="../gis/CGisListWks.cpp" line="651"/>
+ <location filename="../gis/CGisListWks.cpp" line="1593"/>
+ <location filename="../gis/CGisListWks.cpp" line="1631"/>
<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="779"/>
+ <location filename="../gis/CGisListWks.cpp" line="780"/>
<source>Saving workspace. Please wait.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="825"/>
+ <location filename="../gis/CGisListWks.cpp" line="826"/>
<source>Loading workspace. Please wait.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1142"/>
+ <location filename="../gis/CGisListWks.cpp" line="1143"/>
<source>Close all projects...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1142"/>
+ <location filename="../gis/CGisListWks.cpp" line="1143"/>
<source>This will remove all projects from the workspace.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1165"/>
+ <location filename="../gis/CGisListWks.cpp" line="1166"/>
<source>Delete project...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1165"/>
+ <location filename="../gis/CGisListWks.cpp" line="1166"/>
<source>Do you really want to delete %1?</source>
<translation type="unfinished"></translation>
</message>
@@ -1540,12 +1608,12 @@ 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="645"/>
+ <location filename="../gis/CGisWidget.cpp" line="657"/>
<source>Cut Track...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="645"/>
+ <location filename="../gis/CGisWidget.cpp" line="657"/>
<source>Do you want to delete the original track?</source>
<translation type="unfinished"></translation>
</message>
@@ -1553,49 +1621,49 @@ To solve this conflict you can create and save a clone, force your version or dr
<context>
<name>CGpxProject</name>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="90"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="91"/>
<source>Failed to load file %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="112"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="113"/>
<source>Failed to open %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="124"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="125"/>
<source>Failed to read: %1
line %2, column %3:
%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="132"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="133"/>
<source>Not a GPX file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="238"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="258"/>
<source>File exists ...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="239"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="259"/>
<source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains GPX data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file. Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="347"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="367"/>
<source>Failed to create file '%1'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="357"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="377"/>
<source>Failed to write file '%1'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="362"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="382"/>
<source>Saving GIS data failed...</source>
<translation type="unfinished"></translation>
</message>
@@ -1657,64 +1725,64 @@ line %2, column %3:
<context>
<name>CKnownExtension</name>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="45"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="62"/>
<source>Air Temperature</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="49"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="66"/>
<source>Water Temperature</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="53"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="70"/>
<source>Depth</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="57"/>
- <location filename="../gis/trk/CKnownExtension.cpp" line="69"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="74"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="86"/>
<source>Heart Rate</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="61"/>
- <location filename="../gis/trk/CKnownExtension.cpp" line="73"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="78"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="90"/>
<source>Cadence</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="77"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="94"/>
<source>Speed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="81"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="98"/>
<source>Acceleration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="85"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="102"/>
<source>Course</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="94"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="111"/>
<source>Slope*</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="99"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
<source>Speed*</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="104"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="121"/>
<source>Elevation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="109"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="126"/>
<source>Progress</source>
<translation type="unfinished"></translation>
</message>
@@ -1730,33 +1798,38 @@ line %2, column %3:
<context>
<name>CMainWindow</name>
<message>
- <location filename="../CMainWindow.cpp" line="643"/>
+ <location filename="../CMainWindow.cpp" line="557"/>
+ <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="685"/>
<source>Ele: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="659"/>
+ <location filename="../CMainWindow.cpp" line="701"/>
<source>[Grid: %1]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="794"/>
+ <location filename="../CMainWindow.cpp" line="836"/>
<source>Load GIS Data...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="828"/>
+ <location filename="../CMainWindow.cpp" line="870"/>
<source>Select output file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="828"/>
- <location filename="../CMainWindow.cpp" line="854"/>
+ <location filename="../CMainWindow.cpp" line="870"/>
+ <location filename="../CMainWindow.cpp" line="896"/>
<source>QMapShack View (*.view)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="854"/>
+ <location filename="../CMainWindow.cpp" line="896"/>
<source>Select file to load</source>
<translation type="unfinished"></translation>
</message>
@@ -2374,7 +2447,7 @@ If it's no fun, why don't you provide maps? Well to host maps ready fo
</message>
<message>
<location filename="../map/CMapIMG.cpp" line="730"/>
- <source>File contains locked / encypted data. Garmin does not want you to use this file with any other software than the one supplied by Garmin.</source>
+ <source>File contains locked / encrypted data. Garmin does not want you to use this file with any other software than the one supplied by Garmin.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2647,13 +2720,8 @@ Unknown structure.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseEditArea.cpp" line="100"/>
- <source>Edit name...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../mouse/CMouseEditArea.cpp" line="100"/>
- <source>Enter new area name.</source>
+ <location filename="../mouse/CMouseEditArea.cpp" line="96"/>
+ <source>area</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -2671,13 +2739,8 @@ Unknown structure.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseEditRte.cpp" line="111"/>
- <source>Edit name...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../mouse/CMouseEditRte.cpp" line="111"/>
- <source>Enter new route name.</source>
+ <location filename="../mouse/CMouseEditRte.cpp" line="107"/>
+ <source>route</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -2705,13 +2768,8 @@ Unknown structure.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseEditTrk.cpp" line="116"/>
- <source>Edit name...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../mouse/CMouseEditTrk.cpp" line="116"/>
- <source>Enter new track name.</source>
+ <location filename="../mouse/CMouseEditTrk.cpp" line="112"/>
+ <source>track</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -3678,6 +3736,24 @@ line %2, column %3:
</message>
</context>
<context>
+ <name>CTableTrk</name>
+ <message>
+ <location filename="../gis/trk/CTableTrk.cpp" line="101"/>
+ <source>Double click to edit elevation value</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CTableTrk.cpp" line="127"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="135"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="138"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="143"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="157"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="159"/>
+ <source>%1 %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CTextEditWidget</name>
<message>
<location filename="../widgets/CTextEditWidget.cpp" line="73"/>
@@ -3728,7 +3804,7 @@ line %2, column %3:
<context>
<name>CWptIconDialog</name>
<message>
- <location filename="../helpers/CWptIconDialog.cpp" line="160"/>
+ <location filename="../helpers/CWptIconDialog.cpp" line="161"/>
<source>Path to user icons...</source>
<translation type="unfinished"></translation>
</message>
@@ -4163,7 +4239,7 @@ If you want to keep just one half you can simply remove the points, or check thi
</message>
<message>
<location filename="../dem/IDemList.ui" line="118"/>
- <source>To add files with elevation data use <b>File->Setup DEM Paths</b>. </source>
+ <source>To add files with elevation data use <b>File->Setup DEM Paths</b>. Or click <a href='setup'><b>here</b></a></source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -4427,229 +4503,235 @@ 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="56"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="77"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="98"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="81"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="105"/>
<source>-
-</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="255"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="265"/>
<source><html><head/><body><p>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </p></body></html></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="277"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="287"/>
<source>Toggle read only mode. You have to open the lock to edit the item.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="280"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="444"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="473"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="538"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="564"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="593"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="682"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="711"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1040"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1069"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1101"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1137"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1166"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1198"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1234"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1263"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1295"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="290"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="454"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="483"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="548"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="574"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="603"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="692"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="721"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1050"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1079"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1111"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1147"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1176"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1208"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1244"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1273"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1305"/>
<source>...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="306"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="316"/>
<source>-</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="345"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="355"/>
<source>Info</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="377"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="387"/>
<source>Style</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="419"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="429"/>
<source>Source</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="624"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="634"/>
<source>Maximum</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="441"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="451"/>
<source>Use/edit user defined visibility of arrows for this track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="470"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="480"/>
<source>Use/edit system's visibility of arrows for all tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="764"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="774"/>
<source>Minimum</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="832"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="842"/>
<source>Graphs</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1019"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1029"/>
<source>Profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="426"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="436"/>
<source>Width</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="679"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="689"/>
<source>Use/edit user defined scale factor for this track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="708"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="718"/>
<source>Use/edit system's default factor for all tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="631"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="641"/>
<source>with arrows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="638"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="648"/>
<source>x </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="535"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1037"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1134"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1231"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="545"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1047"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1144"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1241"/>
<source>User defined limits for this track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="561"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1066"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1163"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1260"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="56"/>
+ <source>-
+-
+-</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="571"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1076"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1173"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1270"/>
<source>Automatic limits</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="590"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1098"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1195"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1292"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="600"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1108"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1205"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1302"/>
<source>User defined limits for all tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="784"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="794"/>
<source>Color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="845"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="865"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="951"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="855"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="875"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="961"/>
<source>max.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="984"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="991"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1005"/>
+ <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>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1324"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1334"/>
<source>Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1365"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1375"/>
<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="1392"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1402"/>
<source>Points</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1440"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1450"/>
<source>Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1445"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1455"/>
<source>Ele.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1450"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1460"/>
<source>Delta</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1455"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1465"/>
<source>Dist.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1460"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1470"/>
<source>Speed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1465"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
<source>Slope</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1470"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
<source>Ascend</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1485"/>
<source>Descend</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1490"/>
<source>Position</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1489"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1499"/>
<source>Filter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1526"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1536"/>
<source>Hist.</source>
<translation type="unfinished"></translation>
</message>
@@ -4862,7 +4944,7 @@ If you want to keep just one half you can simply remove the points, or check thi
</message>
<message>
<location filename="../gis/trk/filter/IFilterInvalid.ui" line="56"/>
- <source>Hide points with invalid coordinates at the beginning of the track.</source>
+ <source>Hide points with invalid data.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -5101,80 +5183,90 @@ If you want to keep just one half you can simply remove the points, or check thi
<context>
<name>IGisItem</name>
<message>
- <location filename="../gis/IGisItem.cpp" line="42"/>
+ <location filename="../gis/IGisItem.cpp" line="43"/>
<source>[no name]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="314"/>
+ <location filename="../gis/IGisItem.cpp" line="315"/>
<source>The item is not part of the project in the database.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="315"/>
+ <location filename="../gis/IGisItem.cpp" line="316"/>
<source>
It is either a new item or it has been deleted in the database by someone else.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="321"/>
+ <location filename="../gis/IGisItem.cpp" line="322"/>
<source>The item is not in the database.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="327"/>
+ <location filename="../gis/IGisItem.cpp" line="328"/>
<source>The item might need to be saved</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="411"/>
+ <location filename="../gis/IGisItem.cpp" line="412"/>
<source>Initial version.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="519"/>
+ <location filename="../gis/IGisItem.cpp" line="520"/>
<source><h3>%1</h3> This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press 'Ok'.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="520"/>
+ <location filename="../gis/IGisItem.cpp" line="521"/>
<source>Read Only Mode...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="684"/>
- <location filename="../gis/IGisItem.cpp" line="743"/>
+ <location filename="../gis/IGisItem.cpp" line="685"/>
+ <location filename="../gis/IGisItem.cpp" line="744"/>
<source><h4>Description:</h4></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="687"/>
- <location filename="../gis/IGisItem.cpp" line="746"/>
+ <location filename="../gis/IGisItem.cpp" line="688"/>
+ <location filename="../gis/IGisItem.cpp" line="747"/>
<source><p>--- no description ---</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="698"/>
+ <location filename="../gis/IGisItem.cpp" line="699"/>
<source><h4>Comment:</h4></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="701"/>
+ <location filename="../gis/IGisItem.cpp" line="702"/>
<source><p>--- no comment ---</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="712"/>
- <location filename="../gis/IGisItem.cpp" line="757"/>
+ <location filename="../gis/IGisItem.cpp" line="713"/>
+ <location filename="../gis/IGisItem.cpp" line="758"/>
<source><h4>Links:</h4></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="715"/>
- <location filename="../gis/IGisItem.cpp" line="760"/>
+ <location filename="../gis/IGisItem.cpp" line="716"/>
+ <location filename="../gis/IGisItem.cpp" line="761"/>
<source><p>--- no links ---</p></source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gis/IGisItem.cpp" line="843"/>
+ <source>Edit name...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/IGisItem.cpp" line="843"/>
+ <source>Enter new %1 name.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>IGisProject</name>
@@ -5750,7 +5842,7 @@ Filename: %1</source>
</message>
<message>
<location filename="../map/IMapList.ui" line="103"/>
- <source>To add maps use <b>File->Setup Map Paths</b>. </source>
+ <source>To add maps use <b>File->Setup Map Paths</b>. Or click <a href='setup'><b>here</b></a></source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -5938,57 +6030,57 @@ I don't want to read the documentation!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="311"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="314"/>
<source><b>Delete Point</b><br/>Move the mouse close to a point and press the left button to delete it.<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="320"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="323"/>
<source><b>Select Range of Points</b><br/>Left click on first point to start selection. Left click second point to complete selection and choose from options. Use the right mouse button to cancel.<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="329"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
<source><b>Move Point</b><br/>Move the mouse close to a point and press the left button to make it stick to the cursor. Move the mouse to move the point. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="338"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="341"/>
<source><b>Add Point</b><br/>Move the mouse close to a line segment and press the left button to add a point. The point will stick to the cursor and you can move it. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="347"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="350"/>
<source><b>No Routing</b><br/>All points will be connected with a straight line.<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="353"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="356"/>
<source><b>Auto Routing</b><br/>The current router setup is used to derive a route between points. <b>Note:</b> The selected router must be able to route on-the-fly. Offline routers usually can do, online routers can't.<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="358"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="361"/>
<source><b>Vector Routing</b><br/>Connect points with a line from a loaded vector map if possible.<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="530"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="533"/>
<source><b>%1 Metrics</b></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="533"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="536"/>
<source>Distance:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="535"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="538"/>
<source>Ascend:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="537"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="540"/>
<source>Descend:</source>
<translation type="unfinished"></translation>
</message>
@@ -6646,6 +6738,7 @@ or
<location filename="../gis/rte/IScrOptRte.ui" line="106"/>
<location filename="../gis/rte/IScrOptRte.ui" line="120"/>
<location filename="../gis/rte/IScrOptRte.ui" line="134"/>
+ <location filename="../gis/rte/IScrOptRte.ui" line="148"/>
<source>...</source>
<translation type="unfinished"></translation>
</message>
@@ -6675,7 +6768,12 @@ or
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/IScrOptRte.ui" line="160"/>
+ <location filename="../gis/rte/IScrOptRte.ui" line="145"/>
+ <source>Convert route to track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/IScrOptRte.ui" line="174"/>
<source>TextLabel</source>
<translation type="unfinished"></translation>
</message>
@@ -6700,9 +6798,9 @@ or
<location filename="../mouse/IScrOptSelect.ui" line="176"/>
<location filename="../mouse/IScrOptSelect.ui" line="205"/>
<location filename="../mouse/IScrOptSelect.ui" line="265"/>
- <location filename="../mouse/IScrOptSelect.ui" line="291"/>
- <location filename="../mouse/IScrOptSelect.ui" line="317"/>
- <location filename="../mouse/IScrOptSelect.ui" line="343"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="292"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="319"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="346"/>
<source>...</source>
<translation type="unfinished"></translation>
</message>
@@ -6737,17 +6835,17 @@ or
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="288"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="289"/>
<source>Add waypoints to selection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="314"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="316"/>
<source>Add routes to selection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="340"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="343"/>
<source>Add areas to selection.</source>
<translation type="unfinished"></translation>
</message>
@@ -7536,7 +7634,7 @@ or
</message>
<message>
<location filename="../helpers/IWptIconDialog.ui" line="95"/>
- <source>All custom icons have to be *.bmp format.</source>
+ <source>All custom icons have to be *.bmp or *.png format.</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/src/locale/qmapshack_cs.ts b/src/locale/qmapshack_cs.ts
index 9047b3e..13462de 100644
--- a/src/locale/qmapshack_cs.ts
+++ b/src/locale/qmapshack_cs.ts
@@ -182,14 +182,17 @@
<context>
<name>CCreateRouteFromWpt</name>
<message>
- <location filename="../gis/rte/CCreateRouteFromWpt.cpp" line="65"/>
<source>Edit name...</source>
- <translation>Upravit název...</translation>
+ <translation type="vanished">Upravit název...</translation>
</message>
<message>
- <location filename="../gis/rte/CCreateRouteFromWpt.cpp" line="65"/>
<source>Enter new route name.</source>
- <translation>Zadat nový název pro cestu.</translation>
+ <translation type="vanished">Zadat nový název pro cestu.</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/CCreateRouteFromWpt.cpp" line="68"/>
+ <source>route</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -465,7 +468,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="270"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="738"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="791"/>
<source>none</source>
<translation>žádné</translation>
</message>
@@ -486,18 +489,18 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="453"/>
<location filename="../gis/prj/CDetailsPrj.cpp" line="479"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="583"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="673"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="703"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="608"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="726"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="756"/>
<source>Info</source>
<translation>Informace</translation>
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="454"/>
<location filename="../gis/prj/CDetailsPrj.cpp" line="480"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="584"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="674"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="704"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="609"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="727"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="757"/>
<source>Comment</source>
<translation>Poznámka</translation>
</message>
@@ -507,7 +510,37 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<translation><h2>Stopy</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="666"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+ <source>From Start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+ <source>To Next</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+ <source>To End</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="630"/>
+ <source>distance: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="640"/>
+ <source>ascent: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="650"/>
+ <source>descend: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="719"/>
<source><h2>Areas</h2></source>
<translation><h2>Oblasti</h2></translation>
</message>
@@ -527,49 +560,46 @@ 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="602"/>
<source>distance: %1%2</source>
- <translation>Vzdálenost: %1%2</translation>
+ <translation type="vanished">Vzdálenost: %1%2</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="604"/>
<source>ascent: %1%2</source>
- <translation>Stoupání: %1%2</translation>
+ <translation type="vanished">Stoupání: %1%2</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="606"/>
<source>descend: %1%2</source>
- <translation>Klesání: %1%2</translation>
+ <translation type="vanished">Klesání: %1%2</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="696"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="749"/>
<source><h2>Routes</h2></source>
<translation><h2>Cesty</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="724"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="777"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="804"/>
<source>Edit name...</source>
<translation>Upravit název...</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="724"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="777"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="804"/>
<source>Enter new project name.</source>
<translation>Zadejte název projektu.</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="733"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="786"/>
<source>Edit keywords...</source>
<translation>Upravit klíčová slova...</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="733"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="786"/>
<source>Enter keywords.</source>
<translation>Zadejte klíčová slova.</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="882"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="935"/>
<source>Print Diary</source>
<translation>Tisk deníku</translation>
</message>
@@ -633,22 +663,16 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<translation>Rozkrájet stopu na kusy</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="410"/>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="418"/>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="421"/>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="426"/>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="440"/>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="442"/>
<source>%1 %2</source>
- <translation>%1 %2</translation>
+ <translation type="vanished">%1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="507"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="426"/>
<source>Color</source>
<translation>Barva</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="508"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="427"/>
<source>Activity</source>
<translation>Činnost</translation>
</message>
@@ -661,17 +685,17 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<translation type="obsolete">Zadat název nové stopy.</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="741"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="651"/>
<source>Reset activities...</source>
<translation>Nastavit činnosti znovu...</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="741"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="651"/>
<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>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="747"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="657"/>
<source>None</source>
<translation>Žádné</translation>
</message>
@@ -736,7 +760,7 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<translation>Obrázek %1</translation>
</message>
<message>
- <location filename="../gis/gpx/serialization.cpp" line="1038"/>
+ <location filename="../gis/gpx/serialization.cpp" line="1040"/>
<source>Unknown</source>
<translation>Neznámý</translation>
</message>
@@ -757,7 +781,7 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<context>
<name>CElevationDialog</name>
<message>
- <location filename="../helpers/CElevationDialog.cpp" line="83"/>
+ <location filename="../helpers/CElevationDialog.cpp" line="92"/>
<source>No DEM data found for that point.</source>
<translation>Pro tento bod nebyla nalezena žádná data výškového modelu (DEM).</translation>
</message>
@@ -810,13 +834,12 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<context>
<name>CFitProject</name>
<message>
- <location filename="../gis/fit/CFitProject.cpp" line="44"/>
- <location filename="../gis/fit/CFitProject.cpp" line="62"/>
+ <location filename="../gis/fit/CFitProject.cpp" line="61"/>
<source>Failed to load file %1...</source>
<translation>Nepodařilo se nahrát soubor %1...</translation>
</message>
<message>
- <location filename="../gis/fit/CFitProject.cpp" line="86"/>
+ <location filename="../gis/fit/CFitProject.cpp" line="91"/>
<source>Failed to open FIT file %1.</source>
<translation>Nepodařilo se otevřít soubor FIT %1.</translation>
</message>
@@ -934,68 +957,78 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<context>
<name>CGisItemRte</name>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="63"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="65"/>
<source>_Clone</source>
<translation>_Klon</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="249"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="284"/>
+ <source>track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="311"/>
<source>Changed name.</source>
<translation>Změněn název.</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="255"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="317"/>
<source>Changed comment</source>
<translation>Změněná poznámka</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="261"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="323"/>
<source>Changed description</source>
<translation>Změněný popis</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="267"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="329"/>
<source>Changed links</source>
<translation>Změněné odkazy</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="285"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="347"/>
<source>Length: %1 %2</source>
<translation>Délka: %1 %2</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="289"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
<source>Length: -</source>
<translation>Délka: -</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="296"/>
- <location filename="../gis/rte/CGisItemRte.cpp" line="485"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="559"/>
<source>Time: %1 %2</source>
<translation>Čas: %1 %2</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="300"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
<source>Time: -</source>
<translation>Výsledný čas: -</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="306"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="372"/>
+ <source>%1%2 %3, %4%5 %6</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="378"/>
<source>Last time routed:<br/>%1</source>
<translation>Poslední spočítání cesty:<br/>%1</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="308"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="380"/>
<source>with %1</source>
<translation>s %1</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="487"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="561"/>
<source>Distance: %1 %2</source>
<translation>Vzdálenost: %1 %2</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="601"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="675"/>
<source>Changed route points.</source>
<translation>Změněné body cesty.</translation>
</message>
@@ -1003,7 +1036,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="182"/>
+ <location filename="../gis/fit/serialization.cpp" line="247"/>
<source>FIT file %1 contains no GPS data.</source>
<translation>Soubor FIT %1 neobsahuje žádná data GPS.</translation>
</message>
@@ -1044,12 +1077,12 @@ 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="401"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="394"/>
<source>Length: %1 %2</source>
<translation>Délka: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="408"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="401"/>
<source>, %1%2 %3, %4%5 %6</source>
<translation>, %1%2 %3, %4%5 %6</translation>
</message>
@@ -1066,77 +1099,121 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<translation type="obsolete">Pohyb: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="428"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="435"/>
<source>Start: %1</source>
<translation>Začátek: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="432"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="439"/>
+ <source>Start: -</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="445"/>
<source>End: %1</source>
<translation>Konec: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="435"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="449"/>
+ <source>End: -</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="453"/>
<source>Points: %1 (%2)</source>
<translation>Body: %1 (%2)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="527"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="457"/>
+ <source>Invalid elevations!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="462"/>
+ <source>Invalid timestamps!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="467"/>
+ <source>Invalid positions!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="558"/>
+ <source>Index: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="562"/>
+ <source>Index: visible %1, total %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="573"/>
<source>Ele.: %1 %2</source>
<translation>Výška: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="530"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
<source> slope: %1%3 (%2%)</source>
<translation> sklon: %1%3 (%2%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="535"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
<source> speed: %1%2</source>
<translation> rychlost: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="563"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
<source>... and %1 tags not displayed</source>
<translation>... a %1 značek nezobrazeno</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="574"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
<source>Descend: - (-)</source>
<translation>Klesání: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="575"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
<source>Distance: - (-)</source>
<translation>Vzdálenost: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="622"/>
<source>Moving: - (-)</source>
<translation>Pohyb: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="627"/>
<source>Ascend: %1%2 (%3%)</source>
<translation>Stoupání: %1%2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1441"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1317"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1330"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1390"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1434"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1599"/>
+ <source>track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1535"/>
<source>Hide point %1.</source>
<translation>Skrýt bod %1.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1445"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1539"/>
<source>Hide points %1..%2.</source>
<translation>Skrýt body %1 %2.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="573"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="619"/>
<source>Ascend: - (-)</source>
<translation>Stoupání: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="587"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="633"/>
<source> Descend: %1%2 (%3%)</source>
<translation> Klesání: %1%2 (%3%)</translation>
</message>
@@ -1153,7 +1230,7 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<translation type="obsolete">Vzdálenost: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="599"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="645"/>
<source> Moving: %1%2 (%3%)</source>
<translation> Pohyb: %1%2 (%3%)</translation>
</message>
@@ -1162,28 +1239,28 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<translation type="obsolete"> Pohyb: - (-) </translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="667"/>
<source>Ascend: %1%2</source>
<translation>Stoupání: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="672"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="684"/>
<source>, %1%2</source>
<translation>, %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="615"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="661"/>
<source>Ascend: -</source>
<translation>Stoupání: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="633"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="679"/>
<source> Descend: %1%2</source>
<translation> Klesání: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="616"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="662"/>
<source>Descend: -</source>
<translation>Klesání: -</translation>
</message>
@@ -1192,42 +1269,55 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<translation type="obsolete">Vzdál.: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="694"/>
<source> Time: %1%2</source>
<translation> Čas: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
<source>Edit name...</source>
- <translation>Upravit název...</translation>
+ <translation type="vanished">Upravit název...</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
<source>Enter new track name.</source>
- <translation>Zadat název nové stopy.</translation>
+ <translation type="vanished">Zadat název nové stopy.</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="405"/>
+ <source>, %1-, %2-</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="416"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="413"/>
<source>Time: %1, Speed: %2 %3</source>
<translation>Čas: %1, Rychlost: %2 %3</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="423"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="417"/>
+ <source>Time: -, Speed: -</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="425"/>
<source>Moving: %1, Speed: %2 %3</source>
<translation>Pohyb: %1, Rychlost: %2 %3</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="593"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="429"/>
+ <source>Moving: -, Speed: -</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="639"/>
<source>Distance: %1%2 (%3%)</source>
<translation>Vzdálenost: %1%2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="643"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
<source>Distance: %1%2</source>
<translation>Vzdálenost: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1286"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1380"/>
<source>Permanently removed points %1..%2</source>
<translation>Trvale odstraněné body %1 ... %2</translation>
</message>
@@ -1236,37 +1326,42 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<translation type="obsolete">Skrýt body.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1485"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1579"/>
<source>Show points.</source>
<translation>Ukázat body.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2040"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2142"/>
<source>Changed name</source>
<translation>Změněný název</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2046"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2148"/>
<source>Changed comment</source>
<translation>Změněná poznámka</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2052"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2154"/>
<source>Changed description</source>
<translation>Změněný popis</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2058"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2160"/>
<source>Changed links</source>
<translation>Změněné odkazy</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2085"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2171"/>
+ <source>Changed elevation of point %1 to %2 %3</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2198"/>
<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="2143"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2256"/>
<source>Changed activity to '%1' for range(%2..%3).</source>
<translation>Činnost byla změněna pro oblast (%2...%3) na '%1'.</translation>
</message>
@@ -1276,62 +1371,66 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<translation>Skrýt body pomocí algoritmu Douglas Peuker (%1%2)</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="143"/>
<source>Hide points with invalid coordinates at the beginning of the track</source>
- <translation>Skrýt body s neplatnými souřadnicemi na začátku stopy</translation>
+ <translation type="vanished">Skrýt body s neplatnými souřadnicemi na začátku stopy</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/filter/filter.cpp" line="141"/>
+ <source>Hide points with invalid data.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="159"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="157"/>
<source>Reset all hidden track points to visible</source>
<translation>Nastavit znovu všechny skryté body stopy na viditelné</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="193"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="191"/>
<source>Permanently removed all hidden track points</source>
<translation>Všechny skryté body stopy odstraněny trvale</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="243"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="241"/>
<source>Smoothed profile with a Median filter of size %1</source>
<translation>Profil vyhlazen středovým filtrem o velikosti %1</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="279"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="277"/>
<source>Replaced elevation data with data from DEM files.</source>
<translation>Výšková data nahrazena daty ze souborů s digitálním výškovým modelem (DEM).</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="302"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="300"/>
<source>Offset elevation data by %1%2.</source>
<translation>Výšková data posunuta o %1%2.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="321"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="319"/>
<source>Changed start of track to %1.</source>
<translation>Začátek stopy změněn na %1.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="340"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="338"/>
<source>Remove timestamps.</source>
<translation>Odstranit časová razítka.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="363"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="361"/>
<source>Set artificial timestamps with delta of %1 sec.</source>
<translation>Uměle utvořená časová razítka nastavena s odstupem %1 s.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="396"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="393"/>
<source>Changed speed to %1%2.</source>
<translation>Rychlost změněna na %1%2.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="415"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="412"/>
<source>%1 (Segment %2)</source>
<translation>%1 (část %2)</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="438"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="435"/>
<source>Removed extension %1 from all Track Points</source>
<translation>Rozšíření %1 bylo odstraněno ze všech bodů stopy</translation>
</message>
@@ -1344,17 +1443,17 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<context>
<name>CGisItemWpt</name>
<message>
- <location filename="../gis/gpx/serialization.cpp" line="588"/>
+ <location filename="../gis/gpx/serialization.cpp" line="590"/>
<source>Archived</source>
<translation>Archivováno</translation>
</message>
<message>
- <location filename="../gis/gpx/serialization.cpp" line="592"/>
+ <location filename="../gis/gpx/serialization.cpp" line="594"/>
<source>Available</source>
<translation>Dostupné</translation>
</message>
<message>
- <location filename="../gis/gpx/serialization.cpp" line="596"/>
+ <location filename="../gis/gpx/serialization.cpp" line="598"/>
<source>Not Available</source>
<translation>Nedostupné</translation>
</message>
@@ -1600,29 +1699,34 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<translation>Upravit cestu</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="181"/>
+ <location filename="../gis/CGisListWks.cpp" line="166"/>
+ <source>Convert to Track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="182"/>
<source>Create Route</source>
<translation>Vytvořit cestu</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="625"/>
+ <location filename="../gis/CGisListWks.cpp" line="626"/>
<source>Drop items...</source>
<translation>Zahodit prvky...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="650"/>
- <location filename="../gis/CGisListWks.cpp" line="1581"/>
- <location filename="../gis/CGisListWks.cpp" line="1619"/>
+ <location filename="../gis/CGisListWks.cpp" line="651"/>
+ <location filename="../gis/CGisListWks.cpp" line="1593"/>
+ <location filename="../gis/CGisListWks.cpp" line="1631"/>
<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="1165"/>
+ <location filename="../gis/CGisListWks.cpp" line="1166"/>
<source>Delete project...</source>
<translation>Smazat projekt...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1165"/>
+ <location filename="../gis/CGisListWks.cpp" line="1166"/>
<source>Do you really want to delete %1?</source>
<translation>Opravdu chcete smazat %1?</translation>
</message>
@@ -1676,7 +1780,7 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<translation>Spojit stopy</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="174"/>
+ <location filename="../gis/CGisListWks.cpp" line="175"/>
<source>Edit Area Points</source>
<translation>Upravit body oblasti</translation>
</message>
@@ -1687,22 +1791,22 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<translation>Smazat</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="779"/>
+ <location filename="../gis/CGisListWks.cpp" line="780"/>
<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="825"/>
+ <location filename="../gis/CGisListWks.cpp" line="826"/>
<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="1142"/>
+ <location filename="../gis/CGisListWks.cpp" line="1143"/>
<source>Close all projects...</source>
<translation>Zavřít všechny projekty...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1142"/>
+ <location filename="../gis/CGisListWks.cpp" line="1143"/>
<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>
@@ -1725,12 +1829,12 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<translation>Kopírovat prvky...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="645"/>
+ <location filename="../gis/CGisWidget.cpp" line="657"/>
<source>Cut Track...</source>
<translation>Rozkrojit stopu...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="645"/>
+ <location filename="../gis/CGisWidget.cpp" line="657"/>
<source>Do you want to delete the original track?</source>
<translation>Opravdu chcete smazat původní stopu?</translation>
</message>
@@ -1773,17 +1877,17 @@ line %2, column %3:
<context>
<name>CGpxProject</name>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="90"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="91"/>
<source>Failed to load file %1...</source>
<translation>Nepodařilo se nahrát soubor %1...</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="112"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="113"/>
<source>Failed to open %1</source>
<translation>Nepodařilo se otevřít %1</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="124"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="125"/>
<source>Failed to read: %1
line %2, column %3:
%4</source>
@@ -1792,32 +1896,32 @@ line %2, column %3:
%4</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="132"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="133"/>
<source>Not a GPX file: %1</source>
<translation>Není souborem GPX: %1</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="238"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="258"/>
<source>File exists ...</source>
<translation>Soubor existuje...</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="239"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="259"/>
<source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains GPX data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file. Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
<translation>Soubor existuje a nebyl vytvořen programem QMapShack. Pokud stisknete Ano, budou všechna data v tomto souboru ztracena. I když by tento soubor obsahoval data GPX a byl nahrán programem QMapShack, QMapShack nemusí být schopen nahrát a uložit všechny prvky tohoto souboru. Tyto prvky budou ztraceny. Doporučuje se použít jiný soubor. <b>Opravdu chcete soubor přepsat?</b></translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="347"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="367"/>
<source>Failed to create file '%1'</source>
<translation>Nepodařilo se vytvořit soubor '%1'</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="357"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="377"/>
<source>Failed to write file '%1'</source>
<translation>Nepodařilo se zapsat soubor '%1'</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="362"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="382"/>
<source>Saving GIS data failed...</source>
<translation>Nepodařilo se uložit data GIS...</translation>
</message>
@@ -1891,64 +1995,64 @@ line %2, column %3:
<context>
<name>CKnownExtension</name>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="45"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="62"/>
<source>Air Temperature</source>
<translation>Teplota vzduchu</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="49"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="66"/>
<source>Water Temperature</source>
<translation>Teplota vody</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="53"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="70"/>
<source>Depth</source>
<translation>Hloubka</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="57"/>
- <location filename="../gis/trk/CKnownExtension.cpp" line="69"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="74"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="86"/>
<source>Heart Rate</source>
<translation>Tep srdce</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="61"/>
- <location filename="../gis/trk/CKnownExtension.cpp" line="73"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="78"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="90"/>
<source>Cadence</source>
<translation>Rychlost chůze</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="77"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="94"/>
<source>Speed</source>
<translation>Rychlost</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="81"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="98"/>
<source>Acceleration</source>
<translation>Zrychlení</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="85"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="102"/>
<source>Course</source>
<translation>Směr</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="94"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="111"/>
<source>Slope*</source>
<translation>Sklon*</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="99"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
<source>Speed*</source>
<translation>Rychlost*</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="104"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="121"/>
<source>Elevation</source>
<translation>Výška</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="109"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="126"/>
<source>Progress</source>
<translation>Postup</translation>
</message>
@@ -1964,33 +2068,38 @@ line %2, column %3:
<context>
<name>CMainWindow</name>
<message>
- <location filename="../CMainWindow.cpp" line="643"/>
+ <location filename="../CMainWindow.cpp" line="557"/>
+ <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="685"/>
<source>Ele: %1%2</source>
<translation>Výška: %1%2</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="659"/>
+ <location filename="../CMainWindow.cpp" line="701"/>
<source>[Grid: %1]</source>
<translation>[Mřížka: %1]</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="794"/>
+ <location filename="../CMainWindow.cpp" line="836"/>
<source>Load GIS Data...</source>
<translation>Nahrát data GIS...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="828"/>
+ <location filename="../CMainWindow.cpp" line="870"/>
<source>Select output file</source>
<translation>Vybrat výstupní soubor</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="828"/>
- <location filename="../CMainWindow.cpp" line="854"/>
+ <location filename="../CMainWindow.cpp" line="870"/>
+ <location filename="../CMainWindow.cpp" line="896"/>
<source>QMapShack View (*.view)</source>
<translation>Pohled QMapShack (*.view)</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="854"/>
+ <location filename="../CMainWindow.cpp" line="896"/>
<source>Select file to load</source>
<translation>Vybrat soubor k nahrání</translation>
</message>
@@ -2610,8 +2719,12 @@ Když s QMapShack není bez map žádná zábava, proč s ním nejsou nějaké p
</message>
<message>
<location filename="../map/CMapIMG.cpp" line="730"/>
+ <source>File contains locked / encrypted data. Garmin does not want you to use this file with any other software than the one supplied by Garmin.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>File contains locked / encypted data. Garmin does not want you to use this file with any other software than the one supplied by Garmin.</source>
- <translation>Soubor obsahuje zamknutá/zašifrovaná data. Garmin nechce, aby byl tento soubor použit s jiným programem než dodaným Garminem.</translation>
+ <translation type="vanished">Soubor obsahuje zamknutá/zašifrovaná data. Garmin nechce, aby byl tento soubor použit s jiným programem než dodaným Garminem.</translation>
</message>
<message>
<location filename="../map/CMapIMG.cpp" line="2305"/>
@@ -2913,14 +3026,17 @@ 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="100"/>
+ <location filename="../mouse/CMouseEditArea.cpp" line="96"/>
+ <source>area</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Edit name...</source>
- <translation>Upravit název...</translation>
+ <translation type="vanished">Upravit název...</translation>
</message>
<message>
- <location filename="../mouse/CMouseEditArea.cpp" line="100"/>
<source>Enter new area name.</source>
- <translation>Zadat název nové oblasti.</translation>
+ <translation type="vanished">Zadat název nové oblasti.</translation>
</message>
</context>
<context>
@@ -2937,14 +3053,17 @@ 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="111"/>
+ <location filename="../mouse/CMouseEditRte.cpp" line="107"/>
+ <source>route</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Edit name...</source>
- <translation>Upravit název...</translation>
+ <translation type="vanished">Upravit název...</translation>
</message>
<message>
- <location filename="../mouse/CMouseEditRte.cpp" line="111"/>
<source>Enter new route name.</source>
- <translation>Zadat nový název pro cestu.</translation>
+ <translation type="vanished">Zadat nový název pro cestu.</translation>
</message>
</context>
<context>
@@ -2975,14 +3094,17 @@ 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="116"/>
+ <location filename="../mouse/CMouseEditTrk.cpp" line="112"/>
+ <source>track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Edit name...</source>
- <translation>Upravit název...</translation>
+ <translation type="vanished">Upravit název...</translation>
</message>
<message>
- <location filename="../mouse/CMouseEditTrk.cpp" line="116"/>
<source>Enter new track name.</source>
- <translation>Zadat název nové stopy.</translation>
+ <translation type="vanished">Zadat název nové stopy.</translation>
</message>
</context>
<context>
@@ -4046,6 +4168,24 @@ line %2, column %3:
</message>
</context>
<context>
+ <name>CTableTrk</name>
+ <message>
+ <location filename="../gis/trk/CTableTrk.cpp" line="101"/>
+ <source>Double click to edit elevation value</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CTableTrk.cpp" line="127"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="135"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="138"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="143"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="157"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="159"/>
+ <source>%1 %2</source>
+ <translation type="unfinished">%1 %2</translation>
+ </message>
+</context>
+<context>
<name>CTextEditWidget</name>
<message>
<location filename="../widgets/CTextEditWidget.cpp" line="73"/>
@@ -4096,7 +4236,7 @@ line %2, column %3:
<context>
<name>CWptIconDialog</name>
<message>
- <location filename="../helpers/CWptIconDialog.cpp" line="160"/>
+ <location filename="../helpers/CWptIconDialog.cpp" line="161"/>
<source>Path to user icons...</source>
<translation>Cesta k uživatelským symbolům...</translation>
</message>
@@ -4592,9 +4732,13 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<translation type="vanished">Pro přidání souborů s údaji o výšce použijte Soubor → Nastavit cesty k výškovým modelům. </translation>
</message>
<message>
- <location filename="../dem/IDemList.ui" line="118"/>
<source>To add files with elevation data use <b>File->Setup DEM Paths</b>. </source>
- <translation>Pro přidání souborů s údaji o výšce použijte <b>Soubor → Nastavit cesty k výškovým modelům</b>. </translation>
+ <translation type="vanished">Pro přidání souborů s údaji o výšce použijte <b>Soubor → Nastavit cesty k výškovým modelům</b>. </translation>
+ </message>
+ <message>
+ <location filename="../dem/IDemList.ui" line="118"/>
+ <source>To add files with elevation data use <b>File->Setup DEM Paths</b>. Or click <a href='setup'><b>here</b></a></source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../dem/IDemList.ui" line="131"/>
@@ -4869,9 +5013,8 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<translation>Formulář</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="56"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="77"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="98"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="81"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="105"/>
<source>-
-</source>
<translation>-
@@ -4882,12 +5025,12 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<translation type="obsolete">Ovládání grafu</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1019"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1029"/>
<source>Profile</source>
<translation>Profil</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1460"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1470"/>
<source>Speed</source>
<translation>Rychlost</translation>
</message>
@@ -4900,38 +5043,38 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<translation type="obsolete">Stopa</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="277"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="287"/>
<source>Toggle read only mode. You have to open the lock to edit the item.</source>
<translation>Přepnout režim pouze pro čtení. Musíte otevřít zámek, abyste mohl prvek upravovat.</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="280"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="444"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="473"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="538"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="564"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="593"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="682"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="711"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1040"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1069"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1101"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1137"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1166"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1198"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1234"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1263"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1295"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="290"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="454"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="483"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="548"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="574"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="603"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="692"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="721"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1050"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1079"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1111"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1147"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1176"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1208"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1244"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1273"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1305"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="255"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="265"/>
<source><html><head/><body><p>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </p></body></html></source>
<translation><html><head/><body><p>Cestovní bod byl zaveden do QMapShacku a byl změněn. Už neukazuje původní data. Prohlédněte si, prosím, historii kvůli změnám. </p></body></html></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="377"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="387"/>
<source>Style</source>
<translation>Styl</translation>
</message>
@@ -4940,37 +5083,37 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<translation type="obsolete">z dat</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="419"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="429"/>
<source>Source</source>
<translation>Zdroj</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="624"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="634"/>
<source>Maximum</source>
<translation>Nejvyšší hodnota</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="441"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="451"/>
<source>Use/edit user defined visibility of arrows for this track</source>
<translation>Použít/Upravit uživatelsky stanovenou viditelnost směrových šipek pro tuto stopu</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="470"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="480"/>
<source>Use/edit system's visibility of arrows for all tracks</source>
<translation>Použít/Upravit v systému stanovenou viditelnost směrových šipek pro všechny stopy</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="764"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="774"/>
<source>Minimum</source>
<translation>Nejnižší hodnota</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="679"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="689"/>
<source>Use/edit user defined scale factor for this track</source>
<translation>Použít/Upravit uživatelsky stanovený násobek zvětšení pro tuto stopu</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="708"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="718"/>
<source>Use/edit system's default factor for all tracks</source>
<translation>Použít/Upravit výchozí násobek zvětšení systému pro všechny stopy</translation>
</message>
@@ -4979,22 +5122,22 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<translation type="obsolete">Plná barva </translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="638"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="648"/>
<source>x </source>
<translation>x </translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="426"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="436"/>
<source>Width</source>
<translation>Šířka</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="631"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="641"/>
<source>with arrows</source>
<translation>se směrovými šipkami</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="832"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="842"/>
<source>Graphs</source>
<translation>Grafy</translation>
</message>
@@ -5011,120 +5154,127 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<translation type="obsolete">Graf 1</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1324"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1334"/>
<source>Activity</source>
<translation>Činnost</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1365"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1375"/>
<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="1392"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1402"/>
<source>Points</source>
<translation>Body</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1440"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1450"/>
<source>Time</source>
<translation>Čas</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1445"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1455"/>
<source>Ele.</source>
<translation>Výška</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1450"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1460"/>
<source>Delta</source>
<translation>Rozdíl</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1455"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1465"/>
<source>Dist.</source>
<translation>Vzdál.</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1465"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
<source>Slope</source>
<translation>Sklon</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1470"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
<source>Ascend</source>
<translation>Stoupání</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1485"/>
<source>Descend</source>
<translation>Klesání</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1490"/>
<source>Position</source>
<translation>Poloha</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="345"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="355"/>
<source>Info</source>
<translation>Informace</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="306"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="316"/>
<source>-</source>
<translation>-</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="845"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="865"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="951"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="855"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="875"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="961"/>
<source>max.</source>
<translation>max.</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="984"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="991"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1005"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="994"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1001"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1015"/>
<source>min.</source>
<translation>min.</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="535"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1037"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1134"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1231"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="545"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1047"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1144"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1241"/>
<source>User defined limits for this track</source>
<translation>Uživatelsky stanovené hraniční hodnoty pro tuto stopu</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="561"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1066"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1163"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1260"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="56"/>
+ <source>-
+-
+-</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="571"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1076"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1173"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1270"/>
<source>Automatic limits</source>
<translation>Automatické hraniční hodnoty</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="590"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1098"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1195"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1292"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="600"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1108"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1205"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1302"/>
<source>User defined limits for all tracks</source>
<translation>Uživatelsky stanovené hraniční hodnoty pro všechny stopy</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="784"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="794"/>
<source>Color</source>
<translation>Barva</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1489"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1499"/>
<source>Filter</source>
<translation>Filtr</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1526"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1536"/>
<source>Hist.</source>
<translation>Historie</translation>
</message>
@@ -5341,8 +5491,12 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
</message>
<message>
<location filename="../gis/trk/filter/IFilterInvalid.ui" line="56"/>
+ <source>Hide points with invalid data.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Hide points with invalid coordinates at the beginning of the track.</source>
- <translation>Skrýt body s neplatnými souřadnicemi na začátku stopy.</translation>
+ <translation type="vanished">Skrýt body s neplatnými souřadnicemi na začátku stopy.</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterInvalid.ui" line="63"/>
@@ -5580,81 +5734,91 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<context>
<name>IGisItem</name>
<message>
- <location filename="../gis/IGisItem.cpp" line="42"/>
+ <location filename="../gis/IGisItem.cpp" line="43"/>
<source>[no name]</source>
<translation>[žádný název]</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="314"/>
+ <location filename="../gis/IGisItem.cpp" line="315"/>
<source>The item is not part of the project in the database.</source>
<translation>Prvek není částí projektu v databázi.</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="315"/>
+ <location filename="../gis/IGisItem.cpp" line="316"/>
<source>
It is either a new item or it has been deleted in the database by someone else.</source>
<translation>
Buď je to nový symbol nebo byl v databázi někým smazán.</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="321"/>
+ <location filename="../gis/IGisItem.cpp" line="322"/>
<source>The item is not in the database.</source>
<translation>Prvek není v databázi.</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="327"/>
+ <location filename="../gis/IGisItem.cpp" line="328"/>
<source>The item might need to be saved</source>
<translation>Může být potřeba prvek uložit.</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="411"/>
+ <location filename="../gis/IGisItem.cpp" line="412"/>
<source>Initial version.</source>
<translation>Počáteční verze.</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="519"/>
+ <location filename="../gis/IGisItem.cpp" line="520"/>
<source><h3>%1</h3> This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press 'Ok'.</source>
<translation><h3>%1</h3> Tento prvek je pravděpodobně pouze pro čtení, protože nebyl vytvořen v programu QMapShack. Obvykle nemáte zájem měnit zavedená data. Ale pokud si myslíte, že je to tentokrát na místě, stiskněte OK.</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="520"/>
+ <location filename="../gis/IGisItem.cpp" line="521"/>
<source>Read Only Mode...</source>
<translation>Režim pouze pro čtení...</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="684"/>
- <location filename="../gis/IGisItem.cpp" line="743"/>
+ <location filename="../gis/IGisItem.cpp" line="685"/>
+ <location filename="../gis/IGisItem.cpp" line="744"/>
<source><h4>Description:</h4></source>
<translation><h4>Popis:</h4></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="687"/>
- <location filename="../gis/IGisItem.cpp" line="746"/>
+ <location filename="../gis/IGisItem.cpp" line="688"/>
+ <location filename="../gis/IGisItem.cpp" line="747"/>
<source><p>--- no description ---</p></source>
<translation><p>--- žádný popis ---</p></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="698"/>
+ <location filename="../gis/IGisItem.cpp" line="699"/>
<source><h4>Comment:</h4></source>
<translation><h4>Poznámka:</h4></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="701"/>
+ <location filename="../gis/IGisItem.cpp" line="702"/>
<source><p>--- no comment ---</p></source>
<translation><p>--- žádná poznámka ---</p></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="712"/>
- <location filename="../gis/IGisItem.cpp" line="757"/>
+ <location filename="../gis/IGisItem.cpp" line="713"/>
+ <location filename="../gis/IGisItem.cpp" line="758"/>
<source><h4>Links:</h4></source>
<translation><h4>Odkazy:</h4></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="715"/>
- <location filename="../gis/IGisItem.cpp" line="760"/>
+ <location filename="../gis/IGisItem.cpp" line="716"/>
+ <location filename="../gis/IGisItem.cpp" line="761"/>
<source><p>--- no links ---</p></source>
<translation><p>--- žádné odkazy ---</p></translation>
</message>
+ <message>
+ <location filename="../gis/IGisItem.cpp" line="843"/>
+ <source>Edit name...</source>
+ <translation type="unfinished">Upravit název...</translation>
+ </message>
+ <message>
+ <location filename="../gis/IGisItem.cpp" line="843"/>
+ <source>Enter new %1 name.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>IGisProject</name>
@@ -6254,9 +6418,13 @@ Název souboru: %1</translation>
<translation type="vanished">Pro přidání map použijte Soubor → Nastavit cesty k mapám. </translation>
</message>
<message>
- <location filename="../map/IMapList.ui" line="103"/>
<source>To add maps use <b>File->Setup Map Paths</b>. </source>
- <translation>Pro přidání map použijte <b>Soubor → Nastavit cesty k mapám</b>. </translation>
+ <translation type="vanished">Pro přidání map použijte <b>Soubor → Nastavit cesty k mapám</b>. </translation>
+ </message>
+ <message>
+ <location filename="../map/IMapList.ui" line="103"/>
+ <source>To add maps use <b>File->Setup Map Paths</b>. Or click <a href='setup'><b>here</b></a></source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../map/IMapList.ui" line="116"/>
@@ -6461,57 +6629,57 @@ Nechce se mi číst dokumentaci!</translation>
<translation><b>Nová čára</b><br/>Posuňte ukazovátko myši a použijte levé tlačítko myši k upuštění bodů. Až to bude uděláno, použijte pravé tlačítko myši k zastavení.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="311"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="314"/>
<source><b>Delete Point</b><br/>Move the mouse close to a point and press the left button to delete it.<br/></source>
<translation><b>Smazat bod</b><br/>Přesuňte ukazovátko myši blízko k bodu a stiskněte levé tlačítko myši pro jeho smazání.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="320"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="323"/>
<source><b>Select Range of Points</b><br/>Left click on first point to start selection. Left click second point to complete selection and choose from options. Use the right mouse button to cancel.<br/></source>
<translation><b>Upravit rozsah bodů</b><br/>Klepněte levým tlačítkem myši na první bod pro započetí výběru. Klepněte levým tlačítkem myši na druhý bod pro dokončení výběru a vyberte z voleb. Použijte pravé tlačítko myši pro zrušení.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="329"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
<source><b>Move Point</b><br/>Move the mouse close to a point and press the left button to make it stick to the cursor. Move the mouse to move the point. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
<translation><b>Přesunout bod</b><br/>Přesuňte ukazovátko myši blízko k bodu a stiskněte levé tlačítko myši pro jeho držení v blízkosti ukazovátka. Posuňte myší pro přesunutí bodu. Upustěte bod klepnutím levým tlačítkem myši. Použijte pravé tlačítko myši pro zrušení.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="338"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="341"/>
<source><b>Add Point</b><br/>Move the mouse close to a line segment and press the left button to add a point. The point will stick to the cursor and you can move it. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
<translation><b>Přidat bod</b><br/>Přesuňte ukazovátko myši blízko k čáře a stiskněte levé tlačítko myši pro přidání bodu. Bod přilne k ukazovátku a vy jím budete moci pohnout. Bod upustěte klepnutím levým tlačítkem myši. Použijte pravé tlačítko myši pro zrušení.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="347"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="350"/>
<source><b>No Routing</b><br/>All points will be connected with a straight line.<br/></source>
<translation><b>Žádné stanovení cesty</b><br/>Všechny body budou spojeny přímou čarou.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="353"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="356"/>
<source><b>Auto Routing</b><br/>The current router setup is used to derive a route between points. <b>Note:</b> The selected router must be able to route on-the-fly. Offline routers usually can do, online routers can't.<br/></source>
<translation><b>Automatické stanovení cesty</b><br/>Nynější nastavení směrování je používáno k vytváření cesty mezi body. <b>Poznámka:</b> Vybraný směrovač musí být schopen rychle směrovat (za běhu). Směrovače nepřipojené k internetu toto obvykle dokáží, směrovače připojené k internetu to běžně neumí.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="358"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="361"/>
<source><b>Vector Routing</b><br/>Connect points with a line from a loaded vector map if possible.<br/></source>
<translation><b>Vektorové stanovení cesty</b><br/>Spojuje body čárou z nahrané vektorové mapy, je-li to možné.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="530"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="533"/>
<source><b>%1 Metrics</b></source>
<translation><b>%1 metrika</b></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="533"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="536"/>
<source>Distance:</source>
<translation>Vzdálenost:</translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="535"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="538"/>
<source>Ascend:</source>
<translation>Stoupání:</translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="537"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="540"/>
<source>Descend:</source>
<translation>Klesání:</translation>
</message>
@@ -7257,6 +7425,7 @@ nebo
<location filename="../gis/rte/IScrOptRte.ui" line="106"/>
<location filename="../gis/rte/IScrOptRte.ui" line="120"/>
<location filename="../gis/rte/IScrOptRte.ui" line="134"/>
+ <location filename="../gis/rte/IScrOptRte.ui" line="148"/>
<source>...</source>
<translation>...</translation>
</message>
@@ -7295,7 +7464,12 @@ nebo
<translation>Přesunout body cesty.</translation>
</message>
<message>
- <location filename="../gis/rte/IScrOptRte.ui" line="160"/>
+ <location filename="../gis/rte/IScrOptRte.ui" line="145"/>
+ <source>Convert route to track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/IScrOptRte.ui" line="174"/>
<source>TextLabel</source>
<translation>Textový štítek</translation>
</message>
@@ -7320,9 +7494,9 @@ nebo
<location filename="../mouse/IScrOptSelect.ui" line="176"/>
<location filename="../mouse/IScrOptSelect.ui" line="205"/>
<location filename="../mouse/IScrOptSelect.ui" line="265"/>
- <location filename="../mouse/IScrOptSelect.ui" line="291"/>
- <location filename="../mouse/IScrOptSelect.ui" line="317"/>
- <location filename="../mouse/IScrOptSelect.ui" line="343"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="292"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="319"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="346"/>
<source>...</source>
<translation>...</translation>
</message>
@@ -7357,17 +7531,17 @@ nebo
<translation>Přidat stopy do výběru.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="288"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="289"/>
<source>Add waypoints to selection.</source>
<translation>Přidat cestovní body do výběru.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="314"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="316"/>
<source>Add routes to selection.</source>
<translation>Přidat cesty do výběru.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="340"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="343"/>
<source>Add areas to selection.</source>
<translation>Přidat oblasti do výběru.</translation>
</message>
@@ -8250,8 +8424,12 @@ nebo
</message>
<message>
<location filename="../helpers/IWptIconDialog.ui" line="95"/>
+ <source>All custom icons have to be *.bmp or *.png format.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>All custom icons have to be *.bmp format.</source>
- <translation>Všechny vlastní symboly musí být ve formátu *.bmp.</translation>
+ <translation type="vanished">Všechny vlastní symboly musí být ve formátu *.bmp.</translation>
</message>
</context>
<context>
diff --git a/src/locale/qmapshack_de.ts b/src/locale/qmapshack_de.ts
index abd896a..6018b2d 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.1" language="de_DE">
+<TS version="2.0" language="de_DE">
<context>
<name>CAbout</name>
<message>
@@ -174,15 +174,18 @@
<context>
<name>CCreateRouteFromWpt</name>
<message>
- <location filename="../gis/rte/CCreateRouteFromWpt.cpp" line="65"/>
<source>Edit name...</source>
<translation>Name bearbeiten...</translation>
</message>
<message>
- <location filename="../gis/rte/CCreateRouteFromWpt.cpp" line="65"/>
<source>Enter new route name.</source>
<translation>Geben Sie einen neuen Namen für die Route ein.</translation>
</message>
+ <message>
+ <location filename="../gis/rte/CCreateRouteFromWpt.cpp" line="68"/>
+ <source>route</source>
+ <translation>Route</translation>
+ </message>
</context>
<context>
<name>CDBFolderLostFound</name>
@@ -241,7 +244,7 @@
<message>
<location filename="../gis/db/CDBFolderSqlite.cpp" line="46"/>
<source>SQLite Database</source>
- <translation>SQLite Databank</translation>
+ <translation>SQLite Datenbank</translation>
</message>
<message>
<location filename="../gis/db/CDBFolderSqlite.cpp" line="56"/>
@@ -323,7 +326,7 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<source>There was an unexpected database error:
%1</source>
- <translation>Da war ein unerwarterter Datenbankfehler:
+ <translation>Da war ein unerwarteter Datenbankfehler:
%1</translation>
</message>
@@ -419,7 +422,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="270"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="738"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="791"/>
<source>none</source>
<translation>keine</translation>
</message>
@@ -441,18 +444,18 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="453"/>
<location filename="../gis/prj/CDetailsPrj.cpp" line="479"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="583"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="673"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="703"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="608"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="726"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="756"/>
<source>Info</source>
<translation>Information</translation>
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="454"/>
<location filename="../gis/prj/CDetailsPrj.cpp" line="480"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="584"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="674"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="704"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="609"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="727"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="757"/>
<source>Comment</source>
<translation>Kommentar</translation>
</message>
@@ -462,7 +465,37 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<translation><h2>Tracks</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="666"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+ <source>From Start</source>
+ <translation>Vom Anfang</translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+ <source>To Next</source>
+ <translation>Zum Nächsten</translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+ <source>To End</source>
+ <translation>Zum Ende</translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="630"/>
+ <source>distance: </source>
+ <translation>Entfernung:</translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="640"/>
+ <source>ascent: </source>
+ <translation>Anstieg:</translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="650"/>
+ <source>descend: </source>
+ <translation>Abstieg:</translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="719"/>
<source><h2>Areas</h2></source>
<translation><h2>Gebiete</h2></translation>
</message>
@@ -477,49 +510,46 @@ 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="602"/>
<source>distance: %1%2</source>
<translation>Entfernung: %1 %2</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="604"/>
<source>ascent: %1%2</source>
<translation>Anstieg: %1 %2</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="606"/>
<source>descend: %1%2</source>
<translation>Abstieg: %1 %2</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="696"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="749"/>
<source><h2>Routes</h2></source>
<translation><h2>Routen</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="724"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="777"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="804"/>
<source>Edit name...</source>
<translation>Name bearbeiten...</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="724"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="777"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="804"/>
<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="882"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="935"/>
<source>Print Diary</source>
<translation>Tagebuch drucken</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="733"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="786"/>
<source>Edit keywords...</source>
<translation>Stichwörter bearbeiten...</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="733"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="786"/>
<source>Enter keywords.</source>
<translation>Stichwörter eingeben.</translation>
</message>
@@ -552,37 +582,27 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<translation>Track in Stücke teilen</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="410"/>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="418"/>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="421"/>
<location filename="../gis/trk/CDetailsTrk.cpp" line="426"/>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="440"/>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="442"/>
- <source>%1 %2</source>
- <translation></translation>
- </message>
- <message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="507"/>
<source>Color</source>
<translation>Farbe</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="508"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="427"/>
<source>Activity</source>
<translation>Aktivität</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="741"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="651"/>
<source>Reset activities...</source>
<translation>Aktivitäten zurücksetzen...</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="741"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="651"/>
<source>This will remove all activities from the track. Proceed?</source>
<translation>Dies wird alle Aktivitäten vom Track entfernen. Fortfahren?</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="747"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="657"/>
<source>None</source>
<translation>Keine</translation>
</message>
@@ -603,7 +623,7 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<translation>Bild %1</translation>
</message>
<message>
- <location filename="../gis/gpx/serialization.cpp" line="1038"/>
+ <location filename="../gis/gpx/serialization.cpp" line="1040"/>
<source>Unknown</source>
<translation>Unbekannt</translation>
</message>
@@ -624,7 +644,7 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<context>
<name>CElevationDialog</name>
<message>
- <location filename="../helpers/CElevationDialog.cpp" line="83"/>
+ <location filename="../helpers/CElevationDialog.cpp" line="92"/>
<source>No DEM data found for that point.</source>
<translation>Keine DEM Daten für diesen Punkt gefunden.</translation>
</message>
@@ -650,7 +670,7 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<message>
<location filename="../gis/fit/decoder/CFitDecoder.cpp" line="116"/>
<source>FIT decoding error: unexpected end of file %1.</source>
- <translation>FIT Dekodierfehler: unerwartetes Ende der Datei %1.</translation>
+ <translation>FIT Dekodierfehler: Unerwartetes Ende der Datei %1.</translation>
</message>
</context>
<context>
@@ -658,7 +678,7 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<message>
<location filename="../gis/fit/decoder/CFitFieldBuilder.cpp" line="70"/>
<source>FIT decoding error: unknown base type %1.</source>
- <translation>FIT Dekodierfehler: unbekannter Datentyp %1.</translation>
+ <translation>FIT Dekodierfehler: Unbekannter Datentyp %1.</translation>
</message>
</context>
<context>
@@ -677,13 +697,12 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<context>
<name>CFitProject</name>
<message>
- <location filename="../gis/fit/CFitProject.cpp" line="44"/>
- <location filename="../gis/fit/CFitProject.cpp" line="62"/>
+ <location filename="../gis/fit/CFitProject.cpp" line="61"/>
<source>Failed to load file %1...</source>
<translation>Datei %1 konnte nicht geladen werden...</translation>
</message>
<message>
- <location filename="../gis/fit/CFitProject.cpp" line="86"/>
+ <location filename="../gis/fit/CFitProject.cpp" line="91"/>
<source>Failed to open FIT file %1.</source>
<translation>Öffnen der FIT Datei %1 fehlgeschlagen.</translation>
</message>
@@ -775,7 +794,7 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<message>
<location filename="../gis/ovl/CGisItemOvlArea.cpp" line="473"/>
<source>Changed opacity.</source>
- <translation>Durchsichtigkeit geändert.</translation>
+ <translation>Deckkraft geändert.</translation>
</message>
<message>
<location filename="../gis/ovl/CGisItemOvlArea.cpp" line="479"/>
@@ -801,76 +820,86 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<context>
<name>CGisItemRte</name>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="63"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="65"/>
<source>_Clone</source>
<translation>_Klon</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="249"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="284"/>
+ <source>track</source>
+ <translation>Track</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="311"/>
<source>Changed name.</source>
<translation>Name geändert.</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="255"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="317"/>
<source>Changed comment</source>
<translation>Kommentar geändert</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="261"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="323"/>
<source>Changed description</source>
<translation>Beschreibung geändert</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="267"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="329"/>
<source>Changed links</source>
<translation>Geänderte Verknüpfungen</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="285"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="347"/>
<source>Length: %1 %2</source>
<translation>Länge: %1 %2</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="289"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
<source>Length: -</source>
<translation>Länge: -</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="296"/>
- <location filename="../gis/rte/CGisItemRte.cpp" line="485"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="559"/>
<source>Time: %1 %2</source>
<translation>Gesamtzeit: %1 %2</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="300"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
<source>Time: -</source>
<translation>Gesamtzeit: -</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="306"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="372"/>
+ <source>%1%2 %3, %4%5 %6</source>
+ <translation>%1%2 %3, %4%5 %6</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="378"/>
<source>Last time routed:<br/>%1</source>
<translation>Letzte Routenberechnung: <br/>%1</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="308"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="380"/>
<source>with %1</source>
<translation>mit %1</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="487"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="561"/>
<source>Distance: %1 %2</source>
<translation>Entfernung: %1 %2</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="601"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="675"/>
<source>Changed route points.</source>
- <translation>Geänderte Routenpukte.</translation>
+ <translation>Geänderte Routenpunkte.</translation>
</message>
</context>
<context>
<name>CGisItemTrk</name>
<message>
- <location filename="../gis/fit/serialization.cpp" line="182"/>
+ <location filename="../gis/fit/serialization.cpp" line="247"/>
<source>FIT file %1 contains no GPS data.</source>
<translation>FIT Dekodierfehler: Datei enthält keine GPS Daten.</translation>
</message>
@@ -911,229 +940,255 @@ 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="401"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="394"/>
<source>Length: %1 %2</source>
<translation>Länge: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="408"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="401"/>
<source>, %1%2 %3, %4%5 %6</source>
<translation></translation>
</message>
<message>
- <source>Time: %1</source>
- <translation type="obsolete">Gesamtzeit: %1</translation>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="405"/>
+ <source>, %1-, %2-</source>
+ <translation></translation>
</message>
<message>
- <source>, Speed: %1 %2</source>
- <translation type="obsolete">, Geschw.: %1 %2</translation>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="417"/>
+ <source>Time: -, Speed: -</source>
+ <translation>Zeit: -, Geschwindigkeit: -</translation>
</message>
<message>
- <source>Moving: %1</source>
- <translation type="obsolete">Zeit in Bew.: %1</translation>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="429"/>
+ <source>Moving: -, Speed: -</source>
+ <translation>Zeit in Bew.: -, Geschw. -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="428"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="435"/>
<source>Start: %1</source>
<translation>Beginn: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="432"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="439"/>
+ <source>Start: -</source>
+ <translation>Beginn: -</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="445"/>
<source>End: %1</source>
<translation>Ende: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="435"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="449"/>
+ <source>End: -</source>
+ <translation>Ende: -</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="453"/>
<source>Points: %1 (%2)</source>
<translation>Punkte: %1 von %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="527"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="457"/>
+ <source>Invalid elevations!</source>
+ <translation>Ungültige Höhenwerte!</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="462"/>
+ <source>Invalid timestamps!</source>
+ <translation>Ungültige Zeitmarken!</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="467"/>
+ <source>Invalid positions!</source>
+ <translation>Ungültige Positionsdaten!</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="558"/>
+ <source>Index: %1</source>
+ <translation>Index: %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="562"/>
+ <source>Index: visible %1, total %2</source>
+ <translation>Index: angez. %1, total %2</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="573"/>
<source>Ele.: %1 %2</source>
<translation>Höhe: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="530"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
<source> slope: %1%3 (%2%)</source>
<translation>, Neigung: %1%3 (%2%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="535"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
<source> speed: %1%2</source>
<translation>, Geschw.: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="563"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
<source>... and %1 tags not displayed</source>
<translation>... und %1 Tags werden nicht angezeigt</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="574"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
<source>Descend: - (-)</source>
<translation>Abstieg: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="575"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
<source>Distance: - (-)</source>
<translation>Entfernung: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="622"/>
<source>Moving: - (-)</source>
<translation>Zeit in Bew.: - (-) </translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="627"/>
<source>Ascend: %1%2 (%3%)</source>
<translation>Anstieg: %1 %2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1441"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1317"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1330"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1390"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1434"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1599"/>
+ <source>track</source>
+ <translation>Track</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1535"/>
<source>Hide point %1.</source>
<translation>Punkt %1 verbergen.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1445"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1539"/>
<source>Hide points %1..%2.</source>
- <translation>Punket %1 %2 verbergen.</translation>
+ <translation>Punkte %1 %2 verbergen.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="573"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="619"/>
<source>Ascend: - (-)</source>
<translation>Anstieg: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="587"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="633"/>
<source> Descend: %1%2 (%3%)</source>
<translation>, Abstieg: %1 %2 (%3%)</translation>
</message>
<message>
- <source> Descend: - (-) </source>
- <translation type="obsolete">, Abstieg: - (-) </translation>
- </message>
- <message>
- <source>Dist.: %1%2 (%3%)</source>
- <translation type="obsolete">Entf.: %1 %2 (%3%)</translation>
- </message>
- <message>
- <source>Dist.: - (-)</source>
- <translation type="obsolete">Entf.: - (-)</translation>
- </message>
- <message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="599"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="645"/>
<source> Moving: %1%2 (%3%)</source>
<translation>, Zeit in Bew.: %1 %2 (%3%)</translation>
</message>
<message>
- <source> Moving: - (-) </source>
- <translation type="obsolete">, Zeit in Bew.: - (-) </translation>
- </message>
- <message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="667"/>
<source>Ascend: %1%2</source>
<translation>Anstieg: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="672"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="684"/>
<source>, %1%2</source>
<translation>, %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="615"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="661"/>
<source>Ascend: -</source>
<translation>Anstieg: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="633"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="679"/>
<source> Descend: %1%2</source>
<translation> Abstieg: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="616"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="662"/>
<source>Descend: -</source>
<translation>Abstieg: -</translation>
</message>
<message>
- <source>Dist.: %1%2</source>
- <translation type="obsolete">Entf.: %1 %2</translation>
- </message>
- <message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="694"/>
<source> Time: %1%2</source>
<translation> Zeit: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
<source>Edit name...</source>
<translation>Name bearbeiten...</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
<source>Enter new track name.</source>
<translation>Geben Sie einen neuen Namen für den Track ein.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="416"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="413"/>
<source>Time: %1, Speed: %2 %3</source>
<translation>Zeit: %1, Geschwindigkeit: %2 %3</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="423"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="425"/>
<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="593"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="639"/>
<source>Distance: %1%2 (%3%)</source>
<translation>Entf.: %1 %2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="643"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
<source>Distance: %1%2</source>
<translation>Entfernung: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1286"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1380"/>
<source>Permanently removed points %1..%2</source>
<translation>Punkte %1..%2 dauerhaft entfernt</translation>
</message>
<message>
- <source>Hide points.</source>
- <translation type="obsolete">Punkte verbergen.</translation>
- </message>
- <message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1485"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1579"/>
<source>Show points.</source>
<translation>Punkte anzeigen.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2040"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2142"/>
<source>Changed name</source>
<translation>Name geändert</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2046"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2148"/>
<source>Changed comment</source>
<translation>Kommentar geändert</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2052"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2154"/>
<source>Changed description</source>
<translation>Beschreibung geändert</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2058"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2160"/>
<source>Changed links</source>
<translation>Geänderte Verknüpfungen</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2085"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2171"/>
+ <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="2198"/>
<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="2143"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2256"/>
<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>
@@ -1143,62 +1198,66 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<translation>Punkte ausblenden mit dem Douglas-Peuker Algorithmus (%1 %2)</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="143"/>
<source>Hide points with invalid coordinates at the beginning of the track</source>
<translation>Punkte mit ungültigen Koordinaten wurden ausgeblendet.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="159"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="141"/>
+ <source>Hide points with invalid data.</source>
+ <translation>Punkte mit ungültigen Daten ausblenden.</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/filter/filter.cpp" line="157"/>
<source>Reset all hidden track points to visible</source>
<translation>Alle verborgenen Trackpunkte zurücksetzen</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="193"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="191"/>
<source>Permanently removed all hidden track points</source>
<translation>Alle verborgenen Trackpunkte wurden dauerhaft entfernt</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="243"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="241"/>
<source>Smoothed profile with a Median filter of size %1</source>
<translation>Mit einem Median-Filter der Größe %1 geglättetes Profil</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="279"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="277"/>
<source>Replaced elevation data with data from DEM files.</source>
<translation>Höhendaten durch Daten von DEM Dateien ersetzt.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="302"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="300"/>
<source>Offset elevation data by %1%2.</source>
<translation>Versatz der Höhendaten um %1 %2.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="321"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="319"/>
<source>Changed start of track to %1.</source>
<translation>Trackanfang auf %1 verschoben.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="340"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="338"/>
<source>Remove timestamps.</source>
<translation>Zeitstempel entfernt.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="363"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="361"/>
<source>Set artificial timestamps with delta of %1 sec.</source>
<translation>Künstliche Zeitstempel mit einem Abstand von %1 Sek. gesetzt.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="396"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="393"/>
<source>Changed speed to %1%2.</source>
<translation>Geschwindigkeit auf %1 %2 geändert.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="415"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="412"/>
<source>%1 (Segment %2)</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="438"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="435"/>
<source>Removed extension %1 from all Track Points</source>
<translation>Erweiterung %1 wurde von allen Trackpunkten entfernt</translation>
</message>
@@ -1211,17 +1270,17 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<context>
<name>CGisItemWpt</name>
<message>
- <location filename="../gis/gpx/serialization.cpp" line="588"/>
+ <location filename="../gis/gpx/serialization.cpp" line="590"/>
<source>Archived</source>
<translation>Archiviert</translation>
</message>
<message>
- <location filename="../gis/gpx/serialization.cpp" line="592"/>
+ <location filename="../gis/gpx/serialization.cpp" line="594"/>
<source>Available</source>
<translation>Verfügbar</translation>
</message>
<message>
- <location filename="../gis/gpx/serialization.cpp" line="596"/>
+ <location filename="../gis/gpx/serialization.cpp" line="598"/>
<source>Not Available</source>
<translation>Nicht verfügbar</translation>
</message>
@@ -1454,37 +1513,38 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<translation>Route bearbeiten</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="181"/>
+ <location filename="../gis/CGisListWks.cpp" line="166"/>
+ <source>Convert to Track</source>
+ <translation>In einen Track umwandeln</translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="182"/>
<source>Create Route</source>
<translation>Route erstellen</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="625"/>
+ <location filename="../gis/CGisListWks.cpp" line="626"/>
<source>Drop items...</source>
<translation>Elemente verwerfen...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="650"/>
- <location filename="../gis/CGisListWks.cpp" line="1581"/>
- <location filename="../gis/CGisListWks.cpp" line="1619"/>
+ <location filename="../gis/CGisListWks.cpp" line="651"/>
+ <location filename="../gis/CGisListWks.cpp" line="1593"/>
+ <location filename="../gis/CGisListWks.cpp" line="1631"/>
<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="1165"/>
+ <location filename="../gis/CGisListWks.cpp" line="1166"/>
<source>Delete project...</source>
<translation>Projekt löschen...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1165"/>
+ <location filename="../gis/CGisListWks.cpp" line="1166"/>
<source>Do you really want to delete %1?</source>
<translation>Sind Sie sicher, dass sie %1 löschen wollen?</translation>
</message>
<message>
- <source>Copy items...</source>
- <translation type="obsolete">Elemente kopieren...</translation>
- </message>
- <message>
<location filename="../gis/CGisListWks.cpp" line="153"/>
<source>Proj. Waypoint...</source>
<translation>Wegpunkt Projektion...</translation>
@@ -1520,7 +1580,7 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<translation>Tracks verbinden</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="174"/>
+ <location filename="../gis/CGisListWks.cpp" line="175"/>
<source>Edit Area Points</source>
<translation>Gebietspunkte bearbeiten</translation>
</message>
@@ -1546,22 +1606,22 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<translation>Mit der Datenbank synchronisieren</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="779"/>
+ <location filename="../gis/CGisListWks.cpp" line="780"/>
<source>Saving workspace. Please wait.</source>
<translation>Arbeitsplatz wird gespeichert. Bitte warten.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="825"/>
+ <location filename="../gis/CGisListWks.cpp" line="826"/>
<source>Loading workspace. Please wait.</source>
<translation>Arbeitsplatz laden. Bitte warten.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1142"/>
+ <location filename="../gis/CGisListWks.cpp" line="1143"/>
<source>Close all projects...</source>
<translation>Alle Projekte schließen...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1142"/>
+ <location filename="../gis/CGisListWks.cpp" line="1143"/>
<source>This will remove all projects from the workspace.</source>
<translation>Dies wird alle Projekte aus dem Arbeitsplatz entfernen.</translation>
</message>
@@ -1584,73 +1644,30 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<translation>Elemente kopieren...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="645"/>
+ <location filename="../gis/CGisWidget.cpp" line="657"/>
<source>Cut Track...</source>
<translation>Track teilen...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="645"/>
+ <location filename="../gis/CGisWidget.cpp" line="657"/>
<source>Do you want to delete the original track?</source>
<translation>Wollen Sie den ursprünglichen Track löschen?</translation>
</message>
</context>
<context>
- <name>CGpsProject</name>
- <message>
- <source>Failed to load file %1...</source>
- <translation type="obsolete">Datei %1 konnte nicht geladen werden...</translation>
- </message>
- <message>
- <source>Failed to open %1</source>
- <translation type="obsolete">Öffnen von %1 fehlgeschlagen</translation>
- </message>
- <message>
- <source>Failed to read: %1
-line %2, column %3:
- %4</source>
- <translation type="obsolete">Lesen von %1 fehlgeschlagen:
-Zeile %2, Spalte %3:
-%4</translation>
- </message>
- <message>
- <source>Not a GPX file: %1</source>
- <translation type="obsolete">Keine GPX Datei: %1</translation>
- </message>
- <message>
- <source>File exists ...</source>
- <translation type="obsolete">Datei existiert...</translation>
- </message>
- <message>
- <source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains GPX data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file. Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
- <translation type="obsolete">Diese Datei wurde nicht mit QMapShack erstellt. Wenn Sie 'Ja' drücken werden alle Daten dieser Datei gelöscht. Selbst wenn diese Datei GPX Daten enthält und mit QMapShack geladen wurde, können nicht alle Elemente dieser Datei durch QMapShack geladen und gespeichert werden. Diese Elemente sind verloren. Ich empfehle die Nutzung einer anderen Datei. <b>Wollen Sie die Datei wirklich überschreiben?</b></translation>
- </message>
- <message>
- <source>Failed to create file '%1'</source>
- <translation type="obsolete">Datei %1' konnte nicht erstellt werden</translation>
- </message>
- <message>
- <source>Failed to write file '%1'</source>
- <translation type="obsolete">Datei %1' konnte nicht gespeichert werden</translation>
- </message>
- <message>
- <source>Saving GIS data failed...</source>
- <translation type="obsolete">Das Speichern der GIS Daten ist fehlgeschlagen...</translation>
- </message>
-</context>
-<context>
<name>CGpxProject</name>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="90"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="91"/>
<source>Failed to load file %1...</source>
<translation>Datei %1 konnte nicht geladen werden...</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="112"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="113"/>
<source>Failed to open %1</source>
<translation>Die Datei %1 konnte nicht geöffnet werden</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="124"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="125"/>
<source>Failed to read: %1
line %2, column %3:
%4</source>
@@ -1659,32 +1676,32 @@ Zeile %2, Spalte %3:
-%4</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="132"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="133"/>
<source>Not a GPX file: %1</source>
<translation>Keine GPX Datei: %1</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="238"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="258"/>
<source>File exists ...</source>
<translation>Datei existiert...</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="239"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="259"/>
<source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains GPX data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file. Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
<translation>Diese Datei wurde nicht mit QMapShack erstellt. Wenn Sie 'Ja' drücken werden alle Daten dieser Datei gelöscht. Selbst wenn diese Datei GPX Daten enthält und mit QMapShack geladen wurde, können nicht alle Elemente dieser Datei durch QMapShack geladen und gespeichert werden. Diese Elemente sind verloren. Ich empfehle die Nutzung einer anderen Datei. <b>Wollen Sie die Datei wirklich überschreiben?</b></translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="347"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="367"/>
<source>Failed to create file '%1'</source>
<translation>Datei '%1' konnte nicht erstellt werden</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="357"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="377"/>
<source>Failed to write file '%1'</source>
<translation>Datei '%1' konnte nicht geschrieben werden</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="362"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="382"/>
<source>Saving GIS data failed...</source>
<translation>Das Speichern der GIS Daten ist fehlgeschlagen...</translation>
</message>
@@ -1746,64 +1763,64 @@ Zeile %2, Spalte %3:
<context>
<name>CKnownExtension</name>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="45"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="62"/>
<source>Air Temperature</source>
<translation>Lufttemperatur</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="49"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="66"/>
<source>Water Temperature</source>
<translation>Wassertemperatur</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="53"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="70"/>
<source>Depth</source>
<translation>Tiefe</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="57"/>
- <location filename="../gis/trk/CKnownExtension.cpp" line="69"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="74"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="86"/>
<source>Heart Rate</source>
<translation>Pulsrate</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="61"/>
- <location filename="../gis/trk/CKnownExtension.cpp" line="73"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="78"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="90"/>
<source>Cadence</source>
<translation>Trittfrequenz</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="77"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="94"/>
<source>Speed</source>
<translation>Geschwindigkeit</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="81"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="98"/>
<source>Acceleration</source>
<translation>Beschleunigung</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="85"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="102"/>
<source>Course</source>
<translation>Kurs</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="94"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="111"/>
<source>Slope*</source>
<translation>Neigung*</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="99"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
<source>Speed*</source>
<translation>Geschwindigkeit*</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="104"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="121"/>
<source>Elevation</source>
<translation>Höhe</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="109"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="126"/>
<source>Progress</source>
<translation>Verlauf</translation>
</message>
@@ -1819,33 +1836,46 @@ Zeile %2, Spalte %3:
<context>
<name>CMainWindow</name>
<message>
- <location filename="../CMainWindow.cpp" line="643"/>
+ <source>Use <b>View->Add Map View</b> to open a new view. Or <b>File->Load Map View</b> to restore a saved one.</source>
+ <translation type="obsolete">Benützen Sie <b>Ansicht->Kartenansicht hinzufügen</b>, um eine neue Ansicht zu öffnen. Oder <b>Datei->Kartenansicht laden</b>, um eine gespeicherte wieder herzustellen.</translation>
+ </message>
+ <message>
+ <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.</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.</translation>
+ </message>
+ <message>
+ <location filename="../CMainWindow.cpp" line="557"/>
+ <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="685"/>
<source>Ele: %1%2</source>
<translation>Höhe: %1%2</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="659"/>
+ <location filename="../CMainWindow.cpp" line="701"/>
<source>[Grid: %1]</source>
<translation>[Gitter: %1]</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="794"/>
+ <location filename="../CMainWindow.cpp" line="836"/>
<source>Load GIS Data...</source>
<translation>GIS Daten laden...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="828"/>
+ <location filename="../CMainWindow.cpp" line="870"/>
<source>Select output file</source>
<translation>Ausgabedatei auswählen</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="828"/>
- <location filename="../CMainWindow.cpp" line="854"/>
+ <location filename="../CMainWindow.cpp" line="870"/>
+ <location filename="../CMainWindow.cpp" line="896"/>
<source>QMapShack View (*.view)</source>
<translation>QMapShack Ansicht (*.view)</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="854"/>
+ <location filename="../CMainWindow.cpp" line="896"/>
<source>Select file to load</source>
<translation>Zu ladende Datei auswählen</translation>
</message>
@@ -1853,17 +1883,13 @@ Zeile %2, Spalte %3:
<context>
<name>CMapDraw</name>
<message>
- <source>There are no maps right now. QMapShack is no fun without maps. You can install maps by pressing the 'Help! I want maps!' button in the 'Maps' dock window. Or you can press the F1 key to open the online documentation that tells you how to use QMapShack. </source>
- <translation type="vanished">Im Augenblick gibt es keine Karten. QMapShack macht ohne Karten überhaupt keinen Spaß. Sie können Online-Karten installieren, indem Sie den 'Hilfe! Ich will Karten!' Knopf im Fenster 'Karten' drücken. Oder drücken Sie F1 um zur Online-Hilfe zu gelangen. Erfahren Sie dort mehr über die Bedienung von QMapShack.</translation>
- </message>
- <message>
<location filename="../map/CMapDraw.cpp" line="406"/>
<source>There are no maps right now. QMapShack is no fun without maps. You can install maps by pressing the 'Help! I want maps!' button in the 'Maps' dock window. Or you can press the F1 key to open the online documentation that tells you how to use QMapShack.
If it's no fun, why don't you provide maps? Well to host maps ready for download and installation requires a good server. And this is not a free service. The project lacks the money. Additionally map and DEM data has a copyright. Therefore the copyright holder has to be asked prior to package the data. This is not that easy as it might sound and for some data you have to pay royalties. The project simply lacks resources to do this. And we think installing the stuff yourself is [...]
<translation>Im Augenblick gibt es keine Karten. QMapShack macht ohne Karten überhaupt keinen Spaß. Sie können Online-Karten installieren, indem Sie den 'Hilfe! Ich will Karten!' Knopf im Fenster 'Karten' drücken. Oder drücken Sie F1 um zur Online-Hilfe zu gelangen. Erfahren Sie dort mehr über die Bedienung von QMapShack.
-Wenn QMapShack ohne Karten keinen Spaß macht, warum werden dann keine mitgeliefert? Nun, um Karten fertig zur Installation zum Download anbieten zu können, benötigt man einen guten Server. Und der kostet. Dem Projekt fehlt hierzu das Geld. Zusätzlich unterliegen Karten- und DEM Daten dem Urheberrecht. Deswegen muss man den Urheber vorher fragen, ob man die Daten in ein Paket umwandeln und anbieten darf. Klingt einfacher als es oft ist. Und manchmal müsste man sogar Gebühren zahlen. Dem P [...]
+Wenn QMapShack ohne Karten keinen Spaß macht, warum werden dann keine mitgeliefert? Nun, um Karten fertig zur Installation zum Download anbieten zu können, benötigt man einen guten Server. Und der kostet. Dem Projekt fehlt hierzu das Geld. Zusätzlich unterliegen Karten- und DEM Daten dem Urheberrecht. Deswegen muss man den Urheber vorher fragen, ob man die Daten in ein Paket umwandeln und anbieten darf. Klingt einfacher als es oft ist. Und manchmal müsste man sogar Gebühren zahlen. Dem P [...]
</message>
</context>
<context>
@@ -1926,7 +1952,7 @@ Wenn QMapShack ohne Karten keinen Spaß macht, warum werden dann keine mitgelief
<message>
<location filename="../map/CMapIMG.cpp" line="166"/>
<source>Catalan</source>
- <translation>Catalanisch</translation>
+ <translation>Katalanisch</translation>
</message>
<message>
<location filename="../map/CMapIMG.cpp" line="167"/>
@@ -1961,7 +1987,7 @@ Wenn QMapShack ohne Karten keinen Spaß macht, warum werden dann keine mitgelief
<message>
<location filename="../map/CMapIMG.cpp" line="173"/>
<source>Slovak</source>
- <translation>Slovakisch</translation>
+ <translation>Slowakisch</translation>
</message>
<message>
<location filename="../map/CMapIMG.cpp" line="174"/>
@@ -2470,8 +2496,12 @@ Wenn QMapShack ohne Karten keinen Spaß macht, warum werden dann keine mitgelief
</message>
<message>
<location filename="../map/CMapIMG.cpp" line="730"/>
+ <source>File contains locked / encrypted data. Garmin does not want you to use this file with any other software than the one supplied by Garmin.</source>
+ <translation>Die Datei enthält verschlüsselte Daten. Garmin möchte nicht, dass diese Datei mit einer anderen Software, als der von Garmin bereitgestellten, benutzt wird.</translation>
+ </message>
+ <message>
<source>File contains locked / encypted data. Garmin does not want you to use this file with any other software than the one supplied by Garmin.</source>
- <translation>Die Datei enthält verschlüsselte Daten. Garmin möchte nicht dass diese Datei mit einer anderen Software, als der von Garmin bereitgestellten, benutzt wird.</translation>
+ <translation>Die Datei enthält verschlüsselte Daten. Garmin möchte nicht, dass diese Datei mit einer anderen Software, als der von Garmin bereitgestellten, benutzt wird.</translation>
</message>
<message>
<location filename="../map/CMapIMG.cpp" line="2305"/>
@@ -2648,7 +2678,7 @@ Zeile %2, Spalte %3:
<message>
<location filename="../map/CMapVRT.cpp" line="88"/>
<source>File must be 8 bit palette or gray indexed.</source>
- <translation>Die Datei muss eine 8 bit Palette haben, oder Graustufen.</translation>
+ <translation>Die Datei muss eine 8 bit Palette oder Graustufen haben.</translation>
</message>
<message>
<location filename="../map/CMapVRT.cpp" line="126"/>
@@ -2745,15 +2775,18 @@ Unbekannte Struktur.</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>Gebiet bearbeiten</b><br/>Wählen Sie mittels der Werkzeug-Buttons eine Funkion 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>
+ <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"/>
+ <source>area</source>
+ <translation>Gebiet</translation>
</message>
<message>
- <location filename="../mouse/CMouseEditArea.cpp" line="100"/>
<source>Edit name...</source>
<translation>Name bearbeiten...</translation>
</message>
<message>
- <location filename="../mouse/CMouseEditArea.cpp" line="100"/>
<source>Enter new area name.</source>
<translation>Geben Sie einen neuen Namen für das Gebiet ein.</translation>
</message>
@@ -2769,15 +2802,18 @@ Unbekannte Struktur.</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>Routenpunkte bearbeiten</b><br/>Wählen Sie mittels der Werkzeug-Buttons eine Funkion 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>
+ <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"/>
+ <source>route</source>
+ <translation>Route</translation>
</message>
<message>
- <location filename="../mouse/CMouseEditRte.cpp" line="111"/>
<source>Edit name...</source>
<translation>Name bearbeiten...</translation>
</message>
<message>
- <location filename="../mouse/CMouseEditRte.cpp" line="111"/>
<source>Enter new route name.</source>
<translation>Geben Sie einen neuen Namen für die Route ein.</translation>
</message>
@@ -2793,7 +2829,7 @@ Unbekannte Struktur.</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>Trackpunkte bearbeiten</b><br/>Wählen Sie mittels der Werkzeug-Buttons eine Funkion 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>
+ <translation><b>Trackpunkte 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/CMouseEditTrk.cpp" line="80"/>
@@ -2806,12 +2842,15 @@ 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="116"/>
+ <location filename="../mouse/CMouseEditTrk.cpp" line="112"/>
+ <source>track</source>
+ <translation>Track</translation>
+ </message>
+ <message>
<source>Edit name...</source>
<translation>Name bearbeiten...</translation>
</message>
<message>
- <location filename="../mouse/CMouseEditTrk.cpp" line="116"/>
<source>Enter new track name.</source>
<translation>Geben Sie einen neuen Namen für den Track ein.</translation>
</message>
@@ -2857,10 +2896,6 @@ Unbekannte Struktur.</translation>
<context>
<name>CMousePrint</name>
<message>
- <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. Save/print the selection by a left click on the disc/printer icon in the center of the selection.</source>
- <translation type="obsolete"><b>Karte speichern (drucken)</b><br/>Wählen Sie mit der linken Maustaste einen rechteckigen Bereich auf der Karte aus. Die Auswahl kann durch Verschieben der Eckpunkte mit der Maus angepasst werden. Abbruch mit Rechtsklick. Speichern/Drucken erfolgt durch Linksklick auf das entsprechende Symbol in der Mitte der Auswahl.</translation>
- </message>
- <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>Karte speichern (drucken)</b><br/>Wählen Sie mit der linken Maustaste einen rechteckigen Bereich auf der Karte aus. Die Auswahl kann durch Verschieben der Eckpunkte mit der Maus angepasst werden. Abbruch mit Rechtsklick. Speichern/Drucken erfolgt durch Linksklick auf das entsprechende Symbol in der Mitte der Auswahl.</translation>
@@ -3043,17 +3078,6 @@ ist keine gültige Koordinatensystemdefinition:
</message>
</context>
<context>
- <name>CPropertyTrk</name>
- <message>
- <source>distance [%1]</source>
- <translation type="vanished">Entfernung [%1]</translation>
- </message>
- <message>
- <source>time</source>
- <translation type="vanished">Uhrzeit</translation>
- </message>
-</context>
-<context>
<name>CQlgtDb</name>
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="308"/>
@@ -3352,7 +3376,7 @@ ist keine gültige Koordinatensystemdefinition:
<location filename="../gis/rte/router/CRouterMapQuest.cpp" line="312"/>
<location filename="../gis/rte/router/CRouterMapQuest.cpp" line="346"/>
<source><b>MapQuest</b><br/>Bad response from server:<br/>%1</source>
- <translation><b>MapQuest</b><br/>Schlechte Antwort vom Server:<br/>%1</translation>
+ <translation><b>MapQuest</b><br/>Falsche Antwort vom Server:<br/>%1</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterMapQuest.cpp" line="363"/>
@@ -3567,7 +3591,7 @@ ist keine gültige Koordinatensystemdefinition:
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="161"/>
<source>In the routing database there is no highway near the coordinates to place a waypoint.</source>
<translatorcomment>Message text points now to problem with routing database</translatorcomment>
- <translation>Es gibt in der Routing-Datenbank keine Straße in der Nähe des zu plazierenden Wegpunktes.</translation>
+ <translation>Es gibt in der Routing-Datenbank keine Straße in der Nähe des zu platzierenden Wegpunktes.</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="238"/>
@@ -3641,7 +3665,7 @@ ist keine gültige Koordinatensystemdefinition:
<message>
<location filename="../mouse/CScrOptSelect.cpp" line="93"/>
<source><b>Exact Mode</b><br/>All selected items have to be completely inside the selected area.<br/></source>
- <translation><b>Genauert Modus</b><br/>Alle Elemente müssen vollständig innerhalb des gewählten Bereiches sein.<br/></translation>
+ <translation><b>Genauer Modus</b><br/>Alle Elemente müssen vollständig innerhalb des gewählten Bereiches sein.<br/></translation>
</message>
<message>
<location filename="../mouse/CScrOptSelect.cpp" line="97"/>
@@ -3804,6 +3828,24 @@ Zeile %2, Spalte %3:
</message>
</context>
<context>
+ <name>CTableTrk</name>
+ <message>
+ <location filename="../gis/trk/CTableTrk.cpp" line="101"/>
+ <source>Double click to edit elevation value</source>
+ <translation>Doppelt klicken, um die Höhe zu ändern.</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CTableTrk.cpp" line="127"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="135"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="138"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="143"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="157"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="159"/>
+ <source>%1 %2</source>
+ <translation></translation>
+ </message>
+</context>
+<context>
<name>CTextEditWidget</name>
<message>
<location filename="../widgets/CTextEditWidget.cpp" line="73"/>
@@ -3854,7 +3896,7 @@ Zeile %2, Spalte %3:
<context>
<name>CWptIconDialog</name>
<message>
- <location filename="../helpers/CWptIconDialog.cpp" line="160"/>
+ <location filename="../helpers/CWptIconDialog.cpp" line="161"/>
<source>Path to user icons...</source>
<translation>Pfad zu Benutzersymbolen...</translation>
</message>
@@ -4134,7 +4176,7 @@ If you want to keep just one half you can simply remove the points, or check thi
Wenn Sie beide Teile des Tracks behalten wollen, müssen neue Tracks erstellt werden.
-Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte löschen, oder wählen SIe das, um einen neuen Track zu erstellen.</translation>
+Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte löschen, oder wählen Sie das, um einen neuen Track zu erstellen.</translation>
</message>
<message>
<location filename="../gis/trk/ICutTrk.ui" line="67"/>
@@ -4152,7 +4194,7 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
<message>
<location filename="../gis/db/IDB.cpp" line="64"/>
<source>Migrate database...</source>
- <translation>Datenbank wird migiriert...</translation>
+ <translation>Datenbank wird migriert...</translation>
</message>
<message>
<location filename="../gis/db/IDB.cpp" line="74"/>
@@ -4168,7 +4210,7 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
<message>
<location filename="../gis/db/IDB.cpp" line="85"/>
<source>The database version of '%1'' is more advanced as the one understood by your QMapShack installation. This won't work.</source>
- <translation>Die Datenbankversion von '%1' ist fortschrittlicher als die ihrer QMapShack Installation. Dies wird nicht funktionieren.</translation>
+ <translation>Die Datenbankversion von '%1' ist höher als die in ihrer QMapShack Installation benutzte. Dies wird nicht funktionieren.</translation>
</message>
<message>
<location filename="../gis/db/IDB.cpp" line="88"/>
@@ -4292,13 +4334,13 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
<translation></translation>
</message>
<message>
- <source>To add files with elevation data use File->Setup DEM Paths. </source>
- <translation type="vanished">Sie können Höhendaten mit <b>"Menü -> Datei -> DEM Verzeichnisse angeben"</b> hinzufügen.</translation>
+ <source>To add files with elevation data use <b>File->Setup DEM Paths</b>. </source>
+ <translation>Sie können Höhendaten mit <b>"Menü -> Datei -> DEM Verzeichnisse angeben"</b> hinzufügen.</translation>
</message>
<message>
<location filename="../dem/IDemList.ui" line="118"/>
- <source>To add files with elevation data use <b>File->Setup DEM Paths</b>. </source>
- <translation>Sie können Höhendaten mit <b>"Menü -> Datei -> DEM Verzeichnisse angeben"</b> hinzufügen.</translation>
+ <source>To add files with elevation data use <b>File->Setup DEM Paths</b>. Or click <a href='setup'><b>here</b></a></source>
+ <translation>Sie können Höhendaten mit <b>"Menü -> Datei -> DEM Verzeichnisse angeben"</b> hinzufügen. Oder Sie klicken einfach <a href='setup'><b>hier</b></a></translation>
</message>
<message>
<location filename="../dem/IDemList.ui" line="131"/>
@@ -4561,229 +4603,237 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="56"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="77"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="98"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="81"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="105"/>
<source>-
-</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1019"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1029"/>
<source>Profile</source>
<translation>Profil</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1460"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1470"/>
<source>Speed</source>
<translation>Geschw.</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="277"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="287"/>
<source>Toggle read only mode. You have to open the lock to edit the item.</source>
<translation>Den Schreibschutz ändern. Das Schloss muss offen sein um das Element zu bearbeiten.</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="280"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="444"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="473"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="538"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="564"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="593"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="682"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="711"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1040"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1069"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1101"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1137"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1166"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1198"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1234"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1263"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1295"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="290"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="454"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="483"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="548"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="574"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="603"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="692"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="721"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1050"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1079"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1111"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1147"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1176"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1208"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1244"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1273"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1305"/>
<source>...</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="255"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="265"/>
<source><html><head/><body><p>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </p></body></html></source>
<translation><html><head/><body><p>Der Wegpunkt wurde in QMapShack importiert und geändert. Die ursprünglichen Daten werden nicht mehr angezeigt. Näheres siehe Änderungshistorie.</p></body></html></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="377"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="387"/>
<source>Style</source>
<translation>Stil</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="419"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="429"/>
<source>Source</source>
<translation>Quelle</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="624"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="634"/>
<source>Maximum</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="764"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="774"/>
<source>Minimum</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="426"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="436"/>
<source>Width</source>
<translation>Breite</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="631"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="56"/>
+ <source>-
+-
+-</source>
+ <translation>-
+-
+-</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="641"/>
<source>with arrows</source>
<translation>mit Richtungspfeilen</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="832"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="842"/>
<source>Graphs</source>
<translation>Diagramme</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1324"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1334"/>
<source>Activity</source>
<translation>Aktivität</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1365"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1375"/>
<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 wählen Sie einen Teil des Track aus und weisen diesem eine Aktivität zu.</translation>
+ <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 Track aus und weisen diesem eine Aktivität zu.</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1392"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1402"/>
<source>Points</source>
<translation>Punkte</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1440"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1450"/>
<source>Time</source>
<translation>Zeit</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1445"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1455"/>
<source>Ele.</source>
<translation>Höhe</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1450"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1460"/>
<source>Delta</source>
<translation>Delta</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1455"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1465"/>
<source>Dist.</source>
<translation>Entf.</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1465"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
<source>Slope</source>
<translation>Neigung</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1470"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
<source>Ascend</source>
<translation>Anstieg</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1485"/>
<source>Descend</source>
<translation>Abstieg</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1490"/>
<source>Position</source>
<translation>Position</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="345"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="355"/>
<source>Info</source>
<translation>Info</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="306"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="316"/>
<source>-</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="441"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="451"/>
<source>Use/edit user defined visibility of arrows for this track</source>
- <translation>Benutzt die benutzerdefinierte Sichtbarkeit der Richtungspfeile für diesen Track</translation>
+ <translation>Die benutzerdefinierte Sichtbarkeit der Richtungspfeile für diesen Track verwenden</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="470"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="480"/>
<source>Use/edit system's visibility of arrows for all tracks</source>
- <translation>Benutzet die vorgegebene Sichtbarkeit der Richtungspfeile für alle Tracks</translation>
+ <translation>Die vorgegebene Sichtbarkeit der Richtungspfeile für alle Tracks benutzen</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="679"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="689"/>
<source>Use/edit user defined scale factor for this track</source>
- <translation>Benutzt den benutzerdefinierten Skalierungsfaktor für diesen Track</translation>
+ <translation>Den benutzerdefinierten Skalierungsfaktor für diesen Track verwenden</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="708"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="718"/>
<source>Use/edit system's default factor for all tracks</source>
- <translation>Benutzt den vorgegebenen Skalierungsfaktor für alle Tracks</translation>
+ <translation>Den vorgegebenen Skalierungsfaktor für alle Tracks benutzen</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="638"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="648"/>
<source>x </source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="845"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="865"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="951"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="855"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="875"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="961"/>
<source>max.</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="984"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="991"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1005"/>
+ <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></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="535"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1037"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1134"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1231"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="545"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1047"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1144"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1241"/>
<source>User defined limits for this track</source>
<translation>Benutzerdefinierte Grenzwerte für diesen Track</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="561"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1066"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1163"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1260"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="571"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1076"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1173"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1270"/>
<source>Automatic limits</source>
<translation>Automatische Grenzwerte</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="590"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1098"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1195"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1292"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="600"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1108"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1205"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1302"/>
<source>User defined limits for all tracks</source>
<translation>Benutzerdefinierte Grenzwerte für alle Tracks</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="784"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="794"/>
<source>Color</source>
<translation>Farbe</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1489"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1499"/>
<source>Filter</source>
<translation>Filter</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1526"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1536"/>
<source>Hist.</source>
<translation>Historie</translation>
</message>
@@ -4867,7 +4917,7 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
<message>
<location filename="../device/IDevice.cpp" line="287"/>
<source>There is another project with the same name. If you press 'ok' it will be removed and replaced.</source>
- <translation>Es gibt schon ein Projekt mit dem selben Namen. Wenn Sie 'ok' drücken wird dieses entfernt und ersetzt.</translation>
+ <translation>Es gibt schon ein Projekt mit demselben Namen. Wenn Sie 'ok' drücken wird dieses entfernt und ersetzt.</translation>
</message>
</context>
<context>
@@ -4996,6 +5046,10 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
</message>
<message>
<location filename="../gis/trk/filter/IFilterInvalid.ui" line="56"/>
+ <source>Hide points with invalid data.</source>
+ <translation>Punkte mit ungültigen Daten ausblenden.</translation>
+ </message>
+ <message>
<source>Hide points with invalid coordinates at the beginning of the track.</source>
<translation>Blendet Punkte mit ungültigen Koordinaten am Anfang vom Track aus.</translation>
</message>
@@ -5211,7 +5265,7 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
<message>
<location filename="../gis/trk/filter/IFilterSplitSegment.ui" line="51"/>
<source><html><head/><body><p><span style=" font-weight:600;">Split Segments into Tracks</span></p></body></html></source>
- <translation><html><head/><body><p><span style=" font-weight:600;">Teilt Segmente in Tracks</span></p></body></html></translation>
+ <translation><html><head/><body><p><span style=" font-weight:600;">Tracksegmente in Tracks umwandeln</span></p></body></html></translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterSplitSegment.ui" line="63"/>
@@ -5235,80 +5289,90 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
<context>
<name>IGisItem</name>
<message>
- <location filename="../gis/IGisItem.cpp" line="42"/>
+ <location filename="../gis/IGisItem.cpp" line="43"/>
<source>[no name]</source>
<translation>[kein Name]</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="314"/>
+ <location filename="../gis/IGisItem.cpp" line="315"/>
<source>The item is not part of the project in the database.</source>
<translation>Das Element ist nicht Teil des Projektes in der Datenbank.</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="315"/>
+ <location filename="../gis/IGisItem.cpp" line="316"/>
<source>
It is either a new item or it has been deleted in the database by someone else.</source>
<translation>Es ist entweder ein neues Symbol oder es wurde in der Datenbank gelöscht.</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="321"/>
+ <location filename="../gis/IGisItem.cpp" line="322"/>
<source>The item is not in the database.</source>
<translation>Das Element ist nicht in der Datenbank.</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="327"/>
+ <location filename="../gis/IGisItem.cpp" line="328"/>
<source>The item might need to be saved</source>
<translation>Es könnte notwendig sein, das Element zu speichern.</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="411"/>
+ <location filename="../gis/IGisItem.cpp" line="412"/>
<source>Initial version.</source>
<translation>Erstversion.</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="519"/>
+ <location filename="../gis/IGisItem.cpp" line="520"/>
<source><h3>%1</h3> This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press 'Ok'.</source>
<translation><h3>%1</h3> Diese Element ist vermutlich schreibgeschützt, da nicht mit QMapShack erstellt. Normalerweise sollten importierte Daten nicht geändert werden. Wenn doch, drücken Sie 'OK'.</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="520"/>
+ <location filename="../gis/IGisItem.cpp" line="521"/>
<source>Read Only Mode...</source>
<translation>Schreibgeschützt...</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="684"/>
- <location filename="../gis/IGisItem.cpp" line="743"/>
+ <location filename="../gis/IGisItem.cpp" line="685"/>
+ <location filename="../gis/IGisItem.cpp" line="744"/>
<source><h4>Description:</h4></source>
<translation><h4>Beschreibung:</h4></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="687"/>
- <location filename="../gis/IGisItem.cpp" line="746"/>
+ <location filename="../gis/IGisItem.cpp" line="688"/>
+ <location filename="../gis/IGisItem.cpp" line="747"/>
<source><p>--- no description ---</p></source>
<translation><p>--- keine Beschreibung ---</p></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="698"/>
+ <location filename="../gis/IGisItem.cpp" line="699"/>
<source><h4>Comment:</h4></source>
<translation><h4>Kommentar:</h4></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="701"/>
+ <location filename="../gis/IGisItem.cpp" line="702"/>
<source><p>--- no comment ---</p></source>
<translation><p>--- kein Kommentar ---</p></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="712"/>
- <location filename="../gis/IGisItem.cpp" line="757"/>
+ <location filename="../gis/IGisItem.cpp" line="713"/>
+ <location filename="../gis/IGisItem.cpp" line="758"/>
<source><h4>Links:</h4></source>
<translation><h4>Verknüpfungen:</h4></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="715"/>
- <location filename="../gis/IGisItem.cpp" line="760"/>
+ <location filename="../gis/IGisItem.cpp" line="716"/>
+ <location filename="../gis/IGisItem.cpp" line="761"/>
<source><p>--- no links ---</p></source>
<translation><p>--- keine Verknüpfungen---</p></translation>
</message>
+ <message>
+ <location filename="../gis/IGisItem.cpp" line="843"/>
+ <source>Edit name...</source>
+ <translation>Name bearbeiten...</translation>
+ </message>
+ <message>
+ <location filename="../gis/IGisItem.cpp" line="843"/>
+ <source>Enter new %1 name.</source>
+ <translation>Geben Sie einen neuen %1namen ein.</translation>
+ </message>
</context>
<context>
<name>IGisProject</name>
@@ -5708,7 +5772,7 @@ Dateiname: %1</translation>
<message>
<location filename="../IMainWindow.ui" line="645"/>
<source>Write current active map and DEM list including the properties to a file</source>
- <translation>Speichert die aktive Karten und DEM Dateien inklusive der Eigenschaften in einer Datei</translation>
+ <translation>Speichert die aktiven Karten und DEM Dateien inklusive der Eigenschaften in einer Datei</translation>
</message>
<message>
<location filename="../IMainWindow.ui" line="657"/>
@@ -5718,7 +5782,7 @@ Dateiname: %1</translation>
<message>
<location filename="../IMainWindow.ui" line="660"/>
<source>Restore view with active map and DEM list including the properties from a file</source>
- <translation>Stellt die aktive Karten und DEM Dateien inklusive der Eigenschaften aus einer Datei wieder her</translation>
+ <translation>Stellt die aktiven Karten und DEM Dateien inklusive der Eigenschaften aus einer Datei wieder her</translation>
</message>
<message>
<location filename="../IMainWindow.ui" line="675"/>
@@ -5778,7 +5842,7 @@ Dateiname: %1</translation>
<message>
<location filename="../IMainWindow.ui" line="753"/>
<source>Change the format coordinates are displayed</source>
- <translation>Ändert das Format der angezeigten Koordianten</translation>
+ <translation>Ändert das Format der angezeigten Koordinaten</translation>
</message>
<message>
<location filename="../IMainWindow.ui" line="765"/>
@@ -5884,13 +5948,13 @@ Dateiname: %1</translation>
<translation></translation>
</message>
<message>
- <source>To add maps use File->Setup Map Paths. </source>
- <translation type="vanished">Sie können Karten mit <b>"Menü -> Datei -> Kartenverzeichnisse angeben"</b> hinzufügen.</translation>
+ <source>To add maps use <b>File->Setup Map Paths</b>. </source>
+ <translation>Sie können Karten mit <b>"Menü -> Datei -> Kartenverzeichnisse angeben"</b> hinzufügen.</translation>
</message>
<message>
<location filename="../map/IMapList.ui" line="103"/>
- <source>To add maps use <b>File->Setup Map Paths</b>. </source>
- <translation>Sie können Karten mit <b>"Menü -> Datei -> Kartenverzeichnisse angeben"</b> hinzufügen.</translation>
+ <source>To add maps use <b>File->Setup Map Paths</b>. Or click <a href='setup'><b>here</b></a></source>
+ <translation>Sie können Karten mit <b>"Menü -> Datei -> Kartenverzeichnisse angeben"</b> hinzufügen. Oder Sie klicken einfach <a href='setup'><b>hier</b></a></translation>
</message>
<message>
<location filename="../map/IMapList.ui" line="116"/>
@@ -6079,57 +6143,57 @@ Keine Lust die Anleitung zu lesen!</translation>
<translation><b>Neue Linie</b><br/>Erstellen Sie Punkte durch Verschieben des Mauscursors und Drücken der linken Maustaste. Mit der rechten Maustaste beenden Sie den Vorgang.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="311"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="314"/>
<source><b>Delete Point</b><br/>Move the mouse close to a point and press the left button to delete it.<br/></source>
<translation><b>Punkt löschen</b><br/>Bewegen Sie den Mauscursor nahe an einen Punkt und drücken Sie die linke Maustaste um ihn zu löschen. <br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="320"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="323"/>
<source><b>Select Range of Points</b><br/>Left click on first point to start selection. Left click second point to complete selection and choose from options. Use the right mouse button to cancel.<br/></source>
<translation><b>Punktebereich auswählen</b><br/>Mit der linken Maustaste wählen Sie den ersten Punkt aus. Mit einem erneuten Drücken der linken Maustaste wählen Sie den zweiten Punkt aus und dann wählen Sie eine der Optionen. Zum Abbrechen nutzen Sie die rechte Maustaste.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="329"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
<source><b>Move Point</b><br/>Move the mouse close to a point and press the left button to make it stick to the cursor. Move the mouse to move the point. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
<translation><b>Punkt verschieben</b><br/>Bewegen Sie den Mauscursor nahe an einen Punkt und drücken die linke Maustaste, um ihn mit dem Cursor zu fangen. Verschieben Sie den Punkt mit der Maus. Setzen Sie den Punkt mit einem Linksklick. Zum Abbrechen nutzen Sie die rechte Maustaste.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="338"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="341"/>
<source><b>Add Point</b><br/>Move the mouse close to a line segment and press the left button to add a point. The point will stick to the cursor and you can move it. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
<translation><b>Punkt hinzufügen</b><br/>Bewegen Sie den Mauscursor nahe an ein Liniensegment und drücken Sie die linke Maustaste, um einen Punkt hinzuzufügen. Der Punkt wird durch den Cursor gefangen und kann verschoben werden. Setzen Sie den Punkt mit einem Linksklick. Zum Abbrechen nutzen Sie die rechte Maustaste.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="347"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="350"/>
<source><b>No Routing</b><br/>All points will be connected with a straight line.<br/></source>
- <translation><b>Kein Routing</b><br/>Alle Punkte werden mittles einer geraden Linie verbunden.<br/></translation>
+ <translation><b>Kein Routing</b><br/>Alle Punkte werden mittels einer geraden Linie verbunden.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="353"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="356"/>
<source><b>Auto Routing</b><br/>The current router setup is used to derive a route between points. <b>Note:</b> The selected router must be able to route on-the-fly. Offline routers usually can do, online routers can't.<br/></source>
<translation><b>Auto Routing</b><br/>Die aktuellen Router Einstellungen erstellen eine Route zwischen Punkten. <b>Hinweis:</b> Der gewählte Router muss schnell routen können. Offline Router können dies gewöhnlich, Online Router nicht.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="358"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="361"/>
<source><b>Vector Routing</b><br/>Connect points with a line from a loaded vector map if possible.<br/></source>
<translation><b>Vektor Routing</b><br/>Verbindet Punkte mit einer Linie einer geladenen Vektorkarte, soweit möglich.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="530"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="533"/>
<source><b>%1 Metrics</b></source>
<translation><b>%1maße</b></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="533"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="536"/>
<source>Distance:</source>
<translation>Entfernung:</translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="535"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="538"/>
<source>Ascend:</source>
<translation>Anstieg:</translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="537"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="540"/>
<source>Descend:</source>
<translation>Abstieg:</translation>
</message>
@@ -6446,10 +6510,6 @@ sein</translation>
<source>To use offline routing you need to define paths to local routing data. Use the setup tool button to register a path. You can create your own routing data with <b>Tool->Create Routino Database</b>.</source>
<translation>Um Offline-Routing zu nutzen, müssen Sie einen Pfad zu einer lokalen Routendatenbank angeben. Benutzen Sie dazu den Knopf mit dem blauen Ordner. Sie können mit <b>Werkzeug->Routino Datenbank erstellen</b> eine solche Routendatenbank selber erzeugen.</translation>
</message>
- <message>
- <source>To use offline routing you need to define paths to local routing data. Use the setup tool button to register a path.</source>
- <translation type="vanished">Um Offline-Routing zu nutzen, müssen Sie einen Pfad zu lokalen Routendaten angeben. Benutzen Sie dazu den Knopf mit dem blauen Ordner.</translation>
- </message>
</context>
<context>
<name>IRouterRoutinoPathSetup</name>
@@ -6795,6 +6855,7 @@ sein</translation>
<location filename="../gis/rte/IScrOptRte.ui" line="106"/>
<location filename="../gis/rte/IScrOptRte.ui" line="120"/>
<location filename="../gis/rte/IScrOptRte.ui" line="134"/>
+ <location filename="../gis/rte/IScrOptRte.ui" line="148"/>
<source>...</source>
<translation></translation>
</message>
@@ -6824,7 +6885,12 @@ sein</translation>
<translation>Routenpunkte verschieben.</translation>
</message>
<message>
- <location filename="../gis/rte/IScrOptRte.ui" line="160"/>
+ <location filename="../gis/rte/IScrOptRte.ui" line="145"/>
+ <source>Convert route to track</source>
+ <translation>Die Route in einen Track umwandlen</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/IScrOptRte.ui" line="174"/>
<source>TextLabel</source>
<translation>Bezeichnung</translation>
</message>
@@ -6849,9 +6915,9 @@ sein</translation>
<location filename="../mouse/IScrOptSelect.ui" line="176"/>
<location filename="../mouse/IScrOptSelect.ui" line="205"/>
<location filename="../mouse/IScrOptSelect.ui" line="265"/>
- <location filename="../mouse/IScrOptSelect.ui" line="291"/>
- <location filename="../mouse/IScrOptSelect.ui" line="317"/>
- <location filename="../mouse/IScrOptSelect.ui" line="343"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="292"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="319"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="346"/>
<source>...</source>
<translation></translation>
</message>
@@ -6886,17 +6952,17 @@ sein</translation>
<translation>Fügt Tracks zur Auswahl hinzu.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="288"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="289"/>
<source>Add waypoints to selection.</source>
<translation>Fügt Wegpunkte zur Auswahl hinzu.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="314"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="316"/>
<source>Add routes to selection.</source>
<translation>Fügt Routen zur Auswahl hinzu.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="340"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="343"/>
<source>Add areas to selection.</source>
<translation>Fügt Gebiete zur Auswahl hinzu.</translation>
</message>
@@ -7236,7 +7302,7 @@ sein</translation>
<message>
<location filename="../gis/db/ISetupDatabase.ui" line="252"/>
<source><p align="justify"><span style=" font-weight:600;">Caution!</span> It is recommended to leave the password blank, as QMapShack will store it as plain text. If you don't give a password you will be asked for it on each startup.</p></source>
- <translation><p align="justify"><span style=" font-weight:600;">Achtung!</span> Es wird empfohlen, das Passwortfeld leer zulassen, da QMapShack dies als Klartext speichert. Wenn Sie kein Passwort vergeben, werden Sie bei jedem Start danach gefragt.</translation>
+ <translation><p align="justify"><span style=" font-weight:600;">Achtung!</span> Es wird empfohlen, das Passwortfeld leer zulassen, da QMapShack dies als Klartext speichert. Wenn Sie kein Passwort vergeben, werden Sie bei jedem Start danach gefragt.</p></translation>
</message>
<message>
<location filename="../gis/db/ISetupDatabase.ui" line="239"/>
@@ -7693,6 +7759,10 @@ sein</translation>
</message>
<message>
<location filename="../helpers/IWptIconDialog.ui" line="95"/>
+ <source>All custom icons have to be *.bmp or *.png format.</source>
+ <translation>Alle individuellen Symbole müssen im *.bmp oder *.png Format sein.</translation>
+ </message>
+ <message>
<source>All custom icons have to be *.bmp format.</source>
<translation>Alle individuellen Symbole müssen im *.bmp Format sein.</translation>
</message>
diff --git a/src/locale/qmapshack_es.ts b/src/locale/qmapshack_es.ts
index 3ba03a6..b72dbd3 100644
--- a/src/locale/qmapshack_es.ts
+++ b/src/locale/qmapshack_es.ts
@@ -178,13 +178,12 @@
<context>
<name>CCreateRouteFromWpt</name>
<message>
- <location filename="../gis/rte/CCreateRouteFromWpt.cpp" line="65"/>
<source>Edit name...</source>
- <translation type="unfinished">Editar nombre...</translation>
+ <translation type="obsolete">Editar nombre...</translation>
</message>
<message>
- <location filename="../gis/rte/CCreateRouteFromWpt.cpp" line="65"/>
- <source>Enter new route name.</source>
+ <location filename="../gis/rte/CCreateRouteFromWpt.cpp" line="68"/>
+ <source>route</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -457,7 +456,7 @@ To solve this conflict you can create and save a clone, force your version or dr
<name>CDetailsPrj</name>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="270"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="738"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="791"/>
<source>none</source>
<translation>ninguna</translation>
</message>
@@ -478,18 +477,18 @@ To solve this conflict you can create and save a clone, force your version or dr
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="453"/>
<location filename="../gis/prj/CDetailsPrj.cpp" line="479"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="583"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="673"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="703"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="608"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="726"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="756"/>
<source>Info</source>
<translation>Información</translation>
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="454"/>
<location filename="../gis/prj/CDetailsPrj.cpp" line="480"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="584"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="674"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="704"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="609"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="727"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="757"/>
<source>Comment</source>
<translation>Comentario</translation>
</message>
@@ -499,69 +498,84 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation>Tracks</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="666"/>
- <source><h2>Areas</h2></source>
- <translation>Áreas</translation>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+ <source>From Start</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="126"/>
- <source>You want to sort waypoints along a track, but you switched off track and waypoint correlation. Do you want to switch it on again?</source>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+ <source>To Next</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="127"/>
- <source>Correlation...</source>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+ <source>To End</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="398"/>
- <source><b>Summary over all tracks in project</b><br/></source>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="630"/>
+ <source>distance: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="602"/>
- <source>distance: %1%2</source>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="640"/>
+ <source>ascent: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="650"/>
+ <source>descend: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="719"/>
+ <source><h2>Areas</h2></source>
+ <translation>Áreas</translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="126"/>
+ <source>You want to sort waypoints along a track, but you switched off track and waypoint correlation. Do you want to switch it on again?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="604"/>
- <source>ascent: %1%2</source>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="127"/>
+ <source>Correlation...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="606"/>
- <source>descend: %1%2</source>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="398"/>
+ <source><b>Summary over all tracks in project</b><br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="696"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="749"/>
<source><h2>Routes</h2></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="724"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="777"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="804"/>
<source>Edit name...</source>
<translation>Editar nombre...</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="724"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="777"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="804"/>
<source>Enter new project name.</source>
<translation>Introducir nuevo nombre de proyecto.</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="733"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="786"/>
<source>Edit keywords...</source>
<translation>Editar etiquetas...</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="733"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="786"/>
<source>Enter keywords.</source>
<translation>Introducir etiquetas.</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="882"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="935"/>
<source>Print Diary</source>
<translation>Imprimir Diario</translation>
</message>
@@ -617,22 +631,12 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation>Dividir track en partes</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="410"/>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="418"/>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="421"/>
<location filename="../gis/trk/CDetailsTrk.cpp" line="426"/>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="440"/>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="442"/>
- <source>%1 %2</source>
- <translation></translation>
- </message>
- <message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="507"/>
<source>Color</source>
<translation type="unfinished">Color</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="508"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="427"/>
<source>Activity</source>
<translation type="unfinished"></translation>
</message>
@@ -645,17 +649,17 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation type="obsolete">Introduzca el nombre del nuevo track.</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="741"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="651"/>
<source>Reset activities...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="741"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="651"/>
<source>This will remove all activities from the track. Proceed?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="747"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="657"/>
<source>None</source>
<translation type="unfinished"></translation>
</message>
@@ -716,7 +720,7 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/gpx/serialization.cpp" line="1038"/>
+ <location filename="../gis/gpx/serialization.cpp" line="1040"/>
<source>Unknown</source>
<translation type="unfinished">Desconocido</translation>
</message>
@@ -737,7 +741,7 @@ To solve this conflict you can create and save a clone, force your version or dr
<context>
<name>CElevationDialog</name>
<message>
- <location filename="../helpers/CElevationDialog.cpp" line="83"/>
+ <location filename="../helpers/CElevationDialog.cpp" line="92"/>
<source>No DEM data found for that point.</source>
<translation>No se encontraron datos DEM para ese punto.</translation>
</message>
@@ -790,13 +794,12 @@ To solve this conflict you can create and save a clone, force your version or dr
<context>
<name>CFitProject</name>
<message>
- <location filename="../gis/fit/CFitProject.cpp" line="44"/>
- <location filename="../gis/fit/CFitProject.cpp" line="62"/>
+ <location filename="../gis/fit/CFitProject.cpp" line="61"/>
<source>Failed to load file %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/fit/CFitProject.cpp" line="86"/>
+ <location filename="../gis/fit/CFitProject.cpp" line="91"/>
<source>Failed to open FIT file %1.</source>
<translation type="unfinished"></translation>
</message>
@@ -914,68 +917,78 @@ To solve this conflict you can create and save a clone, force your version or dr
<context>
<name>CGisItemRte</name>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="63"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="65"/>
<source>_Clone</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="249"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="284"/>
+ <source>track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="311"/>
<source>Changed name.</source>
<translation type="unfinished">Se cambió el nombre.</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="255"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="317"/>
<source>Changed comment</source>
<translation type="unfinished">Se cambió el comentario</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="261"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="323"/>
<source>Changed description</source>
<translation type="unfinished">Se cambió la descripción</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="267"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="329"/>
<source>Changed links</source>
<translation type="unfinished">Se cambió el enlace</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="285"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="347"/>
<source>Length: %1 %2</source>
<translation type="unfinished">Longitud: %1 %2</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="289"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
<source>Length: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="296"/>
- <location filename="../gis/rte/CGisItemRte.cpp" line="485"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="559"/>
<source>Time: %1 %2</source>
<translation type="unfinished">Tiempo: %1 %2</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="300"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
<source>Time: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="306"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="372"/>
+ <source>%1%2 %3, %4%5 %6</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="378"/>
<source>Last time routed:<br/>%1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="308"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="380"/>
<source>with %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="487"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="561"/>
<source>Distance: %1 %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="601"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="675"/>
<source>Changed route points.</source>
<translation type="unfinished"></translation>
</message>
@@ -983,7 +996,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="182"/>
+ <location filename="../gis/fit/serialization.cpp" line="247"/>
<source>FIT file %1 contains no GPS data.</source>
<translation type="unfinished"></translation>
</message>
@@ -1024,12 +1037,12 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation type="unfinished">Se cambiaron los puntos del track, y descartados todos los datos previos.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="401"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="394"/>
<source>Length: %1 %2</source>
<translation type="unfinished">Longitud: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="408"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="401"/>
<source>, %1%2 %3, %4%5 %6</source>
<translation type="unfinished">, %1%2 %3, %4%5 %6</translation>
</message>
@@ -1046,77 +1059,121 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation type="obsolete">En movimiento: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="428"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="435"/>
<source>Start: %1</source>
<translation type="unfinished">Comienzo: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="432"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="439"/>
+ <source>Start: -</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="445"/>
<source>End: %1</source>
<translation type="unfinished">Final: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="435"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="449"/>
+ <source>End: -</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="453"/>
<source>Points: %1 (%2)</source>
<translation type="unfinished">Puntos: %1 (%2)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="527"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="457"/>
+ <source>Invalid elevations!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="462"/>
+ <source>Invalid timestamps!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="467"/>
+ <source>Invalid positions!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="558"/>
+ <source>Index: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="562"/>
+ <source>Index: visible %1, total %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="573"/>
<source>Ele.: %1 %2</source>
<translation type="unfinished">Altitud: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="530"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
<source> slope: %1%3 (%2%)</source>
<translation type="unfinished"> pendiente: %1%3 (%2%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="535"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
<source> speed: %1%2</source>
<translation type="unfinished"> velocidad: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="563"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
<source>... and %1 tags not displayed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="574"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
<source>Descend: - (-)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="575"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
<source>Distance: - (-)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="622"/>
<source>Moving: - (-)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="627"/>
<source>Ascend: %1%2 (%3%)</source>
<translation type="unfinished">Ascenso: %1%2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1441"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1317"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1330"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1390"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1434"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1599"/>
+ <source>track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1535"/>
<source>Hide point %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1445"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1539"/>
<source>Hide points %1..%2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="573"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="619"/>
<source>Ascend: - (-)</source>
<translation type="unfinished">Ascenso: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="587"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="633"/>
<source> Descend: %1%2 (%3%)</source>
<translation type="unfinished"> Descenso: %1%2 (%3%)</translation>
</message>
@@ -1133,7 +1190,7 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation type="obsolete">Dist.: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="599"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="645"/>
<source> Moving: %1%2 (%3%)</source>
<translation type="unfinished"> En movimiento: %1%2 (%3%)</translation>
</message>
@@ -1142,68 +1199,81 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation type="obsolete"> En movimiento: - (-) </translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="667"/>
<source>Ascend: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="672"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="684"/>
<source>, %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="615"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="661"/>
<source>Ascend: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="633"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="679"/>
<source> Descend: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="616"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="662"/>
<source>Descend: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="694"/>
<source> Time: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
<source>Edit name...</source>
- <translation type="unfinished">Editar nombre...</translation>
+ <translation type="obsolete">Editar nombre...</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
<source>Enter new track name.</source>
- <translation type="unfinished">Introduzca el nombre del nuevo track.</translation>
+ <translation type="obsolete">Introduzca el nombre del nuevo track.</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="405"/>
+ <source>, %1-, %2-</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="416"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="413"/>
<source>Time: %1, Speed: %2 %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="423"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="417"/>
+ <source>Time: -, Speed: -</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="425"/>
<source>Moving: %1, Speed: %2 %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="593"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="429"/>
+ <source>Moving: -, Speed: -</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="639"/>
<source>Distance: %1%2 (%3%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="643"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
<source>Distance: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1286"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1380"/>
<source>Permanently removed points %1..%2</source>
<translation type="unfinished"></translation>
</message>
@@ -1212,37 +1282,42 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation type="obsolete">Ocultar puntos.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1485"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1579"/>
<source>Show points.</source>
<translation type="unfinished">Mostrar puntos.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2040"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2142"/>
<source>Changed name</source>
<translation type="unfinished">Se cambió el nombre</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2046"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2148"/>
<source>Changed comment</source>
<translation type="unfinished">Se cambió el comentario</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2052"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2154"/>
<source>Changed description</source>
<translation type="unfinished">Se cambió la descripción</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2058"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2160"/>
<source>Changed links</source>
<translation type="unfinished">Se cambió el enlace</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2085"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2171"/>
+ <source>Changed elevation of point %1 to %2 %3</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2198"/>
<source>Changed activity to '%1' for complete track.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2143"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2256"/>
<source>Changed activity to '%1' for range(%2..%3).</source>
<translation type="unfinished"></translation>
</message>
@@ -1252,62 +1327,62 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation type="unfinished">Ocultar puntos con algoritmo Douglas Peuker (%1%2)</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="143"/>
- <source>Hide points with invalid coordinates at the beginning of the track</source>
+ <location filename="../gis/trk/filter/filter.cpp" line="141"/>
+ <source>Hide points with invalid data.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="159"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="157"/>
<source>Reset all hidden track points to visible</source>
<translation type="unfinished">Restaurados todos los puntos a visible</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="193"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="191"/>
<source>Permanently removed all hidden track points</source>
<translation type="unfinished">Elminados definitivamente todos los puntos ocultos del track</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="243"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="241"/>
<source>Smoothed profile with a Median filter of size %1</source>
<translation type="unfinished">Pefil suavizado con Mediana de %1 puntos</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="279"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="277"/>
<source>Replaced elevation data with data from DEM files.</source>
<translation type="unfinished">Datos de elevación sustituidos por valores de fichero DEM.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="302"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="300"/>
<source>Offset elevation data by %1%2.</source>
<translation type="unfinished">Elevación desplazada %1%2.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="321"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="319"/>
<source>Changed start of track to %1.</source>
<translation type="unfinished">Cambiado el inicio de track a %1.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="340"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="338"/>
<source>Remove timestamps.</source>
<translation type="unfinished">Eliminadas las marcas de tiempo.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="363"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="361"/>
<source>Set artificial timestamps with delta of %1 sec.</source>
<translation type="unfinished">Marcas de tiempo ficticias con incremento de %1 sec.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="396"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="393"/>
<source>Changed speed to %1%2.</source>
<translation type="unfinished">Velocidad modificada a %1%2.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="415"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="412"/>
<source>%1 (Segment %2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="438"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="435"/>
<source>Removed extension %1 from all Track Points</source>
<translation type="unfinished"></translation>
</message>
@@ -1320,17 +1395,17 @@ To solve this conflict you can create and save a clone, force your version or dr
<context>
<name>CGisItemWpt</name>
<message>
- <location filename="../gis/gpx/serialization.cpp" line="588"/>
+ <location filename="../gis/gpx/serialization.cpp" line="590"/>
<source>Archived</source>
<translation type="unfinished">Archivado</translation>
</message>
<message>
- <location filename="../gis/gpx/serialization.cpp" line="592"/>
+ <location filename="../gis/gpx/serialization.cpp" line="594"/>
<source>Available</source>
<translation type="unfinished">Disponible</translation>
</message>
<message>
- <location filename="../gis/gpx/serialization.cpp" line="596"/>
+ <location filename="../gis/gpx/serialization.cpp" line="598"/>
<source>Not Available</source>
<translation type="unfinished">No Disponible</translation>
</message>
@@ -1576,29 +1651,34 @@ 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="181"/>
+ <location filename="../gis/CGisListWks.cpp" line="166"/>
+ <source>Convert to Track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="182"/>
<source>Create Route</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="625"/>
+ <location filename="../gis/CGisListWks.cpp" line="626"/>
<source>Drop items...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="650"/>
- <location filename="../gis/CGisListWks.cpp" line="1581"/>
- <location filename="../gis/CGisListWks.cpp" line="1619"/>
+ <location filename="../gis/CGisListWks.cpp" line="651"/>
+ <location filename="../gis/CGisListWks.cpp" line="1593"/>
+ <location filename="../gis/CGisListWks.cpp" line="1631"/>
<source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
<translation type="unfinished"><b>Actualizar dispositivos</b><p>Actualizar %1<br/>Por favor espere...</p></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1165"/>
+ <location filename="../gis/CGisListWks.cpp" line="1166"/>
<source>Delete project...</source>
<translation type="unfinished">Eliminar Proyecto...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1165"/>
+ <location filename="../gis/CGisListWks.cpp" line="1166"/>
<source>Do you really want to delete %1?</source>
<translation type="unfinished">¿Desea realmente eliminar %1?</translation>
</message>
@@ -1652,7 +1732,7 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation>Combinar Tracks</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="174"/>
+ <location filename="../gis/CGisListWks.cpp" line="175"/>
<source>Edit Area Points</source>
<translation>Editar Puntos del Área</translation>
</message>
@@ -1663,22 +1743,22 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation>Borrar</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="779"/>
+ <location filename="../gis/CGisListWks.cpp" line="780"/>
<source>Saving workspace. Please wait.</source>
<translation>Guardando espacio de trabajo. Por favor espere.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="825"/>
+ <location filename="../gis/CGisListWks.cpp" line="826"/>
<source>Loading workspace. Please wait.</source>
<translation>Cargando espacio de trabajo. Por favor espere.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1142"/>
+ <location filename="../gis/CGisListWks.cpp" line="1143"/>
<source>Close all projects...</source>
<translation>Cerrar todos los proyectos...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1142"/>
+ <location filename="../gis/CGisListWks.cpp" line="1143"/>
<source>This will remove all projects from the workspace.</source>
<translation>Esto quitará.todos los proyectos.del espacio de trabajo.</translation>
</message>
@@ -1701,12 +1781,12 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation type="unfinished">Copia elementos....</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="645"/>
+ <location filename="../gis/CGisWidget.cpp" line="657"/>
<source>Cut Track...</source>
<translation>Partir Track...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="645"/>
+ <location filename="../gis/CGisWidget.cpp" line="657"/>
<source>Do you want to delete the original track?</source>
<translation>¿Desea borrar el track original?</translation>
</message>
@@ -1745,17 +1825,17 @@ línea %2, columna %3.
<context>
<name>CGpxProject</name>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="90"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="91"/>
<source>Failed to load file %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="112"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="113"/>
<source>Failed to open %1</source>
<translation type="unfinished">Fallo al abrir %1</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="124"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="125"/>
<source>Failed to read: %1
line %2, column %3:
%4</source>
@@ -1764,32 +1844,32 @@ línea %2, columna %3.
%4</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="132"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="133"/>
<source>Not a GPX file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="238"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="258"/>
<source>File exists ...</source>
<translation type="unfinished">El archivo ya existe ...</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="239"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="259"/>
<source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains GPX data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file. Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
<translation type="unfinished">El archivo ya existe y no lo ha creado QMapShack. Si pulsa 'sí' todos los datos de este archivo se perderán. Incluso si el archivo contiene datos GPX y QMapShack lo ha leído, QMapShack podría no ser capaz de leer y almacenar todos los elementos en el archivo, y aquellos que no haya leído se perderán. Se le recomienda usar otro archivo distinto. <b>¿Quiere realmente sobrescribir el archivo</b></translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="347"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="367"/>
<source>Failed to create file '%1'</source>
<translation type="unfinished">Fallo al crear el archivo '%1'</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="357"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="377"/>
<source>Failed to write file '%1'</source>
<translation type="unfinished">Fallo al escribir en el archivo '%1'</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="362"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="382"/>
<source>Saving GIS data failed...</source>
<translation type="unfinished"></translation>
</message>
@@ -1863,64 +1943,64 @@ línea %2, columna %3.
<context>
<name>CKnownExtension</name>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="45"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="62"/>
<source>Air Temperature</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="49"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="66"/>
<source>Water Temperature</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="53"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="70"/>
<source>Depth</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="57"/>
- <location filename="../gis/trk/CKnownExtension.cpp" line="69"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="74"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="86"/>
<source>Heart Rate</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="61"/>
- <location filename="../gis/trk/CKnownExtension.cpp" line="73"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="78"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="90"/>
<source>Cadence</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="77"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="94"/>
<source>Speed</source>
<translation type="unfinished">Velocidad</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="81"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="98"/>
<source>Acceleration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="85"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="102"/>
<source>Course</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="94"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="111"/>
<source>Slope*</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="99"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
<source>Speed*</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="104"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="121"/>
<source>Elevation</source>
<translation type="unfinished">Altitud</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="109"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="126"/>
<source>Progress</source>
<translation type="unfinished">Progreso</translation>
</message>
@@ -1936,33 +2016,38 @@ línea %2, columna %3.
<context>
<name>CMainWindow</name>
<message>
- <location filename="../CMainWindow.cpp" line="643"/>
+ <location filename="../CMainWindow.cpp" line="557"/>
+ <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="685"/>
<source>Ele: %1%2</source>
<translation>Alt: %1%2</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="659"/>
+ <location filename="../CMainWindow.cpp" line="701"/>
<source>[Grid: %1]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="794"/>
+ <location filename="../CMainWindow.cpp" line="836"/>
<source>Load GIS Data...</source>
<translation>Cargar Datos GIS...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="828"/>
+ <location filename="../CMainWindow.cpp" line="870"/>
<source>Select output file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="828"/>
- <location filename="../CMainWindow.cpp" line="854"/>
+ <location filename="../CMainWindow.cpp" line="870"/>
+ <location filename="../CMainWindow.cpp" line="896"/>
<source>QMapShack View (*.view)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="854"/>
+ <location filename="../CMainWindow.cpp" line="896"/>
<source>Select file to load</source>
<translation type="unfinished"></translation>
</message>
@@ -2580,8 +2665,12 @@ If it's no fun, why don't you provide maps? Well to host maps ready fo
</message>
<message>
<location filename="../map/CMapIMG.cpp" line="730"/>
+ <source>File contains locked / encrypted data. Garmin does not want you to use this file with any other software than the one supplied by Garmin.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>File contains locked / encypted data. Garmin does not want you to use this file with any other software than the one supplied by Garmin.</source>
- <translation>El archivo contiene datos bloqueados/cifrados. Garmin no quiere que use este archivo con otros programas distintos a los que ellos proporcionan.</translation>
+ <translation type="vanished">El archivo contiene datos bloqueados/cifrados. Garmin no quiere que use este archivo con otros programas distintos a los que ellos proporcionan.</translation>
</message>
<message>
<location filename="../map/CMapIMG.cpp" line="2305"/>
@@ -2878,14 +2967,17 @@ Estructura desconocida.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseEditArea.cpp" line="100"/>
+ <location filename="../mouse/CMouseEditArea.cpp" line="96"/>
+ <source>area</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Edit name...</source>
- <translation type="unfinished">Editar nombre...</translation>
+ <translation type="obsolete">Editar nombre...</translation>
</message>
<message>
- <location filename="../mouse/CMouseEditArea.cpp" line="100"/>
<source>Enter new area name.</source>
- <translation type="unfinished">Introduzca el nombre del nuevo área.</translation>
+ <translation type="obsolete">Introduzca el nombre del nuevo área.</translation>
</message>
</context>
<context>
@@ -2902,14 +2994,13 @@ Estructura desconocida.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseEditRte.cpp" line="111"/>
- <source>Edit name...</source>
- <translation type="unfinished">Editar nombre...</translation>
+ <location filename="../mouse/CMouseEditRte.cpp" line="107"/>
+ <source>route</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseEditRte.cpp" line="111"/>
- <source>Enter new route name.</source>
- <translation type="unfinished"></translation>
+ <source>Edit name...</source>
+ <translation type="obsolete">Editar nombre...</translation>
</message>
</context>
<context>
@@ -2940,14 +3031,17 @@ Estructura desconocida.</translation>
<translation type="unfinished">Esto sustituirá todos los datos del original con una simple línea de coordenadas. Todos los demás datos se perderán definitivamente.</translation>
</message>
<message>
- <location filename="../mouse/CMouseEditTrk.cpp" line="116"/>
+ <location filename="../mouse/CMouseEditTrk.cpp" line="112"/>
+ <source>track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Edit name...</source>
- <translation type="unfinished">Editar nombre...</translation>
+ <translation type="obsolete">Editar nombre...</translation>
</message>
<message>
- <location filename="../mouse/CMouseEditTrk.cpp" line="116"/>
<source>Enter new track name.</source>
- <translation type="unfinished">Introduzca el nombre del nuevo track.</translation>
+ <translation type="obsolete">Introduzca el nombre del nuevo track.</translation>
</message>
</context>
<context>
@@ -3999,6 +4093,24 @@ línea %2, columna %3.
</message>
</context>
<context>
+ <name>CTableTrk</name>
+ <message>
+ <location filename="../gis/trk/CTableTrk.cpp" line="101"/>
+ <source>Double click to edit elevation value</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CTableTrk.cpp" line="127"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="135"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="138"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="143"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="157"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="159"/>
+ <source>%1 %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CTextEditWidget</name>
<message>
<location filename="../widgets/CTextEditWidget.cpp" line="73"/>
@@ -4049,7 +4161,7 @@ línea %2, columna %3.
<context>
<name>CWptIconDialog</name>
<message>
- <location filename="../helpers/CWptIconDialog.cpp" line="160"/>
+ <location filename="../helpers/CWptIconDialog.cpp" line="161"/>
<source>Path to user icons...</source>
<translation type="unfinished"></translation>
</message>
@@ -4520,7 +4632,7 @@ If you want to keep just one half you can simply remove the points, or check thi
</message>
<message>
<location filename="../dem/IDemList.ui" line="118"/>
- <source>To add files with elevation data use <b>File->Setup DEM Paths</b>. </source>
+ <source>To add files with elevation data use <b>File->Setup DEM Paths</b>. Or click <a href='setup'><b>here</b></a></source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -4796,79 +4908,78 @@ 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="56"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="77"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="98"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="81"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="105"/>
<source>-
-</source>
<translation>-
-</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="441"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="451"/>
<source>Use/edit user defined visibility of arrows for this track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="470"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="480"/>
<source>Use/edit system's visibility of arrows for all tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="679"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="689"/>
<source>Use/edit user defined scale factor for this track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="708"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="718"/>
<source>Use/edit system's default factor for all tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="845"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="865"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="951"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="855"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="875"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="961"/>
<source>max.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="984"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="991"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1005"/>
+ <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>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1019"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1029"/>
<source>Profile</source>
<translation>Perfil</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="535"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1037"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1134"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1231"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="545"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1047"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1144"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1241"/>
<source>User defined limits for this track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="561"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1066"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1163"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1260"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="571"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1076"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1173"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1270"/>
<source>Automatic limits</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="590"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1098"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1195"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1292"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="600"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1108"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1205"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1302"/>
<source>User defined limits for all tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1460"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1470"/>
<source>Speed</source>
<translation>Velocidad</translation>
</message>
@@ -4877,153 +4988,160 @@ If you want to keep just one half you can simply remove the points, or check thi
<translation type="obsolete">Progreso</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="277"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="287"/>
<source>Toggle read only mode. You have to open the lock to edit the item.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="280"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="444"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="473"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="538"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="564"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="593"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="682"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="711"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1040"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1069"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1101"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1137"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1166"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1198"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1234"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1263"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1295"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="290"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="454"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="483"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="548"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="574"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="603"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="692"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="721"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1050"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1079"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1111"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1147"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1176"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1208"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1244"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1273"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1305"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="255"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="265"/>
<source><html><head/><body><p>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </p></body></html></source>
<translation type="unfinished"><html><head/><body><p>El waypoint se importó en QMapShack y ha sido modificado, por lo que ya no muestra los datos originales. Por favor consulte los cambios en el histórico. </p></body></html></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="377"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="387"/>
<source>Style</source>
<translation type="unfinished">Estilo</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="419"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="429"/>
<source>Source</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="624"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="634"/>
<source>Maximum</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="764"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="774"/>
<source>Minimum</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="638"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="648"/>
<source>x </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="426"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="56"/>
+ <source>-
+-
+-</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="436"/>
<source>Width</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="631"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="641"/>
<source>with arrows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="784"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="794"/>
<source>Color</source>
<translation type="unfinished">Color</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="832"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="842"/>
<source>Graphs</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1324"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1334"/>
<source>Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1365"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1375"/>
<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="1392"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1402"/>
<source>Points</source>
<translation>Puntos</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1440"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1450"/>
<source>Time</source>
<translation>Tiempo</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1445"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1455"/>
<source>Ele.</source>
<translation>Altitud</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1450"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1460"/>
<source>Delta</source>
<translation>Delta</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1455"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1465"/>
<source>Dist.</source>
<translation>Distancia</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1465"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
<source>Slope</source>
<translation>Pendiente</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1470"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
<source>Ascend</source>
<translation>Ascenso</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1485"/>
<source>Descend</source>
<translation>Descenso</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1490"/>
<source>Position</source>
<translation>Posición</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="345"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="355"/>
<source>Info</source>
<translation>Información</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="306"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="316"/>
<source>-</source>
<translation>-</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1489"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1499"/>
<source>Filter</source>
<translation>Filtro</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1526"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1536"/>
<source>Hist.</source>
<translation>Historial</translation>
</message>
@@ -5240,7 +5358,7 @@ If you want to keep just one half you can simply remove the points, or check thi
</message>
<message>
<location filename="../gis/trk/filter/IFilterInvalid.ui" line="56"/>
- <source>Hide points with invalid coordinates at the beginning of the track.</source>
+ <source>Hide points with invalid data.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -5479,80 +5597,90 @@ If you want to keep just one half you can simply remove the points, or check thi
<context>
<name>IGisItem</name>
<message>
- <location filename="../gis/IGisItem.cpp" line="42"/>
+ <location filename="../gis/IGisItem.cpp" line="43"/>
<source>[no name]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="314"/>
+ <location filename="../gis/IGisItem.cpp" line="315"/>
<source>The item is not part of the project in the database.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="315"/>
+ <location filename="../gis/IGisItem.cpp" line="316"/>
<source>
It is either a new item or it has been deleted in the database by someone else.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="321"/>
+ <location filename="../gis/IGisItem.cpp" line="322"/>
<source>The item is not in the database.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="327"/>
+ <location filename="../gis/IGisItem.cpp" line="328"/>
<source>The item might need to be saved</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="411"/>
+ <location filename="../gis/IGisItem.cpp" line="412"/>
<source>Initial version.</source>
<translation type="unfinished">Versión inicial</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="519"/>
+ <location filename="../gis/IGisItem.cpp" line="520"/>
<source><h3>%1</h3> This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press 'Ok'.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="520"/>
+ <location filename="../gis/IGisItem.cpp" line="521"/>
<source>Read Only Mode...</source>
<translation type="unfinished">Modo Sólo Lectura...</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="684"/>
- <location filename="../gis/IGisItem.cpp" line="743"/>
+ <location filename="../gis/IGisItem.cpp" line="685"/>
+ <location filename="../gis/IGisItem.cpp" line="744"/>
<source><h4>Description:</h4></source>
<translation type="unfinished"><h4>Descripción:</h4></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="687"/>
- <location filename="../gis/IGisItem.cpp" line="746"/>
+ <location filename="../gis/IGisItem.cpp" line="688"/>
+ <location filename="../gis/IGisItem.cpp" line="747"/>
<source><p>--- no description ---</p></source>
<translation type="unfinished"><p>---sin descripción---</p></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="698"/>
+ <location filename="../gis/IGisItem.cpp" line="699"/>
<source><h4>Comment:</h4></source>
<translation type="unfinished"><h4>Comentario:</h4></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="701"/>
+ <location filename="../gis/IGisItem.cpp" line="702"/>
<source><p>--- no comment ---</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="712"/>
- <location filename="../gis/IGisItem.cpp" line="757"/>
+ <location filename="../gis/IGisItem.cpp" line="713"/>
+ <location filename="../gis/IGisItem.cpp" line="758"/>
<source><h4>Links:</h4></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="715"/>
- <location filename="../gis/IGisItem.cpp" line="760"/>
+ <location filename="../gis/IGisItem.cpp" line="716"/>
+ <location filename="../gis/IGisItem.cpp" line="761"/>
<source><p>--- no links ---</p></source>
<translation type="unfinished"><p>--- sin links ---</p></translation>
</message>
+ <message>
+ <location filename="../gis/IGisItem.cpp" line="843"/>
+ <source>Edit name...</source>
+ <translation type="unfinished">Editar nombre...</translation>
+ </message>
+ <message>
+ <location filename="../gis/IGisItem.cpp" line="843"/>
+ <source>Enter new %1 name.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>IGisProject</name>
@@ -6144,7 +6272,7 @@ Filename: %1</source>
</message>
<message>
<location filename="../map/IMapList.ui" line="103"/>
- <source>To add maps use <b>File->Setup Map Paths</b>. </source>
+ <source>To add maps use <b>File->Setup Map Paths</b>. Or click <a href='setup'><b>here</b></a></source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -6348,57 +6476,57 @@ I don't want to read the documentation!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="311"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="314"/>
<source><b>Delete Point</b><br/>Move the mouse close to a point and press the left button to delete it.<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="320"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="323"/>
<source><b>Select Range of Points</b><br/>Left click on first point to start selection. Left click second point to complete selection and choose from options. Use the right mouse button to cancel.<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="329"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
<source><b>Move Point</b><br/>Move the mouse close to a point and press the left button to make it stick to the cursor. Move the mouse to move the point. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="338"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="341"/>
<source><b>Add Point</b><br/>Move the mouse close to a line segment and press the left button to add a point. The point will stick to the cursor and you can move it. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="347"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="350"/>
<source><b>No Routing</b><br/>All points will be connected with a straight line.<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="353"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="356"/>
<source><b>Auto Routing</b><br/>The current router setup is used to derive a route between points. <b>Note:</b> The selected router must be able to route on-the-fly. Offline routers usually can do, online routers can't.<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="358"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="361"/>
<source><b>Vector Routing</b><br/>Connect points with a line from a loaded vector map if possible.<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="530"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="533"/>
<source><b>%1 Metrics</b></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="533"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="536"/>
<source>Distance:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="535"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="538"/>
<source>Ascend:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="537"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="540"/>
<source>Descend:</source>
<translation type="unfinished"></translation>
</message>
@@ -7096,6 +7224,7 @@ o
<location filename="../gis/rte/IScrOptRte.ui" line="106"/>
<location filename="../gis/rte/IScrOptRte.ui" line="120"/>
<location filename="../gis/rte/IScrOptRte.ui" line="134"/>
+ <location filename="../gis/rte/IScrOptRte.ui" line="148"/>
<source>...</source>
<translation>...</translation>
</message>
@@ -7134,7 +7263,12 @@ o
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/IScrOptRte.ui" line="160"/>
+ <location filename="../gis/rte/IScrOptRte.ui" line="145"/>
+ <source>Convert route to track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/IScrOptRte.ui" line="174"/>
<source>TextLabel</source>
<translation type="unfinished"></translation>
</message>
@@ -7159,9 +7293,9 @@ o
<location filename="../mouse/IScrOptSelect.ui" line="176"/>
<location filename="../mouse/IScrOptSelect.ui" line="205"/>
<location filename="../mouse/IScrOptSelect.ui" line="265"/>
- <location filename="../mouse/IScrOptSelect.ui" line="291"/>
- <location filename="../mouse/IScrOptSelect.ui" line="317"/>
- <location filename="../mouse/IScrOptSelect.ui" line="343"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="292"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="319"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="346"/>
<source>...</source>
<translation type="unfinished">...</translation>
</message>
@@ -7196,17 +7330,17 @@ o
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="288"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="289"/>
<source>Add waypoints to selection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="314"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="316"/>
<source>Add routes to selection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="340"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="343"/>
<source>Add areas to selection.</source>
<translation type="unfinished"></translation>
</message>
@@ -8069,7 +8203,7 @@ o
</message>
<message>
<location filename="../helpers/IWptIconDialog.ui" line="95"/>
- <source>All custom icons have to be *.bmp format.</source>
+ <source>All custom icons have to be *.bmp or *.png format.</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/src/locale/qmapshack_fr.ts b/src/locale/qmapshack_fr.ts
index e5e2609..bca52b4 100644
--- a/src/locale/qmapshack_fr.ts
+++ b/src/locale/qmapshack_fr.ts
@@ -174,14 +174,17 @@
<context>
<name>CCreateRouteFromWpt</name>
<message>
- <location filename="../gis/rte/CCreateRouteFromWpt.cpp" line="65"/>
<source>Edit name...</source>
- <translation type="unfinished">Éditer le nom...</translation>
+ <translation type="obsolete">Éditer le nom...</translation>
</message>
<message>
- <location filename="../gis/rte/CCreateRouteFromWpt.cpp" line="65"/>
<source>Enter new route name.</source>
- <translation type="unfinished">Entrez le nom de la nouvelle route.</translation>
+ <translation type="obsolete">Entrez le nom de la nouvelle route.</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/CCreateRouteFromWpt.cpp" line="68"/>
+ <source>route</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -438,7 +441,7 @@ To solve this conflict you can create and save a clone, force your version or dr
<name>CDetailsPrj</name>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="270"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="738"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="791"/>
<source>none</source>
<translation>aucun</translation>
</message>
@@ -459,18 +462,18 @@ To solve this conflict you can create and save a clone, force your version or dr
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="453"/>
<location filename="../gis/prj/CDetailsPrj.cpp" line="479"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="583"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="673"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="703"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="608"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="726"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="756"/>
<source>Info</source>
<translation>Information</translation>
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="454"/>
<location filename="../gis/prj/CDetailsPrj.cpp" line="480"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="584"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="674"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="704"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="609"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="727"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="757"/>
<source>Comment</source>
<translation>Commentaire</translation>
</message>
@@ -480,7 +483,37 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation><h2>Traces</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="666"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+ <source>From Start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+ <source>To Next</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+ <source>To End</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="630"/>
+ <source>distance: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="640"/>
+ <source>ascent: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="650"/>
+ <source>descend: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="719"/>
<source><h2>Areas</h2></source>
<translation><h2>Surfaces</h2></translation>
</message>
@@ -500,49 +533,46 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation>Résumé de toutes les traces du projet</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="602"/>
<source>distance: %1%2</source>
- <translation>distance : %1%2</translation>
+ <translation type="vanished">distance : %1%2</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="604"/>
<source>ascent: %1%2</source>
- <translation>montée : %1%2</translation>
+ <translation type="vanished">montée : %1%2</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="606"/>
<source>descend: %1%2</source>
- <translation>descente : %1%2</translation>
+ <translation type="vanished">descente : %1%2</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="696"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="749"/>
<source><h2>Routes</h2></source>
<translation><h2>Routes</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="724"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="777"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="804"/>
<source>Edit name...</source>
<translation>Éditer le nom...</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="724"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="777"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="804"/>
<source>Enter new project name.</source>
<translation>Entrez le nom du nouveau projet.</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="733"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="786"/>
<source>Edit keywords...</source>
<translation>Éditer les mots-clés...</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="733"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="786"/>
<source>Enter keywords.</source>
<translation>Saisir les mots-clés.</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="882"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="935"/>
<source>Print Diary</source>
<translation>Imprimer le journal</translation>
</message>
@@ -598,22 +628,12 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation>Découper la trace</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="410"/>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="418"/>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="421"/>
<location filename="../gis/trk/CDetailsTrk.cpp" line="426"/>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="440"/>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="442"/>
- <source>%1 %2</source>
- <translation></translation>
- </message>
- <message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="507"/>
<source>Color</source>
<translation>Couleur</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="508"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="427"/>
<source>Activity</source>
<translation type="unfinished"></translation>
</message>
@@ -626,17 +646,17 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation type="obsolete">Entrez le nom de la nouvelle trace.</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="741"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="651"/>
<source>Reset activities...</source>
<translation>Réinitialiser les activités...</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="741"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="651"/>
<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>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="747"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="657"/>
<source>None</source>
<translation>Aucune</translation>
</message>
@@ -665,7 +685,7 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation type="unfinished">Image%1</translation>
</message>
<message>
- <location filename="../gis/gpx/serialization.cpp" line="1038"/>
+ <location filename="../gis/gpx/serialization.cpp" line="1040"/>
<source>Unknown</source>
<translation type="unfinished">Inconnu</translation>
</message>
@@ -686,7 +706,7 @@ To solve this conflict you can create and save a clone, force your version or dr
<context>
<name>CElevationDialog</name>
<message>
- <location filename="../helpers/CElevationDialog.cpp" line="83"/>
+ <location filename="../helpers/CElevationDialog.cpp" line="92"/>
<source>No DEM data found for that point.</source>
<translation>Pas de données DEM disponibles pour ce point.</translation>
</message>
@@ -739,13 +759,12 @@ To solve this conflict you can create and save a clone, force your version or dr
<context>
<name>CFitProject</name>
<message>
- <location filename="../gis/fit/CFitProject.cpp" line="44"/>
- <location filename="../gis/fit/CFitProject.cpp" line="62"/>
+ <location filename="../gis/fit/CFitProject.cpp" line="61"/>
<source>Failed to load file %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/fit/CFitProject.cpp" line="86"/>
+ <location filename="../gis/fit/CFitProject.cpp" line="91"/>
<source>Failed to open FIT file %1.</source>
<translation type="unfinished"></translation>
</message>
@@ -863,68 +882,78 @@ To solve this conflict you can create and save a clone, force your version or dr
<context>
<name>CGisItemRte</name>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="63"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="65"/>
<source>_Clone</source>
<translation type="unfinished">_Clone</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="249"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="284"/>
+ <source>track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="311"/>
<source>Changed name.</source>
<translation type="unfinished">Nom modifié...</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="255"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="317"/>
<source>Changed comment</source>
<translation type="unfinished">Commentaire modifié</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="261"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="323"/>
<source>Changed description</source>
<translation type="unfinished">Description modifiée</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="267"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="329"/>
<source>Changed links</source>
<translation type="unfinished">Liens modifiés...</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="285"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="347"/>
<source>Length: %1 %2</source>
<translation type="unfinished">Longueur: %1 %2</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="289"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
<source>Length: -</source>
<translation type="unfinished">Longueur: -</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="296"/>
- <location filename="../gis/rte/CGisItemRte.cpp" line="485"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="559"/>
<source>Time: %1 %2</source>
<translation type="unfinished">Durée: %1 %2</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="300"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
<source>Time: -</source>
<translation type="unfinished">Heure : -</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="306"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="372"/>
+ <source>%1%2 %3, %4%5 %6</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="378"/>
<source>Last time routed:<br/>%1</source>
<translation type="unfinished">Date du dernier calcul d'itinéraire : <br/>%1</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="308"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="380"/>
<source>with %1</source>
<translation type="unfinished">avec %1</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="487"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="561"/>
<source>Distance: %1 %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="601"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="675"/>
<source>Changed route points.</source>
<translation type="unfinished">Points de route modifiés.</translation>
</message>
@@ -932,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="182"/>
+ <location filename="../gis/fit/serialization.cpp" line="247"/>
<source>FIT file %1 contains no GPS data.</source>
<translation type="unfinished"></translation>
</message>
@@ -973,12 +1002,12 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation type="unfinished">Points de la trace modifiés, Les données antérieures sont perdues.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="401"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="394"/>
<source>Length: %1 %2</source>
<translation type="unfinished">Longueur: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="408"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="401"/>
<source>, %1%2 %3, %4%5 %6</source>
<translation type="unfinished"></translation>
</message>
@@ -995,77 +1024,121 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation type="obsolete">Déplacement: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="428"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="435"/>
<source>Start: %1</source>
<translation type="unfinished">Début: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="432"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="439"/>
+ <source>Start: -</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="445"/>
<source>End: %1</source>
<translation type="unfinished">Fin: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="435"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="449"/>
+ <source>End: -</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="453"/>
<source>Points: %1 (%2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="527"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="457"/>
+ <source>Invalid elevations!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="462"/>
+ <source>Invalid timestamps!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="467"/>
+ <source>Invalid positions!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="558"/>
+ <source>Index: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="562"/>
+ <source>Index: visible %1, total %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="573"/>
<source>Ele.: %1 %2</source>
<translation type="unfinished">Altitude: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="530"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
<source> slope: %1%3 (%2%)</source>
<translation type="unfinished"> Pente: %1%3(%2%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="535"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
<source> speed: %1%2</source>
<translation type="unfinished"> Vitesse: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="563"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
<source>... and %1 tags not displayed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="574"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
<source>Descend: - (-)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="575"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
<source>Distance: - (-)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="622"/>
<source>Moving: - (-)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="627"/>
<source>Ascend: %1%2 (%3%)</source>
<translation type="unfinished">Montée: %1%2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1441"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1317"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1330"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1390"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1434"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1599"/>
+ <source>track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1535"/>
<source>Hide point %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1445"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1539"/>
<source>Hide points %1..%2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="573"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="619"/>
<source>Ascend: - (-)</source>
<translation type="unfinished">Montées: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="587"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="633"/>
<source> Descend: %1%2 (%3%)</source>
<translation type="unfinished"> Descente: %1%2 (%3%)</translation>
</message>
@@ -1082,7 +1155,7 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation type="obsolete">Dist.: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="599"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="645"/>
<source> Moving: %1%2 (%3%)</source>
<translation type="unfinished"> En mouvement: %1%2 (%3%)</translation>
</message>
@@ -1091,28 +1164,28 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation type="obsolete">En mouvement: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="667"/>
<source>Ascend: %1%2</source>
<translation type="unfinished">Montée : %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="672"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="684"/>
<source>, %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="615"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="661"/>
<source>Ascend: -</source>
<translation type="unfinished">Montée : -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="633"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="679"/>
<source> Descend: %1%2</source>
<translation type="unfinished">Descente : %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="616"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="662"/>
<source>Descend: -</source>
<translation type="unfinished">Descente : -</translation>
</message>
@@ -1121,42 +1194,55 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation type="obsolete">Dist.: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="694"/>
<source> Time: %1%2</source>
<translation type="unfinished"> Temps : %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
<source>Edit name...</source>
- <translation type="unfinished">Éditer le nom...</translation>
+ <translation type="obsolete">Éditer le nom...</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
<source>Enter new track name.</source>
- <translation type="unfinished">Entrez le nom de la nouvelle trace.</translation>
+ <translation type="obsolete">Entrez le nom de la nouvelle trace.</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="405"/>
+ <source>, %1-, %2-</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="416"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="413"/>
<source>Time: %1, Speed: %2 %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="423"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="417"/>
+ <source>Time: -, Speed: -</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="425"/>
<source>Moving: %1, Speed: %2 %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="593"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="429"/>
+ <source>Moving: -, Speed: -</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="639"/>
<source>Distance: %1%2 (%3%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="643"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
<source>Distance: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1286"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1380"/>
<source>Permanently removed points %1..%2</source>
<translation type="unfinished"></translation>
</message>
@@ -1165,37 +1251,42 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation type="obsolete">Cacher des points.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1485"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1579"/>
<source>Show points.</source>
<translation type="unfinished">Afficher les points.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2040"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2142"/>
<source>Changed name</source>
<translation type="unfinished">Nom modifié</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2046"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2148"/>
<source>Changed comment</source>
<translation type="unfinished">Commentaire modifié</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2052"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2154"/>
<source>Changed description</source>
<translation type="unfinished">Description modifiée</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2058"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2160"/>
<source>Changed links</source>
<translation type="unfinished">Liens modifiés...</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2085"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2171"/>
+ <source>Changed elevation of point %1 to %2 %3</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2198"/>
<source>Changed activity to '%1' for complete track.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2143"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2256"/>
<source>Changed activity to '%1' for range(%2..%3).</source>
<translation type="unfinished"></translation>
</message>
@@ -1205,62 +1296,62 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation type="unfinished">Cacher des points avec l'algorithme Douglas Peuker (%1%2)</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="143"/>
- <source>Hide points with invalid coordinates at the beginning of the track</source>
+ <location filename="../gis/trk/filter/filter.cpp" line="141"/>
+ <source>Hide points with invalid data.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="159"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="157"/>
<source>Reset all hidden track points to visible</source>
<translation type="unfinished">Restaurer les points cachés</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="193"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="191"/>
<source>Permanently removed all hidden track points</source>
<translation type="unfinished">Supprimer définitivement tous les points cachés</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="243"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="241"/>
<source>Smoothed profile with a Median filter of size %1</source>
<translation type="unfinished">Profile lissé avec un filtre médian de dimension %1</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="279"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="277"/>
<source>Replaced elevation data with data from DEM files.</source>
<translation type="unfinished">Les altitudes ont été remplacées par les données DEM</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="302"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="300"/>
<source>Offset elevation data by %1%2.</source>
<translation type="unfinished">Décaler les altitudes de %1%2.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="321"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="319"/>
<source>Changed start of track to %1.</source>
<translation type="unfinished">Début de la trace modifié à %1.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="340"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="338"/>
<source>Remove timestamps.</source>
<translation type="unfinished">Horodatage Supprimé.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="363"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="361"/>
<source>Set artificial timestamps with delta of %1 sec.</source>
<translation type="unfinished">Horodatage artificiel ajouté avec un décalage de %1 sec.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="396"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="393"/>
<source>Changed speed to %1%2.</source>
<translation type="unfinished">Vitesse modifiée à %1%2.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="415"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="412"/>
<source>%1 (Segment %2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="438"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="435"/>
<source>Removed extension %1 from all Track Points</source>
<translation type="unfinished"></translation>
</message>
@@ -1273,17 +1364,17 @@ To solve this conflict you can create and save a clone, force your version or dr
<context>
<name>CGisItemWpt</name>
<message>
- <location filename="../gis/gpx/serialization.cpp" line="588"/>
+ <location filename="../gis/gpx/serialization.cpp" line="590"/>
<source>Archived</source>
<translation type="unfinished">Archivé</translation>
</message>
<message>
- <location filename="../gis/gpx/serialization.cpp" line="592"/>
+ <location filename="../gis/gpx/serialization.cpp" line="594"/>
<source>Available</source>
<translation type="unfinished">Disponible</translation>
</message>
<message>
- <location filename="../gis/gpx/serialization.cpp" line="596"/>
+ <location filename="../gis/gpx/serialization.cpp" line="598"/>
<source>Not Available</source>
<translation type="unfinished">Non disponible</translation>
</message>
@@ -1580,47 +1671,52 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation>Éditer la route</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="174"/>
+ <location filename="../gis/CGisListWks.cpp" line="166"/>
+ <source>Convert to Track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="175"/>
<source>Edit Area Points</source>
<translation>Éditer les points de la surface</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="181"/>
+ <location filename="../gis/CGisListWks.cpp" line="182"/>
<source>Create Route</source>
<translation>Créer une route</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="625"/>
+ <location filename="../gis/CGisListWks.cpp" line="626"/>
<source>Drop items...</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="779"/>
+ <location filename="../gis/CGisListWks.cpp" line="780"/>
<source>Saving workspace. Please wait.</source>
<translation>Sauvegarde de l'espace de travail. Patientez.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="825"/>
+ <location filename="../gis/CGisListWks.cpp" line="826"/>
<source>Loading workspace. Please wait.</source>
<translation>Chargement de l'espace de travail. Patientez.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1142"/>
+ <location filename="../gis/CGisListWks.cpp" line="1143"/>
<source>Close all projects...</source>
<translation>Fermer tous les projets...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1142"/>
+ <location filename="../gis/CGisListWks.cpp" line="1143"/>
<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="1165"/>
+ <location filename="../gis/CGisListWks.cpp" line="1166"/>
<source>Delete project...</source>
<translation type="unfinished">Supprimer le projet</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1165"/>
+ <location filename="../gis/CGisListWks.cpp" line="1166"/>
<source>Do you really want to delete %1?</source>
<translation type="unfinished">Êtes-vous sûr de vouloir supprimer %1?</translation>
</message>
@@ -1629,9 +1725,9 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation type="obsolete">Copier les éléments...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="650"/>
- <location filename="../gis/CGisListWks.cpp" line="1581"/>
- <location filename="../gis/CGisListWks.cpp" line="1619"/>
+ <location filename="../gis/CGisListWks.cpp" line="651"/>
+ <location filename="../gis/CGisListWks.cpp" line="1593"/>
+ <location filename="../gis/CGisListWks.cpp" line="1631"/>
<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>
@@ -1654,12 +1750,12 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation type="unfinished">Copier les éléments...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="645"/>
+ <location filename="../gis/CGisWidget.cpp" line="657"/>
<source>Cut Track...</source>
<translation>Couper la trace...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="645"/>
+ <location filename="../gis/CGisWidget.cpp" line="657"/>
<source>Do you want to delete the original track?</source>
<translation>Voulez-vous supprimer la trace originale?</translation>
</message>
@@ -1698,17 +1794,17 @@ ligne %2, colonne %3:
<context>
<name>CGpxProject</name>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="90"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="91"/>
<source>Failed to load file %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="112"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="113"/>
<source>Failed to open %1</source>
<translation type="unfinished">Impossible d'ouvrir %1 {1?}</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="124"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="125"/>
<source>Failed to read: %1
line %2, column %3:
%4</source>
@@ -1717,32 +1813,32 @@ ligne %2, colonne %3:
%4</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="132"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="133"/>
<source>Not a GPX file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="238"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="258"/>
<source>File exists ...</source>
<translation type="unfinished">Le fichier existe...</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="239"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="259"/>
<source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains GPX data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file. Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
<translation type="unfinished">Le fichier existe et n'a pas été créé par QMapShack. Si vous cliquez sur 'oui' tous les données de ce fichier seront perdues. Même si ce fichier contient des données GPX et sera ouvert par QMapShack certains éléments de ce fichier ne pourront pas être lus ou enregistrés. Ces élements seront perdus. Il est conseillé d'utiliser un autre fichier.<b>Voulez-vous vraiment écraser ce fichier ?</b> </translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="347"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="367"/>
<source>Failed to create file '%1'</source>
<translation type="unfinished">Impossible de créer le fichier: '%1'</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="357"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="377"/>
<source>Failed to write file '%1'</source>
<translation type="unfinished">Impossible d'écrire le fichier: '%1'</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="362"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="382"/>
<source>Saving GIS data failed...</source>
<translation type="unfinished"></translation>
</message>
@@ -1812,64 +1908,64 @@ ligne %2, colonne %3:
<context>
<name>CKnownExtension</name>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="45"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="62"/>
<source>Air Temperature</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="49"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="66"/>
<source>Water Temperature</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="53"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="70"/>
<source>Depth</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="57"/>
- <location filename="../gis/trk/CKnownExtension.cpp" line="69"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="74"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="86"/>
<source>Heart Rate</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="61"/>
- <location filename="../gis/trk/CKnownExtension.cpp" line="73"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="78"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="90"/>
<source>Cadence</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="77"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="94"/>
<source>Speed</source>
<translation type="unfinished">Vitesse</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="81"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="98"/>
<source>Acceleration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="85"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="102"/>
<source>Course</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="94"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="111"/>
<source>Slope*</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="99"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
<source>Speed*</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="104"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="121"/>
<source>Elevation</source>
<translation type="unfinished">Altitude</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="109"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="126"/>
<source>Progress</source>
<translation type="unfinished">Progrès</translation>
</message>
@@ -1885,33 +1981,38 @@ ligne %2, colonne %3:
<context>
<name>CMainWindow</name>
<message>
- <location filename="../CMainWindow.cpp" line="643"/>
+ <location filename="../CMainWindow.cpp" line="557"/>
+ <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="685"/>
<source>Ele: %1%2</source>
<translation>Altitude: %1%2</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="659"/>
+ <location filename="../CMainWindow.cpp" line="701"/>
<source>[Grid: %1]</source>
<translation>[Grille: %1]</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="794"/>
+ <location filename="../CMainWindow.cpp" line="836"/>
<source>Load GIS Data...</source>
<translation>Charger des données SIG...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="828"/>
+ <location filename="../CMainWindow.cpp" line="870"/>
<source>Select output file</source>
<translation>Sélectionner le fichier de sortie</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="828"/>
- <location filename="../CMainWindow.cpp" line="854"/>
+ <location filename="../CMainWindow.cpp" line="870"/>
+ <location filename="../CMainWindow.cpp" line="896"/>
<source>QMapShack View (*.view)</source>
<translation>Vue QMapShack (*.view)</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="854"/>
+ <location filename="../CMainWindow.cpp" line="896"/>
<source>Select file to load</source>
<translation>Sélectionner le fichier à charger</translation>
</message>
@@ -2529,8 +2630,12 @@ If it's no fun, why don't you provide maps? Well to host maps ready fo
</message>
<message>
<location filename="../map/CMapIMG.cpp" line="730"/>
+ <source>File contains locked / encrypted data. Garmin does not want you to use this file with any other software than the one supplied by Garmin.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>File contains locked / encypted data. Garmin does not want you to use this file with any other software than the one supplied by Garmin.</source>
- <translation>Le fichier contient des données verrouillées / cryptées. Garmin ne vous autorise pas d'utiliser ce fichier avec un logiciel non fourni par Garmin.</translation>
+ <translation type="vanished">Le fichier contient des données verrouillées / cryptées. Garmin ne vous autorise pas d'utiliser ce fichier avec un logiciel non fourni par Garmin.</translation>
</message>
<message>
<location filename="../map/CMapIMG.cpp" line="2305"/>
@@ -2827,14 +2932,17 @@ 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="100"/>
+ <location filename="../mouse/CMouseEditArea.cpp" line="96"/>
+ <source>area</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Edit name...</source>
- <translation type="unfinished">Éditer le nom...</translation>
+ <translation type="obsolete">Éditer le nom...</translation>
</message>
<message>
- <location filename="../mouse/CMouseEditArea.cpp" line="100"/>
<source>Enter new area name.</source>
- <translation type="unfinished">Entrez le nom de la nouvelle surface.</translation>
+ <translation type="obsolete">Entrez le nom de la nouvelle surface.</translation>
</message>
</context>
<context>
@@ -2851,14 +2959,17 @@ 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="111"/>
+ <location filename="../mouse/CMouseEditRte.cpp" line="107"/>
+ <source>route</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Edit name...</source>
- <translation type="unfinished">Éditer le nom...</translation>
+ <translation type="obsolete">Éditer le nom...</translation>
</message>
<message>
- <location filename="../mouse/CMouseEditRte.cpp" line="111"/>
<source>Enter new route name.</source>
- <translation type="unfinished">Entrez le nom de la nouvelle route.</translation>
+ <translation type="obsolete">Entrez le nom de la nouvelle route.</translation>
</message>
</context>
<context>
@@ -2889,14 +3000,17 @@ 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="116"/>
+ <location filename="../mouse/CMouseEditTrk.cpp" line="112"/>
+ <source>track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Edit name...</source>
- <translation type="unfinished">Éditer le nom...</translation>
+ <translation type="obsolete">Éditer le nom...</translation>
</message>
<message>
- <location filename="../mouse/CMouseEditTrk.cpp" line="116"/>
<source>Enter new track name.</source>
- <translation type="unfinished">Entrez le nom de la nouvelle trace.</translation>
+ <translation type="obsolete">Entrez le nom de la nouvelle trace.</translation>
</message>
<message>
<source>This will replace all data of the orignal by a simple line of coordinates. All other data will be lost permanently.</source>
@@ -3925,6 +4039,24 @@ ligne %2, colonne %3:
</message>
</context>
<context>
+ <name>CTableTrk</name>
+ <message>
+ <location filename="../gis/trk/CTableTrk.cpp" line="101"/>
+ <source>Double click to edit elevation value</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CTableTrk.cpp" line="127"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="135"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="138"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="143"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="157"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="159"/>
+ <source>%1 %2</source>
+ <translation type="unfinished">%1 %2</translation>
+ </message>
+</context>
+<context>
<name>CTextEditWidget</name>
<message>
<location filename="../widgets/CTextEditWidget.cpp" line="73"/>
@@ -3975,7 +4107,7 @@ ligne %2, colonne %3:
<context>
<name>CWptIconDialog</name>
<message>
- <location filename="../helpers/CWptIconDialog.cpp" line="160"/>
+ <location filename="../helpers/CWptIconDialog.cpp" line="161"/>
<source>Path to user icons...</source>
<translation type="unfinished"></translation>
</message>
@@ -4447,7 +4579,7 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
</message>
<message>
<location filename="../dem/IDemList.ui" line="118"/>
- <source>To add files with elevation data use <b>File->Setup DEM Paths</b>. </source>
+ <source>To add files with elevation data use <b>File->Setup DEM Paths</b>. Or click <a href='setup'><b>here</b></a></source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -4719,36 +4851,35 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="56"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="77"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="98"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="81"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="105"/>
<source>-
-</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="345"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="355"/>
<source>Info</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="280"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="444"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="473"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="538"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="564"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="593"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="682"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="711"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1040"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1069"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1101"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1137"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1166"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1198"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1234"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1263"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1295"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="290"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="454"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="483"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="548"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="574"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="603"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="692"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="721"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1050"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1079"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1111"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1147"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1176"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1208"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1244"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1273"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1305"/>
<source>...</source>
<translation></translation>
</message>
@@ -4757,12 +4888,12 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
<translation type="obsolete">Contrôle du graphe</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1019"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1029"/>
<source>Profile</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1460"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1470"/>
<source>Speed</source>
<translation>Vitesse</translation>
</message>
@@ -4775,57 +4906,57 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
<translation type="obsolete">Trace</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="277"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="287"/>
<source>Toggle read only mode. You have to open the lock to edit the item.</source>
<translation>Inverser le mode lecture seule. Ouvrez le cadenas pour pouvoir éditer l'objet.</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="255"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="265"/>
<source><html><head/><body><p>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </p></body></html></source>
<translation><html><head/><body><p>Le waypoint a été importé dans QMapShack et a été modifié. Il ne représente plus les données originales. Veuillez consulter l'historique pour voir les modifications. </p></body></html></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="306"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="316"/>
<source>-</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="377"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="387"/>
<source>Style</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="419"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="429"/>
<source>Source</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="624"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="634"/>
<source>Maximum</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="441"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="451"/>
<source>Use/edit user defined visibility of arrows for this track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="470"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="480"/>
<source>Use/edit system's visibility of arrows for all tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="764"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="774"/>
<source>Minimum</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="679"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="689"/>
<source>Use/edit user defined scale factor for this track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="708"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="718"/>
<source>Use/edit system's default factor for all tracks</source>
<translation type="unfinished"></translation>
</message>
@@ -4834,130 +4965,137 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
<translation type="obsolete">Couleur unie</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="638"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="648"/>
<source>x </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="426"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="436"/>
<source>Width</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="631"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="641"/>
<source>with arrows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="832"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="842"/>
<source>Graphs</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="845"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="865"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="951"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="855"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="875"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="961"/>
<source>max.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="984"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="991"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1005"/>
+ <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>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="535"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1037"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1134"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1231"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="545"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1047"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1144"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1241"/>
<source>User defined limits for this track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="561"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1066"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1163"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1260"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="56"/>
+ <source>-
+-
+-</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="571"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1076"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1173"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1270"/>
<source>Automatic limits</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="590"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1098"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1195"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1292"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="600"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1108"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1205"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1302"/>
<source>User defined limits for all tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="784"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="794"/>
<source>Color</source>
<translation type="unfinished">Couleur</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1324"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1334"/>
<source>Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1365"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1375"/>
<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="1392"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1402"/>
<source>Points</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1440"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1450"/>
<source>Time</source>
<translation>Durée</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1445"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1455"/>
<source>Ele.</source>
<translation>Alt.</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1450"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1460"/>
<source>Delta</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1455"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1465"/>
<source>Dist.</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1465"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
<source>Slope</source>
<translation>Pente</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1470"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
<source>Ascend</source>
<translation>Montée</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1485"/>
<source>Descend</source>
<translation>Descente</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1490"/>
<source>Position</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1489"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1499"/>
<source>Filter</source>
<translation>Filtre</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1526"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1536"/>
<source>Hist.</source>
<translation></translation>
</message>
@@ -5174,8 +5312,12 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
</message>
<message>
<location filename="../gis/trk/filter/IFilterInvalid.ui" line="56"/>
+ <source>Hide points with invalid data.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Hide points with invalid coordinates at the beginning of the track.</source>
- <translation>Cacher les points aux coordonnées invalides du début de la trace.</translation>
+ <translation type="vanished">Cacher les points aux coordonnées invalides du début de la trace.</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterInvalid.ui" line="63"/>
@@ -5413,80 +5555,90 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
<context>
<name>IGisItem</name>
<message>
- <location filename="../gis/IGisItem.cpp" line="42"/>
+ <location filename="../gis/IGisItem.cpp" line="43"/>
<source>[no name]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="314"/>
+ <location filename="../gis/IGisItem.cpp" line="315"/>
<source>The item is not part of the project in the database.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="315"/>
+ <location filename="../gis/IGisItem.cpp" line="316"/>
<source>
It is either a new item or it has been deleted in the database by someone else.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="321"/>
+ <location filename="../gis/IGisItem.cpp" line="322"/>
<source>The item is not in the database.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="327"/>
+ <location filename="../gis/IGisItem.cpp" line="328"/>
<source>The item might need to be saved</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="411"/>
+ <location filename="../gis/IGisItem.cpp" line="412"/>
<source>Initial version.</source>
<translation type="unfinished">Version initiale</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="519"/>
+ <location filename="../gis/IGisItem.cpp" line="520"/>
<source><h3>%1</h3> This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press 'Ok'.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="520"/>
+ <location filename="../gis/IGisItem.cpp" line="521"/>
<source>Read Only Mode...</source>
<translation type="unfinished">Mode lecture seule</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="684"/>
- <location filename="../gis/IGisItem.cpp" line="743"/>
+ <location filename="../gis/IGisItem.cpp" line="685"/>
+ <location filename="../gis/IGisItem.cpp" line="744"/>
<source><h4>Description:</h4></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="687"/>
- <location filename="../gis/IGisItem.cpp" line="746"/>
+ <location filename="../gis/IGisItem.cpp" line="688"/>
+ <location filename="../gis/IGisItem.cpp" line="747"/>
<source><p>--- no description ---</p></source>
<translation type="unfinished"><p>--- pas de description ---</p></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="698"/>
+ <location filename="../gis/IGisItem.cpp" line="699"/>
<source><h4>Comment:</h4></source>
<translation type="unfinished"><h4>Commentaire:</h4></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="701"/>
+ <location filename="../gis/IGisItem.cpp" line="702"/>
<source><p>--- no comment ---</p></source>
<translation type="unfinished"><p>--- pas de commentaire ---</p></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="712"/>
- <location filename="../gis/IGisItem.cpp" line="757"/>
+ <location filename="../gis/IGisItem.cpp" line="713"/>
+ <location filename="../gis/IGisItem.cpp" line="758"/>
<source><h4>Links:</h4></source>
<translation type="unfinished"><h4>Liens:</h4></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="715"/>
- <location filename="../gis/IGisItem.cpp" line="760"/>
+ <location filename="../gis/IGisItem.cpp" line="716"/>
+ <location filename="../gis/IGisItem.cpp" line="761"/>
<source><p>--- no links ---</p></source>
<translation type="unfinished"><p>--- pas de liens ---</p></translation>
</message>
+ <message>
+ <location filename="../gis/IGisItem.cpp" line="843"/>
+ <source>Edit name...</source>
+ <translation type="unfinished">Éditer le nom...</translation>
+ </message>
+ <message>
+ <location filename="../gis/IGisItem.cpp" line="843"/>
+ <source>Enter new %1 name.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>IGisProject</name>
@@ -6067,7 +6219,7 @@ Nom de fichier: %1</translation>
</message>
<message>
<location filename="../map/IMapList.ui" line="103"/>
- <source>To add maps use <b>File->Setup Map Paths</b>. </source>
+ <source>To add maps use <b>File->Setup Map Paths</b>. Or click <a href='setup'><b>here</b></a></source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -6273,57 +6425,57 @@ Je n'ai pas envie de lire la documentation !</translation>
<translation><b>Nouvelle ligne</b><br/>Déplacez la souris et utilisez le bouton gauche pour ajouter des points. Cliquez droit pour terminer.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="311"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="314"/>
<source><b>Delete Point</b><br/>Move the mouse close to a point and press the left button to delete it.<br/></source>
<translation><b>Supprimer un point</b><br/>Approchez le pointeur du point et cliquez gauche pour le supprimer.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="320"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="323"/>
<source><b>Select Range of Points</b><br/>Left click on first point to start selection. Left click second point to complete selection and choose from options. Use the right mouse button to cancel.<br/></source>
<translation><b>Sélectionner une série de points</b><br/> Pour commencer la sélection, cliquez gauche sur le premier point. Cliquez gauche sur le sur le deuxième point pour terminer la sélection et choisissez une option. Utilisez le bouton droit pour annuler.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="329"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
<source><b>Move Point</b><br/>Move the mouse close to a point and press the left button to make it stick to the cursor. Move the mouse to move the point. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
<translation><b>Déplacer un point</b><br/>Approchez le pointeur près d'un point et cliquez gauche pour le coller au pointeur. Déplacez le point avec la souris. Déposez le point avec un clic gauche. Utilisez le bouton droit pour annuler.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="338"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="341"/>
<source><b>Add Point</b><br/>Move the mouse close to a line segment and press the left button to add a point. The point will stick to the cursor and you can move it. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
<translation><b>Ajouter un point</b><br/>Placez le pointeur de la souris près d'un segment de ligne et cliquez gauche pour ajouter un point. Le nouveau point va coller au pointeur et vous pouvez le déplacer. Déposez le point par un clic gauche. Utilisez le clic droit pour annuler.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="347"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="350"/>
<source><b>No Routing</b><br/>All points will be connected with a straight line.<br/></source>
<translation><b>Aucun calcul d'itinéraire</b><br/>Les points seront connectés par une ligne droite.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="353"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="356"/>
<source><b>Auto Routing</b><br/>The current router setup is used to derive a route between points. <b>Note:</b> The selected router must be able to route on-the-fly. Offline routers usually can do, online routers can't.<br/></source>
<translation><b>Calcul d'itinéraire automatique</b><br/>Les paramètres de calcul d'itinéraire actuels serviront pour calculer un tracé entre les points. <b>Remarque :</b>Le routeur sélectionné doit être capable de faire le calcul à la volée. Généralement, les routeurs hors ligne en sont capables, les routeurs en ligne ne le sont pas.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="358"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="361"/>
<source><b>Vector Routing</b><br/>Connect points with a line from a loaded vector map if possible.<br/></source>
<translation><b>Calcul d'itinéraire vecteur</b><br/>Connecter les points avec une ligne basée sur une carte vecteur active, si possible.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="530"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="533"/>
<source><b>%1 Metrics</b></source>
<translation><b>%1 Mesures</b></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="533"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="536"/>
<source>Distance:</source>
<translation>Distance:</translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="535"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="538"/>
<source>Ascend:</source>
<translation>Dénivelé positif:</translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="537"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="540"/>
<source>Descend:</source>
<translation>Dénivelé négatif:</translation>
</message>
@@ -7053,6 +7205,7 @@ or
<location filename="../gis/rte/IScrOptRte.ui" line="106"/>
<location filename="../gis/rte/IScrOptRte.ui" line="120"/>
<location filename="../gis/rte/IScrOptRte.ui" line="134"/>
+ <location filename="../gis/rte/IScrOptRte.ui" line="148"/>
<source>...</source>
<translation></translation>
</message>
@@ -7095,7 +7248,12 @@ or
<translation>Déplacer les points de la route.</translation>
</message>
<message>
- <location filename="../gis/rte/IScrOptRte.ui" line="160"/>
+ <location filename="../gis/rte/IScrOptRte.ui" line="145"/>
+ <source>Convert route to track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/IScrOptRte.ui" line="174"/>
<source>TextLabel</source>
<translation>Libellé</translation>
</message>
@@ -7120,9 +7278,9 @@ or
<location filename="../mouse/IScrOptSelect.ui" line="176"/>
<location filename="../mouse/IScrOptSelect.ui" line="205"/>
<location filename="../mouse/IScrOptSelect.ui" line="265"/>
- <location filename="../mouse/IScrOptSelect.ui" line="291"/>
- <location filename="../mouse/IScrOptSelect.ui" line="317"/>
- <location filename="../mouse/IScrOptSelect.ui" line="343"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="292"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="319"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="346"/>
<source>...</source>
<translation type="unfinished">...</translation>
</message>
@@ -7157,17 +7315,17 @@ or
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="288"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="289"/>
<source>Add waypoints to selection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="314"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="316"/>
<source>Add routes to selection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="340"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="343"/>
<source>Add areas to selection.</source>
<translation type="unfinished"></translation>
</message>
@@ -7997,7 +8155,7 @@ or
</message>
<message>
<location filename="../helpers/IWptIconDialog.ui" line="95"/>
- <source>All custom icons have to be *.bmp format.</source>
+ <source>All custom icons have to be *.bmp or *.png format.</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/src/locale/qmapshack_nl.ts b/src/locale/qmapshack_nl.ts
index ffba047..8f510f8 100644
--- a/src/locale/qmapshack_nl.ts
+++ b/src/locale/qmapshack_nl.ts
@@ -174,13 +174,12 @@
<context>
<name>CCreateRouteFromWpt</name>
<message>
- <location filename="../gis/rte/CCreateRouteFromWpt.cpp" line="65"/>
<source>Edit name...</source>
- <translation>Bewerk naam...</translation>
+ <translation type="vanished">Bewerk naam...</translation>
</message>
<message>
- <location filename="../gis/rte/CCreateRouteFromWpt.cpp" line="65"/>
- <source>Enter new route name.</source>
+ <location filename="../gis/rte/CCreateRouteFromWpt.cpp" line="68"/>
+ <source>route</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -447,7 +446,7 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="270"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="738"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="791"/>
<source>none</source>
<translation>geen</translation>
</message>
@@ -469,18 +468,18 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="453"/>
<location filename="../gis/prj/CDetailsPrj.cpp" line="479"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="583"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="673"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="703"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="608"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="726"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="756"/>
<source>Info</source>
<translation>Info</translation>
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="454"/>
<location filename="../gis/prj/CDetailsPrj.cpp" line="480"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="584"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="674"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="704"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="609"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="727"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="757"/>
<source>Comment</source>
<translation>Notitie</translation>
</message>
@@ -490,54 +489,81 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<translation><h2>Tracks</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="602"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+ <source>From Start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+ <source>To Next</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+ <source>To End</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="630"/>
+ <source>distance: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="640"/>
+ <source>ascent: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="650"/>
+ <source>descend: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>distance: %1%2</source>
- <translation>afstand:-%1%2</translation>
+ <translation type="vanished">afstand:-%1%2</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="604"/>
<source>ascent: %1%2</source>
- <translation>Stijging: %1%2</translation>
+ <translation type="vanished">Stijging: %1%2</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="606"/>
<source>descend: %1%2</source>
- <translation>daling: %1%2</translation>
+ <translation type="vanished">daling: %1%2</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="666"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="719"/>
<source><h2>Areas</h2></source>
<translation><h2>Gebieden</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="696"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="749"/>
<source><h2>Routes</h2></source>
<translation><h2>Routes</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="724"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="777"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="804"/>
<source>Edit name...</source>
<translation>Bewerk naam...</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="724"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="777"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="804"/>
<source>Enter new project name.</source>
<translation>Geef project een nieuwe naam.</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="733"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="786"/>
<source>Edit keywords...</source>
<translation>Bewerkt sleutelwoorden...</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="733"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="786"/>
<source>Enter keywords.</source>
<translation>Geef sleutelwoorden.</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="882"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="935"/>
<source>Print Diary</source>
<translation>Dagboek afdrukken</translation>
</message>
@@ -601,22 +627,16 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<translation>Knip track in delen</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="410"/>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="418"/>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="421"/>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="426"/>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="440"/>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="442"/>
<source>%1 %2</source>
- <translation>%1 %2</translation>
+ <translation type="vanished">%1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="507"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="426"/>
<source>Color</source>
<translation>Kleur</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="508"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="427"/>
<source>Activity</source>
<translation>Activiteit</translation>
</message>
@@ -629,17 +649,17 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<translation type="obsolete">Geef track nieuwe naam.</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="741"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="651"/>
<source>Reset activities...</source>
<translation>Herstel activiteiten...</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="741"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="651"/>
<source>This will remove all activities from the track. Proceed?</source>
<translation>Dit zal alle activiteiten uit de track verwijderen. Doorgaan?</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="747"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="657"/>
<source>None</source>
<translation>Geen</translation>
</message>
@@ -668,7 +688,7 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<translation>Afbeelding%1</translation>
</message>
<message>
- <location filename="../gis/gpx/serialization.cpp" line="1038"/>
+ <location filename="../gis/gpx/serialization.cpp" line="1040"/>
<source>Unknown</source>
<translation>Onbekend</translation>
</message>
@@ -689,7 +709,7 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<context>
<name>CElevationDialog</name>
<message>
- <location filename="../helpers/CElevationDialog.cpp" line="83"/>
+ <location filename="../helpers/CElevationDialog.cpp" line="92"/>
<source>No DEM data found for that point.</source>
<translation>Geen OEM gegevens gevonden voor dit punt.</translation>
</message>
@@ -742,13 +762,12 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<context>
<name>CFitProject</name>
<message>
- <location filename="../gis/fit/CFitProject.cpp" line="44"/>
- <location filename="../gis/fit/CFitProject.cpp" line="62"/>
+ <location filename="../gis/fit/CFitProject.cpp" line="61"/>
<source>Failed to load file %1...</source>
<translation>Kan bestand %1 niet laden...</translation>
</message>
<message>
- <location filename="../gis/fit/CFitProject.cpp" line="86"/>
+ <location filename="../gis/fit/CFitProject.cpp" line="91"/>
<source>Failed to open FIT file %1.</source>
<translation type="unfinished"></translation>
</message>
@@ -866,68 +885,78 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<context>
<name>CGisItemRte</name>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="63"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="65"/>
<source>_Clone</source>
<translation>_Kloon</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="249"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="284"/>
+ <source>track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="311"/>
<source>Changed name.</source>
<translation>Naam aangepast.</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="255"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="317"/>
<source>Changed comment</source>
<translation>Notitie aangepast</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="261"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="323"/>
<source>Changed description</source>
<translation>Beschrijving aangepast</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="267"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="329"/>
<source>Changed links</source>
<translation>Link aangepast</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="285"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="347"/>
<source>Length: %1 %2</source>
<translation>Lengte: %1 %2</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="289"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
<source>Length: -</source>
<translation>Lengte: -</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="296"/>
- <location filename="../gis/rte/CGisItemRte.cpp" line="485"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="559"/>
<source>Time: %1 %2</source>
<translation>Tijd: %1 %2</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="300"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
<source>Time: -</source>
<translation>Tijd: -</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="306"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="372"/>
+ <source>%1%2 %3, %4%5 %6</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="378"/>
<source>Last time routed:<br/>%1</source>
<translation>Laatste routeberekening:<br/>%1</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="308"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="380"/>
<source>with %1</source>
<translation>met %1</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="487"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="561"/>
<source>Distance: %1 %2</source>
<translation>Afstand: %1 %2</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="601"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="675"/>
<source>Changed route points.</source>
<translation>Routepunten aangepast.</translation>
</message>
@@ -935,7 +964,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="182"/>
+ <location filename="../gis/fit/serialization.cpp" line="247"/>
<source>FIT file %1 contains no GPS data.</source>
<translation type="unfinished"></translation>
</message>
@@ -976,12 +1005,12 @@ 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="401"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="394"/>
<source>Length: %1 %2</source>
<translation>Lengte: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="408"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="401"/>
<source>, %1%2 %3, %4%5 %6</source>
<translation>, %1%2 %3, %4%5 %6</translation>
</message>
@@ -998,77 +1027,121 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<translation type="obsolete">Beweging: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="428"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="435"/>
<source>Start: %1</source>
<translation>Start: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="432"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="439"/>
+ <source>Start: -</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="445"/>
<source>End: %1</source>
<translation>Einde: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="435"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="449"/>
+ <source>End: -</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="453"/>
<source>Points: %1 (%2)</source>
<translation>Punten: %1 (%2)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="527"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="457"/>
+ <source>Invalid elevations!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="462"/>
+ <source>Invalid timestamps!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="467"/>
+ <source>Invalid positions!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="558"/>
+ <source>Index: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="562"/>
+ <source>Index: visible %1, total %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="573"/>
<source>Ele.: %1 %2</source>
<translation>Hoogte.: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="530"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
<source> slope: %1%3 (%2%)</source>
<translation> helling: %1%3 (%2%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="535"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
<source> speed: %1%2</source>
<translation> snelheid: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="563"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
<source>... and %1 tags not displayed</source>
<translation>... en %1 tags niet getoont</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="574"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
<source>Descend: - (-)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="575"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
<source>Distance: - (-)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="622"/>
<source>Moving: - (-)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="627"/>
<source>Ascend: %1%2 (%3%)</source>
<translation>Stijging: %1%2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1441"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1317"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1330"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1390"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1434"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1599"/>
+ <source>track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1535"/>
<source>Hide point %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1445"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1539"/>
<source>Hide points %1..%2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="573"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="619"/>
<source>Ascend: - (-)</source>
<translation>Stijging: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="587"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="633"/>
<source> Descend: %1%2 (%3%)</source>
<translation> Daling: %1%2 (%3%)</translation>
</message>
@@ -1085,7 +1158,7 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<translation type="obsolete">Afstand.: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="599"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="645"/>
<source> Moving: %1%2 (%3%)</source>
<translation> Beweging: %1%2 (%3%)</translation>
</message>
@@ -1094,28 +1167,28 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<translation type="obsolete"> Beweging: - (-) </translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="667"/>
<source>Ascend: %1%2</source>
<translation>Stijging: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="672"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="684"/>
<source>, %1%2</source>
<translation>, %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="615"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="661"/>
<source>Ascend: -</source>
<translation>Stijging: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="633"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="679"/>
<source> Descend: %1%2</source>
<translation> Daling: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="616"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="662"/>
<source>Descend: -</source>
<translation>Daling: -</translation>
</message>
@@ -1124,42 +1197,55 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<translation type="obsolete">Afstand.: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="694"/>
<source> Time: %1%2</source>
<translation> Tijd: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
<source>Edit name...</source>
- <translation>Bewerk naam...</translation>
+ <translation type="vanished">Bewerk naam...</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
<source>Enter new track name.</source>
- <translation>Geef track nieuwe naam.</translation>
+ <translation type="vanished">Geef track nieuwe naam.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="416"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="405"/>
+ <source>, %1-, %2-</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="413"/>
<source>Time: %1, Speed: %2 %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="423"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="417"/>
+ <source>Time: -, Speed: -</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="425"/>
<source>Moving: %1, Speed: %2 %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="593"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="429"/>
+ <source>Moving: -, Speed: -</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="639"/>
<source>Distance: %1%2 (%3%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="643"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
<source>Distance: %1%2</source>
<translation type="unfinished">Afstand: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1286"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1380"/>
<source>Permanently removed points %1..%2</source>
<translation>Permanent verwijderde punten %1..%2</translation>
</message>
@@ -1168,37 +1254,42 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<translation type="obsolete">Verberg punten.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1485"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1579"/>
<source>Show points.</source>
<translation>Toon punten.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2040"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2142"/>
<source>Changed name</source>
<translation>Naam aangepast</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2046"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2148"/>
<source>Changed comment</source>
<translation>Notitie aangepast</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2052"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2154"/>
<source>Changed description</source>
<translation>Beschrijving aangepast</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2058"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2160"/>
<source>Changed links</source>
<translation>Link aangepast</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2085"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2171"/>
+ <source>Changed elevation of point %1 to %2 %3</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2198"/>
<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="2143"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2256"/>
<source>Changed activity to '%1' for range(%2..%3).</source>
<translation>Activiteit aangepast naar '%1' voor bereik(%2..%3).</translation>
</message>
@@ -1208,62 +1299,66 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<translation>Verberg alle punten via Douglas Peuker algoritme (%1%2)</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="143"/>
<source>Hide points with invalid coordinates at the beginning of the track</source>
- <translation>Verberg punten met slechte gegevens naar begin van de track</translation>
+ <translation type="vanished">Verberg punten met slechte gegevens naar begin van de track</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/filter/filter.cpp" line="141"/>
+ <source>Hide points with invalid data.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="159"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="157"/>
<source>Reset all hidden track points to visible</source>
<translation>Verander alle verborgen trackpunten naar zichtbaar</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="193"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="191"/>
<source>Permanently removed all hidden track points</source>
<translation>Alle verborgen trackpunten permanent verwijderd</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="243"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="241"/>
<source>Smoothed profile with a Median filter of size %1</source>
<translation>Vloeiend profiel met een median filter van grootte %1</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="279"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="277"/>
<source>Replaced elevation data with data from DEM files.</source>
<translation>Vervang hoogte gegevens met gegevens van DEM bestanden.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="302"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="300"/>
<source>Offset elevation data by %1%2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="321"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="319"/>
<source>Changed start of track to %1.</source>
<translation>Start van track veranderd naar %1.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="340"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="338"/>
<source>Remove timestamps.</source>
<translation>Verwijder tijdstempels.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="363"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="361"/>
<source>Set artificial timestamps with delta of %1 sec.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="396"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="393"/>
<source>Changed speed to %1%2.</source>
<translation>Snelheid veranderd naar %1%2.</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="415"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="412"/>
<source>%1 (Segment %2)</source>
<translation>%1 (Segment %2)</translation>
</message>
<message>
- <location filename="../gis/trk/filter/filter.cpp" line="438"/>
+ <location filename="../gis/trk/filter/filter.cpp" line="435"/>
<source>Removed extension %1 from all Track Points</source>
<translation type="unfinished"></translation>
</message>
@@ -1276,17 +1371,17 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<context>
<name>CGisItemWpt</name>
<message>
- <location filename="../gis/gpx/serialization.cpp" line="588"/>
+ <location filename="../gis/gpx/serialization.cpp" line="590"/>
<source>Archived</source>
<translation>Gearchiveerd</translation>
</message>
<message>
- <location filename="../gis/gpx/serialization.cpp" line="592"/>
+ <location filename="../gis/gpx/serialization.cpp" line="594"/>
<source>Available</source>
<translation>Beschikbaar</translation>
</message>
<message>
- <location filename="../gis/gpx/serialization.cpp" line="596"/>
+ <location filename="../gis/gpx/serialization.cpp" line="598"/>
<source>Not Available</source>
<translation>Niet beschikbaar</translation>
</message>
@@ -1575,54 +1670,59 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<translation>Bewerk route</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="174"/>
+ <location filename="../gis/CGisListWks.cpp" line="166"/>
+ <source>Convert to Track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="175"/>
<source>Edit Area Points</source>
<translation>Bewerk gebied punten</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="181"/>
+ <location filename="../gis/CGisListWks.cpp" line="182"/>
<source>Create Route</source>
<translation>Maak route</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="625"/>
+ <location filename="../gis/CGisListWks.cpp" line="626"/>
<source>Drop items...</source>
<translation>Elementen wissen...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="650"/>
- <location filename="../gis/CGisListWks.cpp" line="1581"/>
- <location filename="../gis/CGisListWks.cpp" line="1619"/>
+ <location filename="../gis/CGisListWks.cpp" line="651"/>
+ <location filename="../gis/CGisListWks.cpp" line="1593"/>
+ <location filename="../gis/CGisListWks.cpp" line="1631"/>
<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="779"/>
+ <location filename="../gis/CGisListWks.cpp" line="780"/>
<source>Saving workspace. Please wait.</source>
<translation>Werkruimte opslaan. Moment geduld.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="825"/>
+ <location filename="../gis/CGisListWks.cpp" line="826"/>
<source>Loading workspace. Please wait.</source>
<translation>Laden werkruimte. Moment geduld.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1142"/>
+ <location filename="../gis/CGisListWks.cpp" line="1143"/>
<source>Close all projects...</source>
<translation>Sluit alle projecten...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1142"/>
+ <location filename="../gis/CGisListWks.cpp" line="1143"/>
<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="1165"/>
+ <location filename="../gis/CGisListWks.cpp" line="1166"/>
<source>Delete project...</source>
<translation>Project verwijderen...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1165"/>
+ <location filename="../gis/CGisListWks.cpp" line="1166"/>
<source>Do you really want to delete %1?</source>
<translation>Moet %1 werkelijk verwijderd worden?</translation>
</message>
@@ -1649,12 +1749,12 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<translation type="unfinished">Kopieer elementen...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="645"/>
+ <location filename="../gis/CGisWidget.cpp" line="657"/>
<source>Cut Track...</source>
<translation>Track knippen...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="645"/>
+ <location filename="../gis/CGisWidget.cpp" line="657"/>
<source>Do you want to delete the original track?</source>
<translation>Moet de orginele track verwijderd worden?</translation>
</message>
@@ -1705,17 +1805,17 @@ lijn %2, kolom %3:
<context>
<name>CGpxProject</name>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="90"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="91"/>
<source>Failed to load file %1...</source>
<translation type="unfinished">Kan bestand %1 niet laden...</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="112"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="113"/>
<source>Failed to open %1</source>
<translation type="unfinished">Openen mislukt-%1</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="124"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="125"/>
<source>Failed to read: %1
line %2, column %3:
%4</source>
@@ -1724,32 +1824,32 @@ lijn %2, kolom %3:
%4</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="132"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="133"/>
<source>Not a GPX file: %1</source>
<translation type="unfinished">Geen GPX bestand: %1</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="238"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="258"/>
<source>File exists ...</source>
<translation type="unfinished">Bestand bestaat al...</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="239"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="259"/>
<source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains GPX data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file. Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
<translation type="unfinished">Dit bestand bestaat al en is niet in QMapShack gemaakt. Wanneer op 'Ja' geklikt wordt zullen er gegevens verloren gaan. Alhoewel QMapShack dit GPX bestand kan openen is het mogelijk dat niet alle elementen opgeslagen kunnen worden. Geadviseerd wordt om een ander bestand te kiezen. <b>Moet dit bestand werkelijk overschreven worden?<b/></translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="347"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="367"/>
<source>Failed to create file '%1'</source>
<translation type="unfinished">Maken bestand mislukt '%1'</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="357"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="377"/>
<source>Failed to write file '%1'</source>
<translation type="unfinished">Schrijven bestand mislukt '%1'</translation>
</message>
<message>
- <location filename="../gis/gpx/CGpxProject.cpp" line="362"/>
+ <location filename="../gis/gpx/CGpxProject.cpp" line="382"/>
<source>Saving GIS data failed...</source>
<translation type="unfinished">Opslaan GIS gegevens mislukt...</translation>
</message>
@@ -1811,64 +1911,64 @@ lijn %2, kolom %3:
<context>
<name>CKnownExtension</name>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="45"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="62"/>
<source>Air Temperature</source>
<translation>Luchttemperatuur</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="49"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="66"/>
<source>Water Temperature</source>
<translation>Watertemperatuur</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="53"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="70"/>
<source>Depth</source>
<translation>Diepte</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="57"/>
- <location filename="../gis/trk/CKnownExtension.cpp" line="69"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="74"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="86"/>
<source>Heart Rate</source>
<translation>Hartslag</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="61"/>
- <location filename="../gis/trk/CKnownExtension.cpp" line="73"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="78"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="90"/>
<source>Cadence</source>
<translation>Cadans</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="77"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="94"/>
<source>Speed</source>
<translation>Snelheid</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="81"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="98"/>
<source>Acceleration</source>
<translation>Versnelling</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="85"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="102"/>
<source>Course</source>
<translation>Richting</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="94"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="111"/>
<source>Slope*</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="99"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
<source>Speed*</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="104"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="121"/>
<source>Elevation</source>
<translation>Hoogte</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="109"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="126"/>
<source>Progress</source>
<translation>Voortgang</translation>
</message>
@@ -1884,33 +1984,38 @@ lijn %2, kolom %3:
<context>
<name>CMainWindow</name>
<message>
- <location filename="../CMainWindow.cpp" line="643"/>
+ <location filename="../CMainWindow.cpp" line="557"/>
+ <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="685"/>
<source>Ele: %1%2</source>
<translation>Hoogte: %1%2</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="659"/>
+ <location filename="../CMainWindow.cpp" line="701"/>
<source>[Grid: %1]</source>
<translation>[Raster: %1]</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="794"/>
+ <location filename="../CMainWindow.cpp" line="836"/>
<source>Load GIS Data...</source>
<translation>GIS gegevens laden...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="828"/>
+ <location filename="../CMainWindow.cpp" line="870"/>
<source>Select output file</source>
<translation>Selecteer bestand</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="828"/>
- <location filename="../CMainWindow.cpp" line="854"/>
+ <location filename="../CMainWindow.cpp" line="870"/>
+ <location filename="../CMainWindow.cpp" line="896"/>
<source>QMapShack View (*.view)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="854"/>
+ <location filename="../CMainWindow.cpp" line="896"/>
<source>Select file to load</source>
<translation>Selecteer bestand</translation>
</message>
@@ -2528,8 +2633,12 @@ If it's no fun, why don't you provide maps? Well to host maps ready fo
</message>
<message>
<location filename="../map/CMapIMG.cpp" line="730"/>
+ <source>File contains locked / encrypted data. Garmin does not want you to use this file with any other software than the one supplied by Garmin.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>File contains locked / encypted data. Garmin does not want you to use this file with any other software than the one supplied by Garmin.</source>
- <translation>Bestand bevat geblokeerde / gecodeerde gegevens. Garmin staat niet toe dat deze gegeven door andere software gelezen kan worden.</translation>
+ <translation type="vanished">Bestand bevat geblokeerde / gecodeerde gegevens. Garmin staat niet toe dat deze gegeven door andere software gelezen kan worden.</translation>
</message>
<message>
<location filename="../map/CMapIMG.cpp" line="2305"/>
@@ -2807,14 +2916,17 @@ 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="100"/>
+ <location filename="../mouse/CMouseEditArea.cpp" line="96"/>
+ <source>area</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Edit name...</source>
- <translation>Bewerk naam...</translation>
+ <translation type="vanished">Bewerk naam...</translation>
</message>
<message>
- <location filename="../mouse/CMouseEditArea.cpp" line="100"/>
<source>Enter new area name.</source>
- <translation>Geef gebied een nieuwe naam.</translation>
+ <translation type="vanished">Geef gebied een nieuwe naam.</translation>
</message>
</context>
<context>
@@ -2831,14 +2943,17 @@ 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="111"/>
+ <location filename="../mouse/CMouseEditRte.cpp" line="107"/>
+ <source>route</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Edit name...</source>
- <translation>Bewerk naam...</translation>
+ <translation type="vanished">Bewerk naam...</translation>
</message>
<message>
- <location filename="../mouse/CMouseEditRte.cpp" line="111"/>
<source>Enter new route name.</source>
- <translation>Geef route een nieuwe naam.</translation>
+ <translation type="vanished">Geef route een nieuwe naam.</translation>
</message>
</context>
<context>
@@ -2865,14 +2980,17 @@ 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="116"/>
+ <location filename="../mouse/CMouseEditTrk.cpp" line="112"/>
+ <source>track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Edit name...</source>
- <translation>Bewerk naam...</translation>
+ <translation type="vanished">Bewerk naam...</translation>
</message>
<message>
- <location filename="../mouse/CMouseEditTrk.cpp" line="116"/>
<source>Enter new track name.</source>
- <translation>Geef track nieuwe naam.</translation>
+ <translation type="vanished">Geef track nieuwe naam.</translation>
</message>
</context>
<context>
@@ -3901,6 +4019,24 @@ lijn %2, kolom %3:
</message>
</context>
<context>
+ <name>CTableTrk</name>
+ <message>
+ <location filename="../gis/trk/CTableTrk.cpp" line="101"/>
+ <source>Double click to edit elevation value</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CTableTrk.cpp" line="127"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="135"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="138"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="143"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="157"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="159"/>
+ <source>%1 %2</source>
+ <translation type="unfinished">%1 %2</translation>
+ </message>
+</context>
+<context>
<name>CTextEditWidget</name>
<message>
<location filename="../widgets/CTextEditWidget.cpp" line="73"/>
@@ -3951,7 +4087,7 @@ lijn %2, kolom %3:
<context>
<name>CWptIconDialog</name>
<message>
- <location filename="../helpers/CWptIconDialog.cpp" line="160"/>
+ <location filename="../helpers/CWptIconDialog.cpp" line="161"/>
<source>Path to user icons...</source>
<translation type="unfinished"></translation>
</message>
@@ -4435,7 +4571,7 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
</message>
<message>
<location filename="../dem/IDemList.ui" line="118"/>
- <source>To add files with elevation data use <b>File->Setup DEM Paths</b>. </source>
+ <source>To add files with elevation data use <b>File->Setup DEM Paths</b>. Or click <a href='setup'><b>here</b></a></source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -4703,9 +4839,8 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
<translation>Formulier</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="56"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="77"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="98"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="81"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="105"/>
<source>-
-</source>
<translation>-
@@ -4716,12 +4851,12 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
<translation type="obsolete">Grafieken</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1019"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1029"/>
<source>Profile</source>
<translation>Profiel</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1460"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1470"/>
<source>Speed</source>
<translation>Snelheid</translation>
</message>
@@ -4730,48 +4865,48 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
<translation type="obsolete">Track</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="277"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="287"/>
<source>Toggle read only mode. You have to open the lock to edit the item.</source>
<translation>Schrijfbeveiliging ingeschakeld. Klik op het slot om te kunnen bewerken.</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="280"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="444"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="473"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="538"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="564"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="593"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="682"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="711"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1040"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1069"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1101"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1137"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1166"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1198"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1234"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1263"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1295"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="290"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="454"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="483"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="548"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="574"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="603"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="692"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="721"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1050"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1079"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1111"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1147"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1176"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1208"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1244"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1273"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1305"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="255"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="265"/>
<source><html><head/><body><p>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </p></body></html></source>
<translation><html><head/><body><p>Het waypoint was geimporteerd naar QMapShack en is aangepast. Het bevat geen orginele gegevens meer. Bekijk historie voor veranderingen. </p></body></html></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="306"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="316"/>
<source>-</source>
<translation>-</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="345"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="355"/>
<source>Info</source>
<translation>Info</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="377"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="387"/>
<source>Style</source>
<translation>Stijl</translation>
</message>
@@ -4780,37 +4915,37 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
<translation type="obsolete">uit gegevens</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="419"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="429"/>
<source>Source</source>
<translation>Bron</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="624"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="634"/>
<source>Maximum</source>
<translation>Maximum</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="441"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="451"/>
<source>Use/edit user defined visibility of arrows for this track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="470"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="480"/>
<source>Use/edit system's visibility of arrows for all tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="764"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="774"/>
<source>Minimum</source>
<translation>Minimum</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="679"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="689"/>
<source>Use/edit user defined scale factor for this track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="708"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="718"/>
<source>Use/edit system's default factor for all tracks</source>
<translation type="unfinished"></translation>
</message>
@@ -4819,22 +4954,22 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
<translation type="obsolete">Vaste kleur</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="638"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="648"/>
<source>x </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="426"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="436"/>
<source>Width</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="631"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="641"/>
<source>with arrows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="832"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="842"/>
<source>Graphs</source>
<translation>Grafieken</translation>
</message>
@@ -4851,110 +4986,117 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
<translation type="obsolete">Grafiek 1</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="845"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="865"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="951"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="855"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="875"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="961"/>
<source>max.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="984"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="991"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1005"/>
+ <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>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="535"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1037"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1134"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1231"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="545"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1047"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1144"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1241"/>
<source>User defined limits for this track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="561"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1066"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1163"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1260"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="56"/>
+ <source>-
+-
+-</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="571"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1076"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1173"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1270"/>
<source>Automatic limits</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="590"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1098"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1195"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1292"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="600"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1108"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1205"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1302"/>
<source>User defined limits for all tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="784"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="794"/>
<source>Color</source>
<translation>Kleur</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1324"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1334"/>
<source>Activity</source>
<translation>Activiteit</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1365"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1375"/>
<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="1392"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1402"/>
<source>Points</source>
<translation>Punten</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1440"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1450"/>
<source>Time</source>
<translation>Tijd</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1445"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1455"/>
<source>Ele.</source>
<translation>Hoogte</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1450"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1460"/>
<source>Delta</source>
<translation>Delta</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1455"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1465"/>
<source>Dist.</source>
<translation>Afstand.</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1465"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
<source>Slope</source>
<translation>Helling</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1470"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
<source>Ascend</source>
<translation>Stijging</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1485"/>
<source>Descend</source>
<translation>Daling</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1490"/>
<source>Position</source>
<translation>Positie</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1489"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1499"/>
<source>Filter</source>
<translation>Filter</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1526"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1536"/>
<source>Hist.</source>
<translation>Hist.</translation>
</message>
@@ -5167,8 +5309,12 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
</message>
<message>
<location filename="../gis/trk/filter/IFilterInvalid.ui" line="56"/>
+ <source>Hide points with invalid data.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Hide points with invalid coordinates at the beginning of the track.</source>
- <translation>Verberg punten met ongeldige coördinaten naar het begin van de track.</translation>
+ <translation type="vanished">Verberg punten met ongeldige coördinaten naar het begin van de track.</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterInvalid.ui" line="63"/>
@@ -5406,80 +5552,90 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
<context>
<name>IGisItem</name>
<message>
- <location filename="../gis/IGisItem.cpp" line="42"/>
+ <location filename="../gis/IGisItem.cpp" line="43"/>
<source>[no name]</source>
<translation>[geen naam]</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="314"/>
+ <location filename="../gis/IGisItem.cpp" line="315"/>
<source>The item is not part of the project in the database.</source>
<translation>Het item is geen deel van het project in de database.</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="315"/>
+ <location filename="../gis/IGisItem.cpp" line="316"/>
<source>
It is either a new item or it has been deleted in the database by someone else.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="321"/>
+ <location filename="../gis/IGisItem.cpp" line="322"/>
<source>The item is not in the database.</source>
<translation>Het item is niet in de database.</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="327"/>
+ <location filename="../gis/IGisItem.cpp" line="328"/>
<source>The item might need to be saved</source>
<translation>Het item dient opgeslagen te worden</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="411"/>
+ <location filename="../gis/IGisItem.cpp" line="412"/>
<source>Initial version.</source>
<translation>Orginele versie.</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="519"/>
+ <location filename="../gis/IGisItem.cpp" line="520"/>
<source><h3>%1</h3> This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press 'Ok'.</source>
<translation><h3>%1<h3>Dit element is waarschijnlijk alleen lezen omdat dit niet gemaakt is in QMapShack. Normaal hoeven geen gegevens aangepast te worden na het importeren. Om toch aan te passen druk dan op 'OK'.</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="520"/>
+ <location filename="../gis/IGisItem.cpp" line="521"/>
<source>Read Only Mode...</source>
<translation>Alleen lezen modus...</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="684"/>
- <location filename="../gis/IGisItem.cpp" line="743"/>
+ <location filename="../gis/IGisItem.cpp" line="685"/>
+ <location filename="../gis/IGisItem.cpp" line="744"/>
<source><h4>Description:</h4></source>
<translation><h4>Beschrijving:</h4></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="687"/>
- <location filename="../gis/IGisItem.cpp" line="746"/>
+ <location filename="../gis/IGisItem.cpp" line="688"/>
+ <location filename="../gis/IGisItem.cpp" line="747"/>
<source><p>--- no description ---</p></source>
<translation><p>--- geen beschrijving ---</p></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="698"/>
+ <location filename="../gis/IGisItem.cpp" line="699"/>
<source><h4>Comment:</h4></source>
<translation><h4>Notitie:</h4></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="701"/>
+ <location filename="../gis/IGisItem.cpp" line="702"/>
<source><p>--- no comment ---</p></source>
<translation><p>--- geen notitie ---</p></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="712"/>
- <location filename="../gis/IGisItem.cpp" line="757"/>
+ <location filename="../gis/IGisItem.cpp" line="713"/>
+ <location filename="../gis/IGisItem.cpp" line="758"/>
<source><h4>Links:</h4></source>
<translation><h4>Links:</h4></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="715"/>
- <location filename="../gis/IGisItem.cpp" line="760"/>
+ <location filename="../gis/IGisItem.cpp" line="716"/>
+ <location filename="../gis/IGisItem.cpp" line="761"/>
<source><p>--- no links ---</p></source>
<translation><p>--- geen links ---</p></translation>
</message>
+ <message>
+ <location filename="../gis/IGisItem.cpp" line="843"/>
+ <source>Edit name...</source>
+ <translation type="unfinished">Bewerk naam...</translation>
+ </message>
+ <message>
+ <location filename="../gis/IGisItem.cpp" line="843"/>
+ <source>Enter new %1 name.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>IGisProject</name>
@@ -6060,7 +6216,7 @@ Bestandsnaam: %1</translation>
</message>
<message>
<location filename="../map/IMapList.ui" line="103"/>
- <source>To add maps use <b>File->Setup Map Paths</b>. </source>
+ <source>To add maps use <b>File->Setup Map Paths</b>. Or click <a href='setup'><b>here</b></a></source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -6250,57 +6406,57 @@ Ik wil de documentatie niet lezen!</translation>
<translation><b>Nieuwe lijn</b><br/>Verplaats de muis en gebruik linker muisknop om een punt te plaatsen. Gebruik rechter muisknop om te stoppen.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="311"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="314"/>
<source><b>Delete Point</b><br/>Move the mouse close to a point and press the left button to delete it.<br/></source>
<translation><b>Verwijder punt</b><br/>Beweeg de muis dicht bij een punt en druk op linkermuisknop om te verwijderen.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="320"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="323"/>
<source><b>Select Range of Points</b><br/>Left click on first point to start selection. Left click second point to complete selection and choose from options. Use the right mouse button to cancel.<br/></source>
<translation><b>Selecteer reeks punten</b><br/>Klik op eerste punt van reeks. Klik op laatste punt van reeks en selecteer een optie. Gebruik rechter muisknop om te annuleren.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="329"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
<source><b>Move Point</b><br/>Move the mouse close to a point and press the left button to make it stick to the cursor. Move the mouse to move the point. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
<translation><b>Verplaats punt</b><br/>Beweeg de muis dicht bij een punt en druk op linkermuisknop om het punt te laten plakken. Beweeg de muis om het punt te verplaatsen. Laat het punt los met linker muisknop. Gebruik rechterknop om te annuleren.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="338"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="341"/>
<source><b>Add Point</b><br/>Move the mouse close to a line segment and press the left button to add a point. The point will stick to the cursor and you can move it. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
<translation><b>Punt toevoegen</b><br/>Beweeg de muis dicht bij een lijndeel en druk op linkermuisknop om het punt te laten plakken. Beweeg de muis om het punt te verplaatsen. Laat het punt los met linker muisknop. Gebruik rechterknop om te annuleren.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="347"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="350"/>
<source><b>No Routing</b><br/>All points will be connected with a straight line.<br/></source>
<translation><b>Geen routing</b><br/>Alle punten zullen met rechte lijnen verbonden worden.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="353"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="356"/>
<source><b>Auto Routing</b><br/>The current router setup is used to derive a route between points. <b>Note:</b> The selected router must be able to route on-the-fly. Offline routers usually can do, online routers can't.<br/></source>
<translation><b>Auto routing</b><br/>De huidige instelling wordt gebruikt voor berekening van een route tussen punten. <b>Notitie:</b>De geselecteerd route moet zelf routes kunnen maken. Offline routers kunnen dit online routers meestal niet.<br/></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="358"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="361"/>
<source><b>Vector Routing</b><br/>Connect points with a line from a loaded vector map if possible.<br/></source>
<translation><b>Vector routing</b><br/>Verbind punten met een lijn op een geladen vector kaart indien mogelijk.</br></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="530"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="533"/>
<source><b>%1 Metrics</b></source>
<translation><b>%1 gegevens</b></translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="533"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="536"/>
<source>Distance:</source>
<translation>Afstand:</translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="535"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="538"/>
<source>Ascend:</source>
<translation>Stijging:</translation>
</message>
<message>
- <location filename="../mouse/line/IMouseEditLine.cpp" line="537"/>
+ <location filename="../mouse/line/IMouseEditLine.cpp" line="540"/>
<source>Descend:</source>
<translation>Daling:</translation>
</message>
@@ -6969,6 +7125,7 @@ of
<location filename="../gis/rte/IScrOptRte.ui" line="106"/>
<location filename="../gis/rte/IScrOptRte.ui" line="120"/>
<location filename="../gis/rte/IScrOptRte.ui" line="134"/>
+ <location filename="../gis/rte/IScrOptRte.ui" line="148"/>
<source>...</source>
<translation>...</translation>
</message>
@@ -6998,7 +7155,12 @@ of
<translation>Verplaats route punten.</translation>
</message>
<message>
- <location filename="../gis/rte/IScrOptRte.ui" line="160"/>
+ <location filename="../gis/rte/IScrOptRte.ui" line="145"/>
+ <source>Convert route to track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/IScrOptRte.ui" line="174"/>
<source>TextLabel</source>
<translation>Benaming</translation>
</message>
@@ -7023,9 +7185,9 @@ of
<location filename="../mouse/IScrOptSelect.ui" line="176"/>
<location filename="../mouse/IScrOptSelect.ui" line="205"/>
<location filename="../mouse/IScrOptSelect.ui" line="265"/>
- <location filename="../mouse/IScrOptSelect.ui" line="291"/>
- <location filename="../mouse/IScrOptSelect.ui" line="317"/>
- <location filename="../mouse/IScrOptSelect.ui" line="343"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="292"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="319"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="346"/>
<source>...</source>
<translation type="unfinished">...</translation>
</message>
@@ -7060,17 +7222,17 @@ of
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="288"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="289"/>
<source>Add waypoints to selection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="314"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="316"/>
<source>Add routes to selection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="340"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="343"/>
<source>Add areas to selection.</source>
<translation type="unfinished"></translation>
</message>
@@ -7887,7 +8049,7 @@ of
</message>
<message>
<location filename="../helpers/IWptIconDialog.ui" line="95"/>
- <source>All custom icons have to be *.bmp format.</source>
+ <source>All custom icons have to be *.bmp or *.png format.</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/src/main.cpp b/src/main.cpp
index 92e8c34..e6bbe07 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,6 +20,7 @@
#include "setup/IAppSetup.h"
#include "version.h"
+#include <QNetworkProxyFactory>
#include <QtWidgets>
#include <iostream>
@@ -61,6 +62,8 @@ int main(int argc, char ** argv)
uint seed = QDateTime::currentDateTime().toTime_t();
qsrand(seed);
+ QNetworkProxyFactory::setUseSystemConfiguration(true);
+
CMainWindow w;
w.show();
diff --git a/src/map/CMapDraw.cpp b/src/map/CMapDraw.cpp
index 8790ccc..a5d888f 100644
--- a/src/map/CMapDraw.cpp
+++ b/src/map/CMapDraw.cpp
@@ -25,6 +25,7 @@
#include "map/CMapList.h"
#include "map/CMapPathSetup.h"
#include "map/IMap.h"
+#include "map/cache/CDiskCache.h"
#include "setup/IAppSetup.h"
#include <QtGui>
@@ -253,9 +254,12 @@ void CMapDraw::buildMapList()
QMutexLocker lock(&CMapItem::mutexActiveMaps);
mapList->clear();
+ QSet<QString> maps;
+
for(const QString &path : mapPaths)
{
QDir dir(path);
+
// find available maps
for(const QString &filename : dir.entryList(supportedFormats, QDir::Files|QDir::Readable, QDir::Name))
{
@@ -263,7 +267,9 @@ void CMapDraw::buildMapList()
CMapItem * item = new CMapItem(*mapList, this);
- item->setText(0,fi.baseName().replace("_", " "));
+ maps.insert(fi.baseName());
+
+ item->setText(0, fi.baseName().replace("_", " "));
item->filename = dir.absoluteFilePath(filename);
item->updateIcon();
@@ -276,6 +282,9 @@ void CMapDraw::buildMapList()
f.close();
}
}
+
+ CDiskCache::cleanupRemovedMaps(maps);
+
mapList->updateHelpText();
}
diff --git a/src/map/CMapIMG.cpp b/src/map/CMapIMG.cpp
index 6b01075..ae2f0e3 100644
--- a/src/map/CMapIMG.cpp
+++ b/src/map/CMapIMG.cpp
@@ -727,7 +727,7 @@ void CMapIMG::readSubfileBasics(subfile_desc_t& subfile, CFileExt &file)
if(pTreHdr->flag & 0x80)
{
- throw exce_t(errLock,tr("File contains locked / encypted data. Garmin does not "
+ throw exce_t(errLock,tr("File contains locked / encrypted data. Garmin does not "
"want you to use this file with any other software than "
"the one supplied by Garmin."));
}
@@ -899,7 +899,7 @@ void CMapIMG::readSubfileBasics(subfile_desc_t& subfile, CFileExt &file)
// read extended NT elements
if((gar_load(uint16_t, pTreHdr->hdr_subfile_part_t::length) >= 0x9A) && pTreHdr->tre7_size && (gar_load(uint16_t, pTreHdr->tre7_rec_size) >= sizeof(tre_subdiv2_t)))
{
- rgnoff = subfile.parts["RGN"].offset;
+ //rgnoff = subfile.parts["RGN"].offset;
// qDebug() << subdivs.count() << (pTreHdr->tre7_size / pTreHdr->tre7_rec_size) << pTreHdr->tre7_rec_size;
QByteArray subdiv2;
readFile(file, subfile.parts["TRE"].offset + gar_load(uint32_t, pTreHdr->tre7_offset), gar_load(uint32_t, pTreHdr->tre7_size), subdiv2);
@@ -2185,7 +2185,7 @@ void CMapIMG::drawText(QPainter& p)
QPointF point1 = path.pointAtPercent(percent1);
QPointF point2 = path.pointAtPercent(percent2);
- qreal angle = qAtan((point2.y() - point1.y()) / (point2.x() - point1.x())) * 180 / M_PI;
+ qreal angle; // = qAtan((point2.y() - point1.y()) / (point2.x() - point1.x())) * 180 / M_PI;
// flip path if string start is E->W direction
// this helps, sometimes, in 50 % of the cases :)
@@ -2201,7 +2201,7 @@ void CMapIMG::drawText(QPainter& p)
for(int i = 0; i < size; ++i)
{
- percent1 = percent2;
+ //percent1 = percent2;
percent2 = (offset + fm.width(text[i])) / length;
point1 = point2;
diff --git a/src/map/CMapItem.cpp b/src/map/CMapItem.cpp
index e040536..8a68021 100644
--- a/src/map/CMapItem.cpp
+++ b/src/map/CMapItem.cpp
@@ -93,42 +93,21 @@ void CMapItem::updateIcon()
return;
}
- QPixmap img("://icons/32x32/Map.png");
- QFileInfo fi(filename);
- if(fi.suffix().toLower() == "rmap")
- {
- img = QPixmap("://icons/32x32/MimeRMAP.png");
- }
- else if(fi.suffix().toLower() == "jnx")
- {
- img = QPixmap("://icons/32x32/MimeJNX.png");
- }
- else if(fi.suffix().toLower() == "vrt")
- {
- img = QPixmap("://icons/32x32/MimeVRT.png");
- }
- else if(fi.suffix().toLower() == "img")
- {
- img = QPixmap("://icons/32x32/MimeIMG.png");
- }
- else if(fi.suffix().toLower() == "map")
- {
- img = QPixmap("://icons/32x32/MimeMAP.png");
- }
- else if(fi.suffix().toLower() == "wmts")
- {
- img = QPixmap("://icons/32x32/MimeWMTS.png");
- }
- else if(fi.suffix().toLower() == "tms")
- {
- img = QPixmap("://icons/32x32/MimeTMS.png");
- }
- else if(fi.suffix().toLower() == "gemf")
- {
- img = QPixmap("://icons/32x32/MimeGEMF.png");
- }
-
- setIcon(0,QIcon(img));
+ static QHash<QString, QString> icons {
+ {"rmap", "://icons/32x32/MimeRMAP.png"}
+ , {"jnx", "://icons/32x32/MimeJNX.png"}
+ , {"vrt", "://icons/32x32/MimeVRT.png"}
+ , {"img", "://icons/32x32/MimeIMG.png"}
+ , {"map", "://icons/32x32/MimeMAP.png"}
+ , {"wmts", "://icons/32x32/MimeWMTS.png"}
+ , {"tms", "://icons/32x32/MimeTMS.png"}
+ , {"gemf", "://icons/32x32/MimeGEMF.png"}
+ };
+
+ const QString &suffix = QFileInfo(filename).suffix().toLower();
+ QPixmap img( icons.contains(suffix) ? icons[suffix] : "://icons/32x32/Map.png" );
+
+ setIcon(/* col */ 0, QIcon(img));
}
bool CMapItem::isActivated()
@@ -154,6 +133,7 @@ bool CMapItem::toggleActivate()
void CMapItem::deactivate()
{
QMutexLocker lock(&mutexActiveMaps);
+
// remove mapfile setup dialog as child of this item
showChildren(false);
@@ -167,6 +147,8 @@ void CMapItem::deactivate()
// deny drag-n-drop again
setFlags(flags() & ~Qt::ItemIsDragEnabled);
+
+ map->reportStatusToCanvas(text(0), "");
}
diff --git a/src/map/CMapJNX.cpp b/src/map/CMapJNX.cpp
index b031f8d..27bf463 100644
--- a/src/map/CMapJNX.cpp
+++ b/src/map/CMapJNX.cpp
@@ -239,19 +239,19 @@ void CMapJNX::readFile(const QString& fn, qint32& productId)
if(mapFile.lon1 < lon1)
{
- lon1 = mapFile.lon1;
+ lon1 = mapFile.lon1;
}
if(mapFile.lat1 > lat1)
{
- lat1 = mapFile.lat1;
+ lat1 = mapFile.lat1;
}
if(mapFile.lon2 > lon2)
{
- lon2 = mapFile.lon2;
+ lon2 = mapFile.lon2;
}
if(mapFile.lat2 < lat2)
{
- lat2 = mapFile.lat2;
+ lat2 = mapFile.lat2;
}
}
@@ -380,14 +380,14 @@ void CMapJNX::draw(IDrawContext::buffer_t& buf) /* override */
img.loadFromData(data);
QPolygonF l(4);
- l[0].rx() = tile.area.left() * DEG_TO_RAD;
- l[0].ry() = tile.area.top() * DEG_TO_RAD;
- l[1].rx() = tile.area.right() * DEG_TO_RAD;
- l[1].ry() = tile.area.top() * DEG_TO_RAD;
- l[2].rx() = tile.area.right() * DEG_TO_RAD;
- l[2].ry() = tile.area.bottom() * DEG_TO_RAD;
- l[3].rx() = tile.area.left() * DEG_TO_RAD;
- l[3].ry() = tile.area.bottom() * DEG_TO_RAD;
+ l[0].rx() = tile.area.left() * DEG_TO_RAD;
+ l[0].ry() = tile.area.top() * DEG_TO_RAD;
+ l[1].rx() = tile.area.right() * DEG_TO_RAD;
+ l[1].ry() = tile.area.top() * DEG_TO_RAD;
+ l[2].rx() = tile.area.right() * DEG_TO_RAD;
+ l[2].ry() = tile.area.bottom() * DEG_TO_RAD;
+ l[3].rx() = tile.area.left() * DEG_TO_RAD;
+ l[3].ry() = tile.area.bottom() * DEG_TO_RAD;
drawTile(img, l, p);
}
diff --git a/src/map/CMapList.cpp b/src/map/CMapList.cpp
index b23bcb5..4a500a4 100644
--- a/src/map/CMapList.cpp
+++ b/src/map/CMapList.cpp
@@ -74,7 +74,7 @@ CMapList::CMapList(QWidget *parent)
connect(actionMoveDown, &QAction::triggered, this, &CMapList::slotMoveDown);
connect(actionReloadMaps, &QAction::triggered, this, &CMapList::slotReloadMaps);
connect(pushMapHonk, &QPushButton::clicked, this, &CMapList::slotMapHonk);
-
+ connect(labelHelpFillMapList, &QLabel::linkActivated, this, &CMapList::slotLinkActivated);
menu = new QMenu(this);
menu->addAction(actionActivate);
@@ -106,29 +106,23 @@ CMapItem * CMapList::item(int i)
void CMapList::updateHelpText()
{
- if(treeWidget->topLevelItemCount() == 0)
+ bool haveMaps = (treeWidget->topLevelItemCount() > 0);
+
+ pushMapHonk->setVisible(!haveMaps);
+ labelHelpFillMapList->setVisible(!haveMaps);
+
+ if(!haveMaps)
{
labelIcon->show();
- pushMapHonk->show();
- labelHelpFillMapList->show();
labelHelpActivateMap->hide();
}
else
{
- pushMapHonk->hide();
- labelHelpFillMapList->hide();
-
CMapItem * item = dynamic_cast<CMapItem*>(treeWidget->topLevelItem(0));
- if(item && item->isActivated())
- {
- labelIcon->hide();
- labelHelpActivateMap->hide();
- }
- else
- {
- labelIcon->show();
- labelHelpActivateMap->show();
- }
+
+ bool showHelp = !(item && item->isActivated());
+ labelIcon->setVisible(showHelp);
+ labelHelpActivateMap->setVisible(showHelp);
}
}
@@ -257,3 +251,11 @@ void CMapList::slotReloadMaps()
{
CMapDraw::setupMapPath(CMapDraw::getMapPaths());
}
+
+void CMapList::slotLinkActivated(const QString& link)
+{
+ if(link == "setup")
+ {
+ emit sigSetupMapPath();
+ }
+}
diff --git a/src/map/CMapList.h b/src/map/CMapList.h
index 7787c9d..1f5f6fc 100644
--- a/src/map/CMapList.h
+++ b/src/map/CMapList.h
@@ -63,6 +63,7 @@ public:
signals:
void sigChanged();
+ void sigSetupMapPath();
public slots:
static void slotMapHonk();
@@ -73,6 +74,7 @@ private slots:
void slotMoveDown();
void slotReloadMaps();
void slotContextMenu(const QPoint &point);
+ void slotLinkActivated(const QString& link);
private:
QMenu * menu;
diff --git a/src/map/CMapMAP.h b/src/map/CMapMAP.h
index a8fdf44..228eaa8 100644
--- a/src/map/CMapMAP.h
+++ b/src/map/CMapMAP.h
@@ -72,9 +72,9 @@ private:
}
char signature[20];
quint32 sizeHeader = 0;
- quint32 version = 0;
- quint64 sizeFile = 0;
- quint64 timestamp = 0;
+ quint32 version = 0;
+ quint64 sizeFile = 0;
+ quint64 timestamp = 0;
qint32 minLat = 0;
qint32 minLon = 0;
qint32 maxLat = 0;
diff --git a/src/map/CMapPropSetup.cpp b/src/map/CMapPropSetup.cpp
index 2266c7e..558f6d0 100644
--- a/src/map/CMapPropSetup.cpp
+++ b/src/map/CMapPropSetup.cpp
@@ -48,23 +48,8 @@ CMapPropSetup::CMapPropSetup(IMap * mapfile, CMapDraw *map)
connect(spinCacheSize, static_cast<void (QSpinBox::*)(int) >(&QSpinBox::valueChanged), mapfile, &IMap::slotSetCacheSize);
connect(spinCacheExpiration, static_cast<void (QSpinBox::*)(int) >(&QSpinBox::valueChanged), mapfile, &IMap::slotSetCacheExpiration);
- if(mapfile->hasFeatureVectorItems())
- {
- frameVectorItems->show();
- }
- else
- {
- frameVectorItems->hide();
- }
-
- if(mapfile->hasFeatureTileCache())
- {
- frameTileCache->show();
- }
- else
- {
- frameTileCache->hide();
- }
+ frameVectorItems->setVisible( mapfile->hasFeatureVectorItems() );
+ frameTileCache->setVisible( mapfile->hasFeatureTileCache() );
if(mapfile->hasFeatureLayers())
{
diff --git a/src/map/CMapTMS.cpp b/src/map/CMapTMS.cpp
index 1cf1104..aaf10d7 100644
--- a/src/map/CMapTMS.cpp
+++ b/src/map/CMapTMS.cpp
@@ -101,18 +101,18 @@ CMapTMS::CMapTMS(const QString &filename, CMapDraw *parent)
{
const QDomNode& xmlLayer = xmlLayers.item(n);
int idx = xmlLayer.attributes().namedItem("idx").nodeValue().toInt();
- layers[idx].strUrl = xmlLayer.namedItem("ServerUrl").toElement().text();
- layers[idx].script = xmlLayer.namedItem("Script").toElement().text();
- layers[idx].minZoomLevel = minZoomLevel;
- layers[idx].maxZoomLevel = maxZoomLevel;
+ layers[idx].strUrl = xmlLayer.namedItem("ServerUrl").toElement().text();
+ layers[idx].script = xmlLayer.namedItem("Script").toElement().text();
+ layers[idx].minZoomLevel = minZoomLevel;
+ layers[idx].maxZoomLevel = maxZoomLevel;
if(xmlLayer.namedItem("Title").isElement())
{
- layers[idx].title = xmlLayer.namedItem("Title").toElement().text();
+ layers[idx].title = xmlLayer.namedItem("Title").toElement().text();
}
else
{
- layers[idx].title = tr("Layer %1").arg(idx + 1);
+ layers[idx].title = tr("Layer %1").arg(idx + 1);
}
if(xmlLayer.firstChildElement("MinZoomLevel").isElement())
@@ -170,11 +170,6 @@ CMapTMS::CMapTMS(const QString &filename, CMapDraw *parent)
isActivated = true;
}
-CMapTMS::~CMapTMS()
-{
-// map->reportStatusToCanvas(name, "");
-}
-
void CMapTMS::getLayers(QListWidget& list) /* override */
{
QMutexLocker lock(&mutex);
diff --git a/src/map/CMapTMS.h b/src/map/CMapTMS.h
index af71aa2..b0ed034 100644
--- a/src/map/CMapTMS.h
+++ b/src/map/CMapTMS.h
@@ -23,7 +23,7 @@
#include <QQueue>
#include <QTime>
-class IDiskCache;
+class CDiskCache;
class QListWidgetItem;
class QNetworkAccessManager;
class QNetworkReply;
@@ -33,7 +33,7 @@ class CMapTMS : public IMap
Q_OBJECT
public:
CMapTMS(const QString& filename, CMapDraw *parent);
- virtual ~CMapTMS();
+ virtual ~CMapTMS() {}
void draw(IDrawContext::buffer_t& buf) override;
@@ -93,7 +93,7 @@ private:
/// a queue with all tile urls to request
QQueue<QString> urlQueue;
/// the tile cache
- IDiskCache * diskCache = nullptr;
+ CDiskCache * diskCache = nullptr;
/// access manager to request tiles
QNetworkAccessManager * accessManager = nullptr;
diff --git a/src/map/CMapWMTS.h b/src/map/CMapWMTS.h
index af77262..3399ba6 100644
--- a/src/map/CMapWMTS.h
+++ b/src/map/CMapWMTS.h
@@ -26,7 +26,7 @@
class CMapDraw;
-class IDiskCache;
+class CDiskCache;
class QNetworkAccessManager;
class QNetworkReply;
class QListWidgetItem;
@@ -116,7 +116,7 @@ private:
/// a queue with all tile urls to request
QQueue<QString> urlQueue;
/// the tile cache
- IDiskCache * diskCache = nullptr;
+ CDiskCache * diskCache = nullptr;
/// access manager to request tiles
QNetworkAccessManager * accessManager = nullptr;
diff --git a/src/map/IMap.cpp b/src/map/IMap.cpp
index f194acc..999ca18 100644
--- a/src/map/IMap.cpp
+++ b/src/map/IMap.cpp
@@ -44,14 +44,14 @@ void IMap::saveConfig(QSettings& cfg) /* override */
if(hasFeatureVectorItems())
{
- cfg.setValue("showPolygons", getShowPolygons());
+ cfg.setValue("showPolygons", getShowPolygons());
cfg.setValue("showPolylines", getShowPolylines());
- cfg.setValue("showPOIs", getShowPOIs());
+ cfg.setValue("showPOIs", getShowPOIs());
}
if(hasFeatureTileCache())
{
- cfg.setValue("cacheSizeMB", cacheSizeMB);
+ cfg.setValue("cacheSizeMB", cacheSizeMB);
cfg.setValue("cacheExpiration", cacheExpiration);
}
}
@@ -102,12 +102,12 @@ void IMap::drawTile(const QImage& img, QPolygonF& l, QPainter& p)
map->convertRad2Px(l);
// adjust the tiles width and height to fit the buffer's scale
- qreal dx1 = l[0].x() - l[1].x();
- qreal dy1 = l[0].y() - l[1].y();
- qreal dx2 = l[0].x() - l[3].x();
- qreal dy2 = l[0].y() - l[3].y();
- qreal w = qCeil( qSqrt(dx1*dx1 + dy1*dy1));
- qreal h = qCeil( qSqrt(dx2*dx2 + dy2*dy2));
+ qreal dx1 = l[0].x() - l[1].x();
+ qreal dy1 = l[0].y() - l[1].y();
+ qreal dx2 = l[0].x() - l[3].x();
+ qreal dy2 = l[0].y() - l[3].y();
+ qreal w = qCeil( qSqrt(dx1*dx1 + dy1*dy1));
+ qreal h = qCeil( qSqrt(dx2*dx2 + dy2*dy2));
// calculate rotation. This is not really a reprojection but might be good enough for close zoom levels
qreal a = qAtan(dy1/dx1) * RAD_TO_DEG;
@@ -121,11 +121,7 @@ void IMap::drawTile(const QImage& img, QPolygonF& l, QPainter& p)
p.restore();
}
-bool IMap::findPolylineCloseBy(const QPointF& pt1, const QPointF& pt2, qint32 threshold, QPolygonF& polyline)
+bool IMap::findPolylineCloseBy(const QPointF&, const QPointF&, qint32, QPolygonF&)
{
- Q_UNUSED(pt1);
- Q_UNUSED(pt2);
- Q_UNUSED(threshold);
- Q_UNUSED(polyline);
return false;
}
diff --git a/src/map/IMap.h b/src/map/IMap.h
index 5bcafbf..1d31058 100644
--- a/src/map/IMap.h
+++ b/src/map/IMap.h
@@ -69,26 +69,9 @@ public:
*/
virtual IMapProp *getSetup();
- /**
- @brief getInfo
- @param px
- @param str
- */
- virtual void getInfo(const QPoint& px, QString& str)
- {
- Q_UNUSED(px);
- Q_UNUSED(str);
- }
- /**
- @brief getToolTip
- @param px
- @param str
- */
- virtual void getToolTip(const QPoint& px, QString& str)
- {
- Q_UNUSED(px);
- Q_UNUSED(str);
- }
+ virtual void getInfo(const QPoint&, QString&) {}
+
+ virtual void getToolTip(const QPoint&, QString&) {}
/**
@brief Return copyright notice if any
@@ -208,14 +191,15 @@ protected:
/// the drawcontext this map belongs to
CMapDraw * map;
- /// source projection of the current map file
/**
+ Source projection of the current map file
Has to be set by subclass. Destruction has to be
handled by subclass.
*/
projPJ pjsrc = nullptr;
- /// target projection
+
/**
+ target projection
Is set by IMap() to WGS84. Will be freed by ~IMap()
*/
projPJ pjtar = nullptr;
@@ -231,22 +215,15 @@ protected:
/// flag field for features defined in features_e
quint32 flagsFeature;
- /// vector maps only: hide/show polygons
- bool showPolygons = true;
- /// vector maps only: hide/show polylines
- bool showPolylines = true;
- /// vector maps only: hide/show point of interest
- bool showPOIs = true;
-
- /// streaming map only: path to cached tiles
- QString cachePath;
- /// streaming map only: maximum size of all tiles in cache [MByte]
- qint32 cacheSizeMB = 100;
- /// streaming map only: maximum age of tiles in cache [days]
- qint32 cacheExpiration = 8;
-
- /// a copyright string to be displayed as tool tip
- QString copyright;
+ 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
+
+ QString cachePath; //< streaming map only: path to cached tiles
+ qint32 cacheSizeMB = 100; //< streaming map only: maximum size of all tiles in cache [MByte]
+ qint32 cacheExpiration = 8; //< streaming map only: maximum age of tiles in cache [days]
+
+ QString copyright; //< a copyright string to be displayed as tool tip
};
diff --git a/src/map/IMapList.ui b/src/map/IMapList.ui
index 72be194..ff37be4 100644
--- a/src/map/IMapList.ui
+++ b/src/map/IMapList.ui
@@ -100,7 +100,7 @@
<item>
<widget class="QLabel" name="labelHelpFillMapList">
<property name="text">
- <string>To add maps use <b>File->Setup Map Paths</b>. </string>
+ <string>To add maps use <b>File->Setup Map Paths</b>. Or click <a href='setup'><b>here</b></a></string>
</property>
<property name="alignment">
<set>Qt::AlignJustify|Qt::AlignVCenter</set>
diff --git a/src/map/OpenStreetMap.tms b/src/map/OpenStreetMap.tms
index eed3c00..d11a156 100644
--- a/src/map/OpenStreetMap.tms
+++ b/src/map/OpenStreetMap.tms
@@ -3,7 +3,7 @@
<MinZoomLevel>2</MinZoomLevel>
<MaxZoomLevel>19</MaxZoomLevel>
<Layer idx="0">
- <ServerUrl>https://c.tile.openstreetmap.org/%1/%2/%3.png</ServerUrl>
+ <ServerUrl>http://c.tile.openstreetmap.org/%1/%2/%3.png</ServerUrl>
</Layer>
<RawHeader>
<Value name="User-Agent">Agent Smith</Value>
diff --git a/src/map/cache/CDiskCache.cpp b/src/map/cache/CDiskCache.cpp
index 045a7e4..7880246 100644
--- a/src/map/cache/CDiskCache.cpp
+++ b/src/map/cache/CDiskCache.cpp
@@ -17,14 +17,15 @@
**********************************************************************************************/
#include "CDiskCache.h"
+#include "map/CMapDraw.h"
#include <QtWidgets>
-CDiskCache::CDiskCache(const QString &path, qint32 size, qint32 days, QObject * parent)
- : IDiskCache(parent)
+CDiskCache::CDiskCache(const QString &path, qint32 maxSizeMB, qint32 expirationDays, QObject * parent)
+ : QObject(parent)
, dir(path)
- , size(size)
- , expiration(days)
+ , maxSizeMB(maxSizeMB)
+ , expirationDays(expirationDays)
{
dummy.fill(Qt::transparent);
@@ -32,8 +33,8 @@ CDiskCache::CDiskCache(const QString &path, qint32 size, qint32 days, QObject *
QFileInfoList files = dir.entryInfoList(QStringList("*.png"), QDir::Files);
for(const QFileInfo &fileinfo : files)
{
- QString hash = fileinfo.baseName();
- table[hash] = fileinfo.fileName();
+ QString hash = fileinfo.baseName();
+ table[hash] = fileinfo.fileName();
}
timer = new QTimer(this);
@@ -42,10 +43,6 @@ CDiskCache::CDiskCache(const QString &path, qint32 size, qint32 days, QObject *
connect(timer, &QTimer::timeout, this, &CDiskCache::slotCleanup);
}
-CDiskCache::~CDiskCache()
-{
-}
-
void CDiskCache::store(const QString& key, QImage& img)
{
QMutexLocker lock(&mutex);
@@ -53,8 +50,8 @@ void CDiskCache::store(const QString& key, QImage& img)
QCryptographicHash md5(QCryptographicHash::Md5);
md5.addData(key.toLatin1());
- QString hash = md5.result().toHex();
- QString filename = QString("%1.png").arg(hash);
+ QString hash = md5.result().toHex();
+ QString filename = QString("%1.png").arg(hash);
if(!img.isNull())
{
@@ -95,7 +92,7 @@ void CDiskCache::restore(const QString& key, QImage& img)
}
}
-bool CDiskCache::contains(const QString& key)
+bool CDiskCache::contains(const QString& key) const
{
QMutexLocker lock(&mutex);
@@ -106,25 +103,29 @@ bool CDiskCache::contains(const QString& key)
return table.contains(hash) || cache.contains(hash);
}
+void CDiskCache::removeCacheFile(const QFileInfo &fileinfo)
+{
+ QString hash = fileinfo.baseName();
+ table.remove(hash);
+ cache.remove(hash);
+ QFile::remove(fileinfo.absoluteFilePath());
+}
+
void CDiskCache::slotCleanup()
{
QMutexLocker lock(&mutex);
QFileInfoList files = dir.entryInfoList(QStringList("*.png"), QDir::Files);
QDateTime now = QDateTime::currentDateTime();
- int days = expiration;
- qint32 maxSize = size * 1024 * 1024;
+ qint32 maxSizeBytes = maxSizeMB * 1024 * 1024;
qint32 tmpSize = 0;
// expire old files and calculate cache size
for(const QFileInfo &fileinfo : files)
{
- if(fileinfo.lastModified().daysTo(now) > days)
+ if(fileinfo.lastModified().daysTo(now) > expirationDays)
{
- QString hash = fileinfo.baseName();
- table.remove(hash);
- cache.remove(hash);
- QFile::remove(fileinfo.absoluteFilePath());
- qDebug() << "remove old tile" << fileinfo.lastModified() << fileinfo.absoluteFilePath();
+ removeCacheFile(fileinfo);
+ qDebug() << "remove tile" << fileinfo.lastModified() << fileinfo.absoluteFilePath() << "(reason: expired)";
}
else
{
@@ -132,25 +133,37 @@ void CDiskCache::slotCleanup()
}
}
- if(tmpSize > maxSize)
+ if(tmpSize > maxSizeBytes)
{
files = dir.entryInfoList(QStringList("*.png"), QDir::Files, QDir::Time|QDir::Reversed);
// if cache is still too large remove oldest files
for(const QFileInfo &fileinfo : files)
{
- QString hash = fileinfo.baseName();
- table.remove(hash);
- cache.remove(hash);
- QFile::remove(fileinfo.absoluteFilePath());
-
- qDebug() << "remove" << fileinfo.lastModified() << fileinfo.absoluteFilePath();
+ removeCacheFile(fileinfo);
+ qDebug() << "remove tile" << fileinfo.lastModified() << fileinfo.absoluteFilePath() << "(reason: cache size limit)";
tmpSize -= fileinfo.size();
- if(tmpSize < maxSize)
+ if(tmpSize < maxSizeBytes)
{
break;
}
}
}
}
+
+
+void CDiskCache::cleanupRemovedMaps(const QSet<QString> &maps)
+{
+ QString cacheRoot = CMapDraw::getCacheRoot();
+ const QStringList &dirs = QDir(cacheRoot).entryList(QStringList("*"), QDir::Dirs | QDir::NoDotAndDotDot);
+
+ for(const QString &dir : dirs)
+ {
+ if(!maps.contains(dir))
+ {
+ qDebug() << "remove cache directory" << dir << "(reason: map no longer exists)";
+ QDir(cacheRoot + "/" + dir).removeRecursively();
+ }
+ }
+}
diff --git a/src/map/cache/CDiskCache.h b/src/map/cache/CDiskCache.h
index f3bf709..dddbb63 100644
--- a/src/map/cache/CDiskCache.h
+++ b/src/map/cache/CDiskCache.h
@@ -19,34 +19,36 @@
#ifndef CDISKCACHE_H
#define CDISKCACHE_H
-#include "map/cache/IDiskCache.h"
-
#include <QDir>
#include <QHash>
#include <QImage>
+#include <QMutex>
class QTimer;
-class CDiskCache : public IDiskCache
+class CDiskCache : public QObject
{
Q_OBJECT
public:
CDiskCache(const QString& path, qint32 size, qint32 days, QObject *parent);
- virtual ~CDiskCache();
+ virtual ~CDiskCache() = default;
+
+ void store(const QString& key, QImage& img);
+ void restore(const QString& key, QImage& img);
+ bool contains(const QString& key) const;
- void store(const QString& key, QImage& img) override;
- void restore(const QString& key, QImage& img) override;
- bool contains(const QString& key) override;
+ static void cleanupRemovedMaps(const QSet<QString> &maps);
private slots:
void slotCleanup();
private:
- QDir dir;
+ void removeCacheFile(const QFileInfo &fileinfo);
- qint32 size;
+ QDir dir;
- qint32 expiration;
+ const qint32 maxSizeMB; //< maximum cache size in MB
+ const qint32 expirationDays; //< expiration time in days
/// hash table to cache images as files on disc
QHash<QString, QString> table;
@@ -55,7 +57,9 @@ private:
QTimer * timer;
- QImage dummy {256,256, QImage::Format_ARGB32};
+ QImage dummy {256, 256, QImage::Format_ARGB32};
+
+ mutable QMutex mutex;
};
#endif //CDISKCACHE_H
diff --git a/src/map/cache/IDiskCache.h b/src/map/cache/IDiskCache.h
deleted file mode 100644
index e722478..0000000
--- a/src/map/cache/IDiskCache.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/**********************************************************************************************
- Copyright (C) 2014 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/>.
-
-**********************************************************************************************/
-
-#ifndef IDISKCACHE_H
-#define IDISKCACHE_H
-
-#include <QMutex>
-#include <QObject>
-
-class IDiskCache : public QObject
-{
-public:
- IDiskCache(QObject *parent);
- virtual ~IDiskCache();
-
- virtual void store(const QString& key, QImage& img) = 0;
- virtual void restore(const QString& key, QImage& img) = 0;
- virtual bool contains(const QString& key) = 0;
-
-
-protected:
- QMutex mutex;
-};
-
-#endif //IDISKCACHE_H
-
diff --git a/src/mouse/CMouseEditArea.cpp b/src/mouse/CMouseEditArea.cpp
index d8d3541..8f987d0 100644
--- a/src/mouse/CMouseEditArea.cpp
+++ b/src/mouse/CMouseEditArea.cpp
@@ -84,11 +84,7 @@ void CMouseEditArea::slotCopyToNew()
return;
}
- IGisProject * project = CGisWidget::self().selectProject();
- if(nullptr == project)
- {
- return;
- }
+ IGisProject * project = nullptr;
QString name;
CGisItemOvlArea * area = dynamic_cast<CGisItemOvlArea*>(CGisWidget::self().getItemByKey(key));
@@ -97,9 +93,7 @@ void CMouseEditArea::slotCopyToNew()
name = area->getName();
}
- name = QInputDialog::getText(CMainWindow::getBestWidgetForParent(), tr("Edit name..."), tr("Enter new area name."), QLineEdit::Normal, name);
-
- if(name.isEmpty())
+ if(!IGisItem::getNameAndProject(name, project, tr("area")))
{
return;
}
diff --git a/src/mouse/CMouseEditRte.cpp b/src/mouse/CMouseEditRte.cpp
index 5bda1e2..38d1d6c 100644
--- a/src/mouse/CMouseEditRte.cpp
+++ b/src/mouse/CMouseEditRte.cpp
@@ -94,13 +94,9 @@ void CMouseEditRte::slotCopyToNew()
return;
}
- IGisProject * project = CGisWidget::self().selectProject();
- if(nullptr == project)
- {
- return;
- }
- /// @todo make this independent from track
+ IGisProject * project = nullptr;
+
QString name;
CGisItemRte * rte = dynamic_cast<CGisItemRte*>(CGisWidget::self().getItemByKey(key));
if(rte != nullptr)
@@ -108,13 +104,12 @@ void CMouseEditRte::slotCopyToNew()
name = rte->getName();
}
- name = QInputDialog::getText(CMainWindow::getBestWidgetForParent(), tr("Edit name..."), tr("Enter new route name."), QLineEdit::Normal, name);
-
- if(name.isEmpty())
+ if(!IGisItem::getNameAndProject(name, project, tr("route")))
{
return;
}
+
new CGisItemRte(points,name, project, NOIDX);
canvas->resetMouse();
diff --git a/src/mouse/CMouseEditTrk.cpp b/src/mouse/CMouseEditTrk.cpp
index a4b2088..50da180 100644
--- a/src/mouse/CMouseEditTrk.cpp
+++ b/src/mouse/CMouseEditTrk.cpp
@@ -99,13 +99,9 @@ void CMouseEditTrk::slotCopyToNew()
return;
}
- IGisProject * project = CGisWidget::self().selectProject();
- if(nullptr == project)
- {
- return;
- }
- /// @todo make this independent from track
+ IGisProject * project = nullptr;
+
QString name;
CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(key));
if(trk != nullptr)
@@ -113,13 +109,12 @@ void CMouseEditTrk::slotCopyToNew()
name = trk->getName();
}
- name = QInputDialog::getText(CMainWindow::getBestWidgetForParent(), tr("Edit name..."), tr("Enter new track name."), QLineEdit::Normal, name);
-
- if(name.isEmpty())
+ if(!IGisItem::getNameAndProject(name, project, tr("track")))
{
return;
}
+
CMainWindow::self().getElevationAt(points);
new CGisItemTrk(points, name, project, NOIDX);
diff --git a/src/mouse/CMouseSelect.cpp b/src/mouse/CMouseSelect.cpp
index 0e8c9f0..8cf1e4c 100644
--- a/src/mouse/CMouseSelect.cpp
+++ b/src/mouse/CMouseSelect.cpp
@@ -94,10 +94,25 @@ void CMouseSelect::findItems(QList<IGisItem*>& items)
}
QString msg = tr("<b>Selected:</b><br/>");
- msg += tr("%1 tracks<br/>").arg(cntTrk);
- msg += tr("%1 waypoints<br/>").arg(cntWpt);
- msg += tr("%1 routes<br/>").arg(cntRte);
- msg += tr("%1 areas<br/>").arg(cntOvl);
+ if(scrOptSelect->toolItemTrk->isChecked())
+ {
+ msg += tr("%1 tracks<br/>").arg(cntTrk);
+ }
+
+ if(scrOptSelect->toolItemWpt->isChecked())
+ {
+ msg += tr("%1 waypoints<br/>").arg(cntWpt);
+ }
+
+ if(scrOptSelect->toolItemRte->isChecked())
+ {
+ msg += tr("%1 routes<br/>").arg(cntRte);
+ }
+
+ if(scrOptSelect->toolItemOvl->isChecked())
+ {
+ msg += tr("%1 areas<br/>").arg(cntOvl);
+ }
canvas->reportStatus("CMouseSelect::Stat",msg);
diff --git a/src/mouse/IScrOptSelect.ui b/src/mouse/IScrOptSelect.ui
index 7c839d8..24e06cb 100644
--- a/src/mouse/IScrOptSelect.ui
+++ b/src/mouse/IScrOptSelect.ui
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>24</width>
+ <width>27</width>
<height>248</height>
</rect>
</property>
@@ -266,7 +266,8 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
- <normaloff>:/icons/32x32/Track.png</normaloff>:/icons/32x32/Track.png</iconset>
+ <normaloff>:/icons/32x32/Track.png</normaloff>
+ <normalon>:/icons/32x32/TrackOn.png</normalon>:/icons/32x32/Track.png</iconset>
</property>
<property name="iconSize">
<size>
@@ -292,7 +293,8 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
- <normaloff>:/icons/waypoints/32x32/FlagBlue.png</normaloff>:/icons/waypoints/32x32/FlagBlue.png</iconset>
+ <normaloff>:/icons/waypoints/32x32/FlagBlue.png</normaloff>
+ <normalon>:/icons/32x32/WaypointOn.png</normalon>:/icons/waypoints/32x32/FlagBlue.png</iconset>
</property>
<property name="iconSize">
<size>
@@ -318,7 +320,8 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
- <normaloff>:/icons/32x32/Route.png</normaloff>:/icons/32x32/Route.png</iconset>
+ <normaloff>:/icons/32x32/Route.png</normaloff>
+ <normalon>:/icons/32x32/RouteOn.png</normalon>:/icons/32x32/Route.png</iconset>
</property>
<property name="iconSize">
<size>
@@ -344,7 +347,8 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
- <normaloff>:/icons/32x32/Area.png</normaloff>:/icons/32x32/Area.png</iconset>
+ <normaloff>:/icons/32x32/Area.png</normaloff>
+ <normalon>:/icons/32x32/AreaOn.png</normalon>:/icons/32x32/Area.png</iconset>
</property>
<property name="iconSize">
<size>
diff --git a/src/mouse/line/IMouseEditLine.cpp b/src/mouse/line/IMouseEditLine.cpp
index 7f6dba7..b2f5b23 100644
--- a/src/mouse/line/IMouseEditLine.cpp
+++ b/src/mouse/line/IMouseEditLine.cpp
@@ -93,16 +93,8 @@ void IMouseEditLine::setCanvasPanning(bool enable)
{
doCanvasPanning = enable;
- if(enable)
- {
- scrOptEditLine->toolUndo->hide();
- scrOptEditLine->toolRedo->hide();
- }
- else
- {
- scrOptEditLine->toolUndo->show();
- scrOptEditLine->toolRedo->show();
- }
+ scrOptEditLine->toolUndo->setVisible(!enable);
+ scrOptEditLine->toolRedo->setVisible(!enable);
}
@@ -280,6 +272,9 @@ void IMouseEditLine::mouseMoveEvent(QMouseEvent * e)
}
lineOp->mouseMoveEvent(e);
+
+ canvas->displayInfo(point);
+ canvas->update();
}
void IMouseEditLine::mouseReleaseEvent(QMouseEvent *e)
diff --git a/src/plot/CPlotAxis.cpp b/src/plot/CPlotAxis.cpp
index e9abd47..52b3b40 100644
--- a/src/plot/CPlotAxis.cpp
+++ b/src/plot/CPlotAxis.cpp
@@ -105,7 +105,7 @@ const QString CPlotAxis::fmtsgl( qreal val )
QString f;
int exponent = (0. == val) ? 0 : (int) qLog10( qFabs(val) );
- val *= ticScale;
+ //val *= ticScale;
if ( abs(exponent) > 5 )
{
f = "%1.2e";
diff --git a/src/plot/IPlot.cpp b/src/plot/IPlot.cpp
index 6818cf4..26a33bb 100644
--- a/src/plot/IPlot.cpp
+++ b/src/plot/IPlot.cpp
@@ -372,8 +372,8 @@ void IPlot::mousePressEvent(QMouseEvent * e)
bool wasProcessed = true;
- QPoint pos = e->pos();
- posMouse1 = graphAreaContainsMousePos(pos) ? pos : NOPOINT;
+ QPoint pos = e->pos();
+ posMouse1 = graphAreaContainsMousePos(pos) ? pos : NOPOINT;
if(e->button() == Qt::LeftButton)
{
if(mode == eModeIcon)
diff --git a/src/print/CPrintDialog.h b/src/print/CPrintDialog.h
index 40743cc..14a5df9 100644
--- a/src/print/CPrintDialog.h
+++ b/src/print/CPrintDialog.h
@@ -55,19 +55,14 @@ private:
CCanvas * canvas;
- /// the selected area in coordinated of lon/lat
- QRectF rectSelArea;
- /// the selected area in coordinated of pixel
- QRectF rectSelAreaPixel;
- /// the page rectangle in pixel
- QRectF rectPrinterPage;
+ QRectF rectSelArea; //< the selected area in coordinated of lon/lat
+ QRectF rectSelAreaPixel; //< the selected area in coordinated of pixel
+ QRectF rectPrinterPage; //< the page rectangle in pixel
QPrinter printer;
- /// number of pages in x dimension
- qreal xPages = 0.0;
- /// number of pages in y dimension
- qreal yPages = 0.0;
+ qreal xPages = 0.0; //< number of pages in x dimension
+ qreal yPages = 0.0; //< number of pages in y dimension
};
#endif //CPRINTDIALOG_H
diff --git a/src/qlgt/CQmsDb.cpp b/src/qlgt/CQmsDb.cpp
index f9498d7..9c97efb 100644
--- a/src/qlgt/CQmsDb.cpp
+++ b/src/qlgt/CQmsDb.cpp
@@ -52,7 +52,8 @@ CQmsDb::CQmsDb(const QString &filename, CImportDatabase *parent)
gui->stdErr(tr("Remove existing file %1").arg(filename));
QFile::remove(filename);
}
- valid = setupDB(filename, "qlgt2qms");
+ QString error;
+ valid = setupDB(filename, "qlgt2qms", error);
if(!valid)
{
return;
diff --git a/src/resources.qrc b/src/resources.qrc
index 934b6bb..7469872 100644
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -148,6 +148,7 @@
<file>icons/32x32/Link.png</file>
<file>icons/32x32/Database.png</file>
<file>icons/32x32/SQLite.png</file>
+ <file>icons/32x32/SQLiteNoConn.png</file>
<file>icons/32x32/MySQL.png</file>
<file>icons/32x32/MySQLNoConn.png</file>
<file>icons/32x32/Empty.png</file>
@@ -210,6 +211,10 @@
<file>icons/32x32/LimitSys.png</file>
<file>icons/32x32/LimitUsr.png</file>
<file>icons/32x32/SetupWptSym.png</file>
+ <file>icons/32x32/WaypointOn.png</file>
+ <file>icons/32x32/TrackOn.png</file>
+ <file>icons/32x32/RouteOn.png</file>
+ <file>icons/32x32/AreaOn.png</file>
<file>icons/48x48/2DFix.png</file>
@@ -331,6 +336,7 @@
<file>icons/48x48/Link.png</file>
<file>icons/48x48/Database.png</file>
<file>icons/48x48/SQLite.png</file>
+ <file>icons/48x48/SQLiteNoConn.png</file>
<file>icons/48x48/MySQL.png</file>
<file>icons/48x48/MySQLNoConn.png</file>
<file>icons/48x48/Empty.png</file>
@@ -393,6 +399,10 @@
<file>icons/48x48/LimitSys.png</file>
<file>icons/48x48/LimitUsr.png</file>
<file>icons/48x48/SetupWptSym.png</file>
+ <file>icons/48x48/WaypointOn.png</file>
+ <file>icons/48x48/TrackOn.png</file>
+ <file>icons/48x48/RouteOn.png</file>
+ <file>icons/48x48/AreaOn.png</file>
<file>icons/cache/32x32/bluepin.png</file>
diff --git a/src/setup/CAppSetupMac.cpp b/src/setup/CAppSetupMac.cpp
index df08d53..5d99e53 100644
--- a/src/setup/CAppSetupMac.cpp
+++ b/src/setup/CAppSetupMac.cpp
@@ -22,7 +22,7 @@ static QString relTranslationDir = "Resources/translations"; // app
static QString relRoutinoDir = "Resources/routino"; // app
static QString relGdalDir = "Resources/gdal"; // app
static QString relProjDir = "Resources/proj"; // app
-static QString relBinDir = "Resources/bin"; // app
+static QString relBinDir = "Tools"; // app
static QString relLogDir = "Library/Logs"; // home
@@ -92,7 +92,11 @@ QString CAppSetupMac::defaultCachePath()
QString CAppSetupMac::userDataPath(QString subdir)
{
+#if QT_VERSION >= 0x050400
QString dataDir = QStandardPaths::standardLocations(QStandardPaths::AppLocalDataLocation).first();
+#else
+ QString dataDir = QStandardPaths::standardLocations(QStandardPaths::DataLocation).first();
+#endif
return IAppSetup::path(dataDir, subdir, false, 0);
}
@@ -141,4 +145,4 @@ void CAppSetupMac::migrateDirContent(QString dest)
qDebug() << "error migrating directory" << dirSource;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/setup/IAppSetup.cpp b/src/setup/IAppSetup.cpp
index 55c8f5f..d215b69 100644
--- a/src/setup/IAppSetup.cpp
+++ b/src/setup/IAppSetup.cpp
@@ -36,7 +36,7 @@ IAppSetup* IAppSetup::getPlatformInstance()
{
#if defined(Q_OS_MAC)
instance = new CAppSetupMac();
-#elif defined(Q_OS_LINUX)
+#elif defined(Q_OS_LINUX) || defined(__FreeBSD_kernel__) || defined(__GNU__)
instance = new CAppSetupLinux();
#elif defined (Q_OS_WIN32)
instance = new CAppSetupWin();
diff --git a/src/tool/CMapVrtBuilder.cpp b/src/tool/CMapVrtBuilder.cpp
index af05535..06d287d 100644
--- a/src/tool/CMapVrtBuilder.cpp
+++ b/src/tool/CMapVrtBuilder.cpp
@@ -67,7 +67,7 @@ void CMapVrtBuilder::slotSelectTargetFile()
SETTINGS;
QString path = cfg.value("VrtBuilder/targetPath",QDir::homePath()).toString();
- QString file = QFileDialog::getSaveFileName(this, tr("Select target file..."), path);
+ QString file = QFileDialog::getSaveFileName(this, tr("Select target file..."), path, "GDAL vrt (*.vrt)");
if(file.isEmpty())
{
return;
diff --git a/src/widgets/CTextEditWidget.cpp b/src/widgets/CTextEditWidget.cpp
index ecfbdea..4f79cbe 100644
--- a/src/widgets/CTextEditWidget.cpp
+++ b/src/widgets/CTextEditWidget.cpp
@@ -85,6 +85,7 @@ CTextEditWidget::CTextEditWidget(QWidget * parent)
connect(textEdit, &QTextEdit::currentCharFormatChanged, this, &CTextEditWidget::currentCharFormatChanged);
connect(textEdit, &QTextEdit::cursorPositionChanged, this, &CTextEditWidget::cursorPositionChanged);
+ connect(textEdit, &QTextEdit::selectionChanged, this, &CTextEditWidget::selectionChanged);
textEdit->setFocus();
@@ -98,7 +99,25 @@ CTextEditWidget::CTextEditWidget(QWidget * parent)
toolCopy->setDefaultAction(actionCopy);
toolPaste->setDefaultAction(actionPaste);
+ QMenu *menu = new QMenu(this);
+ menu->addAction(actionPastePlain);
+ toolPaste->setMenu(menu);
+
+ /* Setup contextmenu for textEdit */
+ menuTextEdit = new QMenu(this);
+ menuTextEdit->addAction(actionUndo);
+ menuTextEdit->addAction(actionRedo);
+ menuTextEdit->addSeparator();
+ menuTextEdit->addAction(actionCut);
+ menuTextEdit->addAction(actionCopy);
+ menuTextEdit->addAction(actionPaste);
+ menuTextEdit->addAction(actionPastePlain);
+ menuTextEdit->addAction(actionDelete);
+ menuTextEdit->addSeparator();
+ menuTextEdit->addAction(actionSelectAll);
+
actionPaste->setEnabled(!QApplication::clipboard()->text().isEmpty());
+ actionPastePlain->setEnabled(!QApplication::clipboard()->text().isEmpty());
actionUndo->setEnabled(textEdit->document()->isUndoAvailable());
actionRedo->setEnabled(textEdit->document()->isRedoAvailable());
@@ -111,19 +130,17 @@ CTextEditWidget::CTextEditWidget(QWidget * parent)
actionCut->setEnabled(false);
actionCopy->setEnabled(false);
- connect(actionCut, &QAction::triggered, textEdit, &QTextEdit::cut);
- connect(actionCopy, &QAction::triggered, textEdit, &QTextEdit::copy);
- connect(actionPaste, &QAction::triggered, textEdit, &QTextEdit::paste);
-
- connect(textEdit, &QTextEdit::copyAvailable, actionCut, &QAction::setEnabled);
- connect(textEdit, &QTextEdit::copyAvailable, actionCopy, &QAction::setEnabled);
-
- connect(QApplication::clipboard(), &QClipboard::dataChanged, this, &CTextEditWidget::clipboardDataChanged);
-}
-
-
-CTextEditWidget::~CTextEditWidget()
-{
+ connect(actionCut, &QAction::triggered, textEdit, &QTextEdit::cut);
+ connect(actionCopy, &QAction::triggered, textEdit, &QTextEdit::copy);
+ connect(actionPaste, &QAction::triggered, textEdit, &QTextEdit::paste);
+ connect(actionSelectAll, &QAction::triggered, textEdit, &QTextEdit::selectAll);
+ connect(actionPastePlain, &QAction::triggered, this, &CTextEditWidget::pastePlain);
+ connect(actionDelete, &QAction::triggered, this, &CTextEditWidget::deleteSelected);
+ connect(textEdit, &QTextEdit::customContextMenuRequested, this, &CTextEditWidget::customContextMenuRequested);
+ connect(textEdit, &QTextEdit::copyAvailable, actionCut, &QAction::setEnabled);
+ connect(textEdit, &QTextEdit::copyAvailable, actionCopy, &QAction::setEnabled);
+
+ connect(QApplication::clipboard(), &QClipboard::dataChanged, this, &CTextEditWidget::clipboardDataChanged);
}
QString CTextEditWidget::getHtml()
@@ -336,4 +353,28 @@ void CTextEditWidget::cursorPositionChanged()
void CTextEditWidget::clipboardDataChanged()
{
actionPaste->setEnabled(!QApplication::clipboard()->text().isEmpty());
+ actionPastePlain->setEnabled(!QApplication::clipboard()->text().isEmpty());
+}
+
+
+void CTextEditWidget::selectionChanged()
+{
+ const QTextCursor cursor = textEdit->textCursor();
+ actionDelete->setEnabled(cursor.selectionStart() != cursor.selectionEnd());
+}
+
+void CTextEditWidget::customContextMenuRequested()
+{
+ menuTextEdit->exec(QCursor::pos());
+}
+
+void CTextEditWidget::pastePlain()
+{
+ QClipboard *clip = QApplication::clipboard();
+ textEdit->insertPlainText( clip->text() );
+}
+
+void CTextEditWidget::deleteSelected()
+{
+ textEdit->insertPlainText(QString());
}
diff --git a/src/widgets/CTextEditWidget.h b/src/widgets/CTextEditWidget.h
index 1114f91..47a0b40 100644
--- a/src/widgets/CTextEditWidget.h
+++ b/src/widgets/CTextEditWidget.h
@@ -54,7 +54,7 @@ class CTextEditWidget : public QDialog, private Ui::ITextEditWidget
Q_OBJECT
public:
CTextEditWidget(QWidget * parent);
- virtual ~CTextEditWidget();
+ virtual ~CTextEditWidget() {}
QString getHtml();
void setHtml(const QString& text)
@@ -73,8 +73,13 @@ private slots:
void currentCharFormatChanged(const QTextCharFormat &format);
void cursorPositionChanged();
+ void selectionChanged();
void clipboardDataChanged();
+ void customContextMenuRequested();
+ void pastePlain();
+ void deleteSelected();
+
private:
void mergeFormatOnWordOrSelection(const QTextCharFormat &format);
void fontChanged(const QFont &f);
@@ -82,5 +87,6 @@ private:
void alignmentChanged(Qt::Alignment a);
QAction * actionTextColor;
+ QMenu * menuTextEdit;
};
#endif //CTEXTEDITWIDGET_H
diff --git a/src/widgets/ITextEditWidget.ui b/src/widgets/ITextEditWidget.ui
index 2aa73f5..35bb27c 100644
--- a/src/widgets/ITextEditWidget.ui
+++ b/src/widgets/ITextEditWidget.ui
@@ -82,6 +82,9 @@
<height>24</height>
</size>
</property>
+ <property name="popupMode">
+ <enum>QToolButton::MenuButtonPopup</enum>
+ </property>
</widget>
</item>
<item>
@@ -237,7 +240,11 @@
<layout class="QHBoxLayout" name="horizontalLayout"/>
</item>
<item>
- <widget class="QTextEdit" name="textEdit"/>
+ <widget class="QTextEdit" name="textEdit">
+ <property name="contextMenuPolicy">
+ <enum>Qt::CustomContextMenu</enum>
+ </property>
+ </widget>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
@@ -412,6 +419,37 @@
<string>Ctrl+I</string>
</property>
</action>
+ <action name="actionPastePlain">
+ <property name="icon">
+ <iconset resource="../resources.qrc">
+ <normaloff>:/icons/32x32/Paste.png</normaloff>:/icons/32x32/Paste.png</iconset>
+ </property>
+ <property name="text">
+ <string>Paste (Plain)</string>
+ </property>
+ <property name="toolTip">
+ <string>Paste as Plain Text</string>
+ </property>
+ </action>
+ <action name="actionSelectAll">
+ <property name="text">
+ <string>Select All</string>
+ </property>
+ <property name="toolTip">
+ <string>Select All</string>
+ </property>
+ <property name="shortcut">
+ <string>Ctrl+A</string>
+ </property>
+ </action>
+ <action name="actionDelete">
+ <property name="text">
+ <string>Delete</string>
+ </property>
+ <property name="toolTip">
+ <string>Delete</string>
+ </property>
+ </action>
</widget>
<resources>
<include location="../resources.qrc"/>
@@ -424,8 +462,8 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
- <x>454</x>
- <y>479</y>
+ <x>417</x>
+ <y>331</y>
</hint>
<hint type="destinationlabel">
<x>454</x>
@@ -440,8 +478,8 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
- <x>454</x>
- <y>479</y>
+ <x>417</x>
+ <y>331</y>
</hint>
<hint type="destinationlabel">
<x>454</x>
diff --git a/test/OSX_uitest/qmstestcase.py b/test/OSX_uitest/qmstestcase.py
new file mode 100644
index 0000000..df70e1d
--- /dev/null
+++ b/test/OSX_uitest/qmstestcase.py
@@ -0,0 +1,273 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+"""
+/**********************************************************************************************
+Copyright (C) 2016 Ivo Kronenberg
+
+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/>.
+
+**********************************************************************************************/
+"""
+
+from uiautomator import *
+import unittest
+import os
+
+dirCache = os.path.expanduser("~") + "/.QMapShack/"
+
+class Direction:
+ above, below, left, right = range(1, 5)
+
+
+class EntryList:
+ def __init__(self, app):
+ self.app = app
+
+ def grid(self, name=None): pass
+ def showList(self): pass
+ def focusList(self): pass
+
+ def _isEntryActivated(self, entry, name):
+ entry.click()
+ self.app.sendSingleKey(DOWN)
+ self.app.sendSingleKey(UP)
+
+ self.app.sendSingleKey(RIGHT)
+ waitShort()
+
+ # check if map has not bean activated before
+ g = self.grid()
+
+ activated = False
+ i = 0
+ posEntry = -2
+ while i < len(g):
+ e = g[i]
+ if e.getText() == name:
+ posEntry = i
+ if e.getText() == '' and posEntry == i - 1:
+ activated = True
+ break
+ i += 1
+
+ return activated
+
+
+ def _findEntry(self, name):
+ entry = None
+ firstChar=name[0]
+ # break for infinite loop
+ b = 0
+ while (entry is None) or (b < 15):
+ b = b + 1
+ self.app.sendKey(firstChar)
+ grid = self.grid(name)
+ if len(grid) > 0:
+ entry = grid[0]
+ break
+
+ return entry
+
+ def activateEntry(self, name, activate=True):
+ self.showList()
+ self.focusList()
+
+ entry = self._findEntry(name)
+ if entry is None:
+ return False
+
+ # check if map has not bean activated before
+ activated = self._isEntryActivated(entry, name)
+ logger.info('entry ' + name + ' is activated ' + str(activated))
+ entry.click()
+
+ if (not activate and activated) or (activate and not activated):
+ logger.debug('popup 1')
+ entry.selectPopupMenu(1)
+
+ if activate and activated:
+ logger.debug('popup 2')
+ entry.selectPopupMenu(1)
+ # map will be reorder after deactivate, thus search it again
+ entry = self._findEntry(name)
+
+ # if map has already been activated, make sure tiles will be loaded again
+ logger.debug('popup 3')
+ entry.selectPopupMenu(1)
+
+ return True
+
+class MapList(EntryList):
+ def __init__(self, gui):
+ EntryList.__init__(self, gui.app)
+ self.gui = gui
+
+ def grid(self, name=None):
+ return self.gui.mapGrid(name)
+
+ def showList(self):
+ self.gui.showMaps()
+
+ def focusList(self):
+ self.gui.focusMapGrid()
+
+
+class DemList(EntryList):
+ def __init__(self, gui):
+ EntryList.__init__(self, gui.app)
+ self.gui = gui
+
+ def grid(self, name=None):
+ return self.gui.demGrid(name)
+
+ def showList(self):
+ self.gui.showDem()
+
+ def focusList(self):
+ self.gui.focusDemGrid()
+
+
+class QmsGui(UIAutomator):
+ def __init__(self):
+ UIAutomator.__init__(self)
+
+
+ def showRoute(self):
+ self.app.findR('AXRadioButton', 'Route', False).click()
+ waitShort()
+
+ def showDaten(self):
+ self.app.findR('AXRadioButton', 'Daten', False).click()
+ waitShort()
+
+ def showMaps(self):
+ self.app.findR('AXRadioButton', 'Karten', False).click()
+ waitShort()
+
+ def showDem(self):
+ self.app.findR('AXRadioButton', u'Dig. Höhenmodell (DEM)', False).click()
+ waitShort()
+
+ def datenProjectGrid(self, match = None):
+ return self.appWin().findAll('AXSplitGroup')[0].findAll('AXGroup')[1].findAll('AXGroup', match)
+
+ def datenDbGrid(self, match = None):
+ return self.appWin().findAll('AXSplitGroup')[0].findAll('AXGroup')[0].findAll('AXGroup', match)
+
+ def _findNeighbour(self, elements, beside, direction=Direction.above):
+ x, y = beside.ax.AXPosition
+ w, h = beside.ax.AXSize
+ threshold = 10
+ for e in elements:
+ if e.valid() and e.visible():
+ gx, gy = e.ax.AXPosition
+ gw, gh = e.ax.AXSize
+ # TODO add left / right aspect
+ if direction == Direction.above:
+ if (gh + gy + threshold > y) and (gh + gy - threshold < y):
+ return e
+ if direction == Direction.below:
+ if (gy + threshold > y + h) and (gy - threshold < y + h):
+ return e
+
+
+ def _anyElementOf(self, elements, types):
+ if not isinstance(elements, list):
+ elements = [elements]
+ if not isinstance(types, list):
+ types = [types]
+
+ for element in elements:
+ if element.ax.AXRole in types:
+ return True
+ return False
+
+ def mapGrid(self, match = None):
+ mapButton = self.app.findR('AXRadioButton', 'Karten', False)
+ groups = self.appWin().findAll('AXGroup', '', False)
+ group = self._findNeighbour(groups, mapButton)
+
+ return group.findAll('AXGroup')[0].findAll('AXGroup', match)
+ #return self.appWin().findAll('AXGroup', '')[1].findAll('AXGroup')[0].findAll('AXGroup', match)
+
+ def focusMapGrid(self):
+ self.mapGrid()[0].parent().click()
+ #self.appWin().findAll('AXGroup', '')[1].findAll('AXGroup')[0].click()
+
+ def demGrid(self, match = None):
+ demButton = self.app.findR('AXRadioButton', u'Dig. Höhenmodell (DEM)', False)
+ groups = self.appWin().findAll('AXGroup', '', False)
+ group = self._findNeighbour(groups, demButton)
+
+ return group.find('AXGroup').findAll('AXGroup', match)
+
+ def focusDemGrid(self):
+ self.demGrid()[0].parent().click()
+
+ def mapArea(self):
+ groups = self.appWin(True).findAll('AXGroup', '', True)
+ mapGroup = None
+ for group in groups:
+ if group.valid() and group.visible():
+ children = group.children()
+ if len(children) == 0 or not self._anyElementOf(children, ['AXGroup', 'AXSplitGroup', 'AXPopUpButton']):
+ mapGroup = group
+ break
+
+ #UIAutomator.debug(mapGroup, 1)
+ return mapGroup
+
+ def selectMap(self, name, activate=True):
+ return MapList(self).activateEntry(name, activate)
+
+ def selectDem(self, name, activate=True):
+ return DemList(self).activateEntry(name, activate)
+
+
+
+class QmsTestCase(QmsGui, unittest.TestCase):
+
+ def __init__(self, methodName):
+ QmsGui.__init__(self)
+ unittest.TestCase.__init__(self, methodName)
+
+ def _cleanDir(self, dirPath):
+ try:
+ if os.path.isdir(dirPath):
+ fileList = os.listdir(dirPath)
+ [ os.remove(os.path.abspath(os.path.join(dirPath,fileName))) for fileName in fileList ]
+ except OSError:
+ pass
+
+ def _cleanFiles(self):
+ try:
+ os.remove(config.get('directory', 'out.test.dir') + "/" + config.get('directory', 'vrt.out.file'))
+ except OSError:
+ pass
+ self._cleanDir(dirCache+'WorldSat')
+ self._cleanDir(dirCache+'OSM')
+ self._cleanDir(dirCache+'OSM_Topo')
+ self._cleanDir(config.get('directory', 'out.test.dir'))
+
+
+ def setUp(self):
+ self._cleanFiles()
+ res = self.getAppHandle()
+ self.assertTrue(res)
+
+ self._cleanFiles()
+
+ def tearDown(self):
+ pass
diff --git a/test/OSX_uitest/suite.py b/test/OSX_uitest/suite.py
new file mode 100755
index 0000000..e77b4a2
--- /dev/null
+++ b/test/OSX_uitest/suite.py
@@ -0,0 +1,59 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+"""
+/**********************************************************************************************
+Copyright (C) 2016 Ivo Kronenberg
+
+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/>.
+
+**********************************************************************************************/
+"""
+
+from testtools import ToolsTestCase
+from testroute import RouteTestCase
+from testdatabase import DatabaseTestCase
+from testmaps import MapsTestCase
+from qmstestcase import *
+
+
+class TestTest(QmsTestCase):
+ def __init__(self, methodName):
+ QmsTestCase.__init__(self, methodName)
+
+ def testT(self):
+ t = MapsTestCase('testLoadDem')
+ t.getAppHandle()
+ t.testLoadDem()
+ t.testLoadMaps()
+
+
+def suite():
+ t = unittest.TestSuite()
+ t.addTest(TestTest('testT'))
+ #return t
+
+ suiteMaps = MapsTestCase.suite()
+ suiteDatbase = DatabaseTestCase.suite()
+ suiteRoute = RouteTestCase.suite()
+ suiteToos = ToolsTestCase.suite()
+
+ alltests = unittest.TestSuite([suiteMaps, suiteDatbase, suiteRoute, suiteToos])
+ #alltests = unittest.TestSuite([suiteMaps, suiteRoute])
+ #return suiteRoute
+
+ return alltests
+
+
+unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/test/OSX_uitest/testdatabase.py b/test/OSX_uitest/testdatabase.py
new file mode 100644
index 0000000..225ce12
--- /dev/null
+++ b/test/OSX_uitest/testdatabase.py
@@ -0,0 +1,56 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+"""
+/**********************************************************************************************
+Copyright (C) 2016 Ivo Kronenberg
+
+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/>.
+
+**********************************************************************************************/
+"""
+
+from qmstestcase import *
+
+
+class DatabaseTestCase(QmsTestCase):
+ def __init__(self, methodName):
+ QmsTestCase.__init__(self, methodName)
+
+
+ def testConfigDatabase(self):
+ self.showDaten()
+
+ dbGroup = self.appWin().findAll('AXSplitGroup')[0].findAll('AXGroup')[0]
+ # for the case an already existing db has been selected
+ dbGroup.click()
+ dbGroup.clickRight()
+ waitShort()
+ self.app.findAllR('AXMenu', '')[0].click()
+ waitShort()
+
+ dlg = self.app.find('AXWindow', 'Datenbank*')
+ self.assertEqual(dlg.getText(), u'Datenbank hinzufügen...')
+
+ # TODO configure
+ #dlg.find('AXGroup').find('AXButton', 'OK').click()
+ dlg.find('AXGroup').find('AXButton', 'Abbrechen').click()
+
+ @staticmethod
+ def suite():
+ suite = unittest.TestSuite()
+
+ suite.addTest(DatabaseTestCase('testConfigDatabase'))
+
+ return suite
\ No newline at end of file
diff --git a/test/OSX_uitest/testmaps.py b/test/OSX_uitest/testmaps.py
new file mode 100644
index 0000000..5c06ea1
--- /dev/null
+++ b/test/OSX_uitest/testmaps.py
@@ -0,0 +1,125 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+"""
+/**********************************************************************************************
+Copyright (C) 2016 Ivo Kronenberg
+
+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/>.
+
+**********************************************************************************************/
+"""
+
+from qmstestcase import *
+
+import datetime
+
+
+class MapsTestCase(QmsTestCase):
+ def __init__(self, methodName):
+ QmsTestCase.__init__(self, methodName)
+
+ def testLoadDem(self):
+ dirDem = config.get('directory', 'dem.dir')
+
+ self.app.selectMenuItem('Datei', 'DEM Verzeichnisse angeben')
+
+ demPathDlg = self.app.find('AXWindow', u'Pfad für DEM Dateien setzen')
+
+ pathes = demPathDlg.find('AXList').findAll('AXStaticText')
+ mapThere = False
+ for path in pathes:
+ if path.getText() == dirDem:
+ mapThere = True
+
+ if mapThere == False:
+ demPathDlg.findAll('AXButton', '...')[0].click()
+ waitShort()
+ self.safeDirectoryDlg(dirDem)
+ waitShort()
+
+ self.assertTrue(demPathDlg.find('AXList').find('AXStaticText', dirDem).valid())
+
+ demPathDlg.find('AXGroup').find('AXButton', 'OK').click()
+ waitShort()
+
+ self.getAppHandle()
+
+ # activate map
+ demName = config.get('directory', 'dem.name')
+ res = self.selectDem(demName, True)
+ self.assertTrue(res)
+
+
+
+ def testLoadMaps(self):
+ mapDir = config.get('directory', 'map.dir')
+
+ self.app.selectMenuItem('Datei', 'Kartenverzeichnisse angeben')
+
+ mapPathDlg = self.app.find('AXWindow', 'Kartenpfad einrichten')
+
+ pathes = mapPathDlg.find('AXList').findAll('AXStaticText')
+ mapThere = False
+ for path in pathes:
+ if path.getText() == mapDir:
+ mapThere = True
+
+ if mapThere == False:
+ mapPathDlg.findAll('AXButton', '...')[1].click()
+ self.safeDirectoryDlg(mapDir)
+ waitShort()
+
+ self.assertTrue(mapPathDlg.find('AXList').find('AXStaticText', mapDir).valid())
+
+ mapPathDlg.find('AXGroup').find('AXButton', 'OK').click()
+ waitShort()
+
+ self.getAppHandle()
+
+ # activate map
+ mapName = config.get('directory', 'map.name')
+ res = self.selectMap(mapName, True)
+ self.assertTrue(res)
+
+
+ def testOnlineMap(self):
+ type = 'OSM'
+ self.selectMap('OSM', True)
+
+ # check downloaded tiles
+ dateCreated = datetime.datetime.now() - datetime.timedelta(minutes=1)
+
+ dirPath = dirCache+type
+ tiles = 0
+
+ wait(3.0)
+ fileList = os.listdir(dirPath)
+ for fileName in fileList:
+ t = os.path.getmtime(os.path.abspath(os.path.join(dirPath,fileName)))
+ dateFile = datetime.datetime.fromtimestamp(t)
+ if dateCreated < dateFile:
+ tiles = tiles + 1
+ self.assertTrue(tiles > 8, 'only %s tiles found' % tiles)
+
+
+ @staticmethod
+ def suite():
+ suite = unittest.TestSuite()
+
+ suite.addTest(MapsTestCase('testLoadDem'))
+ suite.addTest(MapsTestCase('testLoadMaps'))
+ suite.addTest(MapsTestCase('testOnlineMap'))
+
+ return suite
diff --git a/test/OSX_uitest/testroute.py b/test/OSX_uitest/testroute.py
new file mode 100644
index 0000000..9331609
--- /dev/null
+++ b/test/OSX_uitest/testroute.py
@@ -0,0 +1,229 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+"""
+/**********************************************************************************************
+Copyright (C) 2016 Ivo Kronenberg
+
+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/>.
+
+**********************************************************************************************/
+"""
+
+from qmstestcase import *
+
+
+class RouteTestCase(QmsTestCase):
+ def __init__(self, methodName):
+ QmsTestCase.__init__(self, methodName)
+
+
+ def testConfigRoutino(self):
+ self.showRoute()
+
+ # first dropdown Routino (offline)
+ res = self.appWin().find('AXPopUpButton').selectPopupElement('Routino (offline)')
+ self.assertTrue(res, 'set routino popup button failed')
+
+ routeButton = self.app.findAllR('AXRadioButton', 'Route')[0]
+ groups = self.appWin().findAll('AXGroup', '')
+ group = self._findNeighbour(groups, routeButton)
+
+ # setup database
+ group.find('AXButton', '...').click()
+ dlgRoutinoDb = self.app.find('AXWindow')
+
+ pathes = dlgRoutinoDb.find('AXList').findAll('AXStaticText')
+ routinoPath = config.get('directory', 'mem.dir.ch')
+ routinoPathAdded = False
+ for path in pathes:
+ if path.getText() == routinoPath:
+ routinoPathAdded = True
+ logger.info('routino path ' + routinoPath + ' already added')
+ break
+
+ if routinoPathAdded == False:
+ logger.info('adding routino path ' + routinoPath)
+ dlgRoutinoDb.find('AXButton', '...').click()
+ res = self.safeDirectoryDlg(routinoPath)
+ self.assertTrue(res, 'set directory dialog failed')
+
+ dlgRoutinoDb.find('AXGroup').find('AXButton', 'OK').click()
+
+ # the group for the Routino Route settings
+ dropdowns = group.findAll('AXPopUpButton')
+ for dropdown in dropdowns:
+ dropdown.selectPopupElement('Fahrrad')
+ dropdown.selectPopupElement('Deutsch')
+ dropdown.selectPopupElement('Schnellste')
+ dropdown.selectPopupElement('Europa')
+
+ dropdown.selectPopupElement('Switzerland')
+
+
+ def testSearchGoogle(self):
+ # --> search google
+ self.showDaten()
+ town = 'Grindelwald'
+
+ grid = self.datenProjectGrid()
+ if len(grid) < 2 or grid[1].getText() <> '':
+ # click menu
+ self.app.selectMenuItem('Projekt', 'Mit Google suchen')
+ googleInput = self.datenProjectGrid()[1]
+ else:
+ googleInput = grid[1]
+
+ googleInput.click()
+ waitShort()
+
+ self.app.sendKey("a", [COMMAND])
+ self.app.sendSingleKey(BACKSPACE)
+
+ self.app.sendKey(town)
+ self.app.sendSingleKey(RETURN)
+ #self.app.sendKey('\n')
+ waitShort()
+
+ resultTown = self.datenProjectGrid()[3]
+ self.assertRegexpMatches(resultTown.getText(), town)
+ resultTown.doubleClick()
+ waitShort()
+
+ map = self.mapArea()
+ map.click()
+ waitShort()
+
+ # --> position in status bar
+ coordField = self.appWin().find('AXStaticText').find('AXStaticText')
+ logger.debug(unicode(coordField.getText()).encode('utf8'))
+ self.assertRegexpMatches(coordField.getText(), u'N46\xb0 37.\d{3} E008\xb0 02.\d{3}')
+ # \xb0 °
+ map.click()
+
+
+ def testRoute(self):
+ # relies on testSearchGoogle
+ #self.startApp()
+ self.showMaps()
+
+ # --> routing with routino
+ # click to center of map, where the searched place is
+ map = self.mapArea()
+ map.click()
+ waitShort()
+
+ # auto routing
+ self.app.sendKey('a', [CONTROL])
+ waitShort()
+
+ map.selectPopupMenu(2)
+ waitShort()
+
+ map.moveAndClick(10, 112)
+ waitShort()
+ map.click()
+ waitShort()
+ map.clickRight()
+
+ text = map.find('AXStaticText', 'Track*')
+ self.assertTrue(text.valid())
+ logger.debug(unicode(text.getText()).encode('utf8'))
+ self.assertRegexpMatches(text.getText(), "35\d m")
+
+
+ def testSaveRoute(self):
+ projName='uitest'
+
+ # --> save route
+ map = self.mapArea()
+ map.find('AXButton', 'Als neu speichern').click()
+ #map.find('AXButton', 'Abbrechen').click()
+
+ projDlg = self.app.find('AXWindow', u'Ein Projekt auswählen...')
+ self.assertTrue(projDlg.valid())
+ # FIXME here is a bug in the GUI
+ #projDlg.find('AXList').findAll('AXStaticText')[0].click()
+ #projDlg.find('AXTextField').click()
+ self.app.sendSingleKey(TAB)
+ self.app.sendKey('uitest')
+
+ # *.qms, *.gpx, Datenbank
+ projDlg.find('AXRadioButton', '*.gpx').click()
+ projDlg.find('AXGroup').find('AXButton', 'OK').click()
+
+ nameDlg = self.app.find('AXWindow', u'Name bearbeiten...')
+ self.assertTrue(nameDlg.valid())
+ # FIXME here is a bug in the GUI
+ #nameDlg.find('AXTextField').click()
+ self.app.sendKey(projName)
+ nameDlg.find('AXGroup').find('AXButton', 'OK').click()
+ waitShort()
+
+ self.showDaten()
+
+ # somehow the app reference has been lost, get it again
+ self.getAppHandle()
+
+ grid = self.datenProjectGrid(projName)
+ self.assertIs(len(grid), 1)
+ grid[0].doubleClick()
+ grid = self.datenProjectGrid(projName)
+ self.assertIs(len(grid), 2)
+ grid[1].clickRight()
+ grid[1].selectPopupMenu(1)
+
+ buttonView = self.appWin().findR('AXRadioButton', projName)
+ groups = self.appWin().findAll('AXGroup', '')
+ detailView = self._findNeighbour(groups, buttonView, Direction.below).find('AXSplitGroup')
+
+ detailView.findAll('AXGroup')[1].find('AXRadioButton', 'Punkte').click()
+ table = detailView.findAll('AXGroup')[0].find('AXGroup').findAll('AXGroup')
+
+ # 10 columns per row
+ self.assertEqual(table[2].getText(), '1045 m')
+
+ # the next lines are for a route
+ if False:
+ trkDlg = self.app.find('AXWindow', projName)
+ self.assertTrue(trkDlg.valid())
+ self.assertEqual(trkDlg.find('AXGroup').find('AXTextField').getText(), projName)
+
+ # close dialog
+ trkDlg.find('AXButton').click()
+
+ # close track
+ grid[0].selectPopupMenu(8)
+ waitShort()
+
+ questionDlg = self.app.find('AXWindow', '')
+ questionDlg.find('AXGroup').find('AXButton', 'Nein').click()
+
+
+ def testEditRoute(self):
+ # TODO
+ pass
+
+
+ @staticmethod
+ def suite():
+ suite = unittest.TestSuite()
+
+ suite.addTest(RouteTestCase('testConfigRoutino'))
+ suite.addTest(RouteTestCase('testSearchGoogle'))
+ suite.addTest(RouteTestCase('testRoute'))
+ suite.addTest(RouteTestCase('testSaveRoute'))
+ suite.addTest(RouteTestCase('testEditRoute'))
+
+ return suite
\ No newline at end of file
diff --git a/test/OSX_uitest/testtools.py b/test/OSX_uitest/testtools.py
new file mode 100644
index 0000000..e68df2b
--- /dev/null
+++ b/test/OSX_uitest/testtools.py
@@ -0,0 +1,108 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+"""
+/**********************************************************************************************
+Copyright (C) 2016 Ivo Kronenberg
+
+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/>.
+
+**********************************************************************************************/
+"""
+
+from qmstestcase import *
+
+
+class ToolsTestCase(QmsTestCase):
+ def __init__(self, methodName):
+ QmsTestCase.__init__(self, methodName)
+
+ def testVrtBuilder(self):
+ self.app.selectMenuItem('Werkzeug', 'VRT Builder')
+
+ group = self.app.findR('AXStaticText', 'Quelldateien*').parent()
+
+ group.findAll('AXButton', '...')[0].click()
+ res = self.openFileDlg(config.get('directory', 'dem.dir.ch'))
+ self.assertTrue(res)
+
+ group.findAll('AXButton', '...')[1].click()
+
+ res = self.safeFileDlg(config.get('directory', 'out.test.dir') , config.get('directory', 'vrt.out.file'))
+ self.assertTrue(res)
+
+ group.find('AXButton', 'Start').click()
+ wait(1.0)
+
+ group = self.app.findR('AXStaticText', 'Quelldateien*').parent()
+
+ # test result
+ resultField = group.find('AXStaticText', '')
+ resultField.click()
+ self.app.sendKey('a', [COMMAND])
+
+ self.assertRegexpMatches(resultField.ax.AXSelectedText, '0...10...20...30...40...50...60...70...80...90...100 - done')
+ self.assertTrue(os.path.isfile(config.get('directory', 'out.test.dir') + '/' + config.get('directory', 'vrt.out.file')))
+
+
+ def testRoutinoDatabaseBuilder(self):
+ self.app.selectMenuItem('Werkzeug', 'Routino Datenbank erstellen')
+
+ group = self.app.findR('AXStaticText', 'Quelldateien*').parent()
+
+ group.findAll('AXButton', '...')[0].click()
+
+ res = self.openFileDlg(config.get('directory', 'pbf.dir.ch'), config.get('directory', 'pdf.file.ch'))
+ self.assertTrue(res)
+
+ group.findAll('AXButton', '...')[1].click()
+ res = self.safeDirectoryDlg(config.get('directory', 'out.test.dir'))
+ self.assertTrue(res)
+
+ # FIXME here is a bug in the GUI
+ group.find('AXStaticText', '').click()
+ self.app.sendSingleKey(TAB)
+ self.app.sendKey(config.get('directory', 'routing.out.file'))
+ waitShort()
+
+ group.find('AXButton', 'Starten').click()
+
+ i = 1
+ text = None
+ while i < 15:
+ i = i + 1
+ wait(10)
+
+ group = self.app.findR('AXStaticText', 'Quelldateien*').parent()
+
+ # test result
+ resultField = group.find('AXStaticText', '')
+ resultField.click()
+ self.app.sendKey('a', [COMMAND])
+ text = resultField.ax.AXSelectedText
+ if text.endswith('!!! erledigt !!!'): break
+
+ self.assertRegexpMatches(text, '!!! erledigt !!!')
+ file = config.get('directory', 'out.test.dir') + '/' + config.get('directory', 'routing.out.file')+ "-nodes.mem"
+ self.assertTrue(os.path.isfile(file), file + " not fould")
+
+
+ @staticmethod
+ def suite():
+ suite = unittest.TestSuite()
+
+ suite.addTest(ToolsTestCase('testVrtBuilder'))
+ suite.addTest(ToolsTestCase('testRoutinoDatabaseBuilder'))
+
+ return suite
\ No newline at end of file
diff --git a/test/OSX_uitest/uiautomator.py b/test/OSX_uitest/uiautomator.py
new file mode 100644
index 0000000..8e7af79
--- /dev/null
+++ b/test/OSX_uitest/uiautomator.py
@@ -0,0 +1,502 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+"""
+/**********************************************************************************************
+Copyright (C) 2016 Ivo Kronenberg
+
+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/>.
+
+**********************************************************************************************/
+"""
+
+
+import atomac
+import atomac.AXKeyboard as AXKeyboard
+
+from collections import deque
+import time
+import logging
+import ConfigParser
+
+
+def initConfig():
+ config = ConfigParser.ConfigParser()
+ config.read('uitest.cfg')
+ return config
+
+
+def initLogger():
+ FORMAT = '%(asctime)-15s %(message)s'
+ logging.basicConfig(format=FORMAT)
+ log = logging.getLogger('uitest')
+ log.setLevel(logging.INFO)
+ return log
+
+
+logger = initLogger()
+config = initConfig()
+
+
+def waitShort():
+ time.sleep(config.getfloat('flow', 'wait'))
+
+def wait(sec):
+ time.sleep(sec)
+
+
+
+class UIBase:
+ def __init__(self, ax, app):
+ self.ax = ax
+ self.cache = {}
+ if app is None:
+ self.app = self
+ else:
+ self.app = app
+ if ax is None:
+ raise ReferenceError()
+
+ def _lookup(self, find, type, match, clear):
+ key = find + '#' + type
+ if match is not None:
+ key = key + '#' + match
+
+ logger.debug(unicode(key).encode('utf8'))
+ if key in self.cache:
+ if clear:
+ del self.cache[key]
+ return None
+ logger.debug('match')
+ return self.cache[key]
+ logger.debug('no match')
+ return None
+
+ def _put(self, element, find, type, match):
+ key = find + '#' + type
+ if match is not None:
+ key = key + '#' + match
+
+ self.cache[key] = element
+ return element
+
+
+ def centreCoordinates(self):
+ x, y = self.ax.AXPosition
+ width, height = self.ax.AXSize
+ return (x + width / 2, y + height / 2)
+
+ def valid(self):
+ return self.ax is not None
+
+ def enabled(self):
+ return self.valid() and self.ax.AXEnabled
+
+ def _measureEnter(self, method):
+ self.start = time.time()
+ self.methodname = method
+
+ def _measureLeave(self):
+ end = time.time()
+ logger.debug("exec time " + self.methodname + " " + str(end - self.start))
+
+
+ def find(self, type, textmatch=None, refresh=True):
+ self._measureEnter("find")
+ try:
+ v = self._lookup('find', type, textmatch, refresh)
+ if v is not None: return v
+
+ if textmatch is not None:
+ e = UIElement(self.ax.findFirst(AXRole=type, AXTitle=textmatch), self.app)
+ return self._put(e, 'find', type, textmatch)
+ else:
+ e = UIElement(self.ax.findFirst(AXRole=type), self.app)
+ return self._put(e, 'find', type, textmatch)
+ finally:
+ self._measureLeave()
+
+ def findNr(self, type, textmatch, nr, refresh=True):
+ return self.findAll(type, textmatch, refresh)[nr]
+
+ def findAll(self, type, textmatch=None, refresh=True):
+ self._measureEnter("findAll")
+ try:
+ v = self._lookup('findAll', type, textmatch, refresh)
+ if v is not None: return v
+
+ if textmatch is not None:
+ axs = self.ax.findAll(AXRole=type, AXTitle=textmatch)
+ else:
+ axs = self.ax.findAll(AXRole=type)
+ e = []
+ if axs is not None and len(axs) > 0:
+ for ax in axs:
+ e.append(UIElement(ax, self.app))
+
+ return self._put(e, 'findAll', type, textmatch)
+ finally:
+ self._measureLeave()
+
+
+ def findAllR(self, type, textmatch=None, refresh=True):
+ self._measureEnter("findAllR")
+ try:
+ v = self._lookup('findAllR', type, textmatch, refresh)
+ if v is not None: return v
+
+ if textmatch is not None:
+ axs = self.ax.findAllR(AXRole=type, AXTitle=textmatch)
+ else:
+ axs = self.ax.findAllR(AXRole=type)
+ e = []
+ if axs is not None and len(axs) > 0:
+ for ax in axs:
+ e.append(UIElement(ax, self.app))
+
+ return self._put(e, 'findAllR', type, textmatch)
+ finally:
+ self._measureLeave()
+
+ def findR(self, type, textmatch=None, refresh=True):
+ self._measureEnter("findR")
+ try:
+ v = self._lookup('findR', type, textmatch, refresh)
+ if v is not None: return v
+
+ if textmatch is not None:
+ e = UIElement(self.ax.findFirstR(AXRole=type, AXTitle=textmatch), self.app)
+ return self._put(e, 'findR', type, textmatch)
+ else:
+ e = UIElement(self.ax.findFirstR(AXRole=type), self.app)
+ return self._put(e, 'findR', type, textmatch)
+ finally:
+ self._measureLeave()
+
+
+ def parent(self):
+ return UIElement(self.ax.AXParent, self.app)
+
+ def children(self):
+ e = []
+ axs = self.ax.AXChildren
+ if axs is not None and len(axs) > 0:
+ for ax in axs:
+ e.append(UIElement(ax, self.app))
+
+ return e
+
+ def visible(self):
+ x, y = self.ax.AXPosition
+ return x >= 0 and y >= 0
+
+
+
+# Special keys
+TAB = '<tab>'
+RETURN = '<return>'
+ESCAPE = '<escape>'
+CAPS_LOCK = '<capslock>'
+DELETE = '<delete>'
+NUM_LOCK = '<num_lock>'
+SCROLL_LOCK = '<scroll_lock>'
+PAUSE = '<pause>'
+BACKSPACE = '<backspace>'
+INSERT = '<insert>'
+
+# Cursor movement
+UP = '<cursor_up>'
+DOWN = '<cursor_down>'
+LEFT = '<cursor_left>'
+RIGHT = '<cursor_right>'
+PAGE_UP = '<page_up>'
+PAGE_DOWN = '<page_down>'
+HOME = '<home>'
+END = '<end>'
+
+# Modifier keys
+COMMAND_L = '<command_l>'
+SHIFT_L = '<shift_l>'
+OPTION_L = '<option_l>'
+CONTROL_L = '<control_l>'
+
+COMMAND_R = '<command_r>'
+SHIFT_R = '<shift_r>'
+OPTION_R = '<option_r>'
+CONTROL_R = '<control_r>'
+
+# Default modifier keys -> left:
+COMMAND = COMMAND_L
+SHIFT = SHIFT_L
+OPTION = OPTION_L
+CONTROL = CONTROL_L
+
+
+class KeyboardHandler (UIBase):
+
+ def __init__(self, ax, app):
+ UIBase.__init__(self, ax, app)
+
+ def _replace(self, str):
+ return str.replace(u'ö', '\xd6')
+
+ def sendKey(self, key, modifiers = []):
+ if len(modifiers) == 0:
+ self.app.ax.sendKeys(key)
+ else:
+ self.app.ax.sendKeyWithModifiers(key, modifiers)
+
+ def sendSingleKey(self, key):
+ self.app.ax.sendKey(key)
+
+
+
+class MouseHandler(UIBase):
+
+ def __init__(self, ax, app):
+ UIBase.__init__(self, ax, app)
+ self.dx = 0
+ self.dy = 0
+
+ def _coordinates(self):
+ (x, y) = self.centreCoordinates()
+ return (x+self.dx, y+self.dy)
+
+ def click(self):
+ #self.ax.Press()
+ self.app.ax.clickMouseButtonLeft(self._coordinates())
+
+ def doubleClick(self):
+ self.app.ax.doubleClickMouse(self._coordinates())
+
+ def clickRight(self):
+ self.app.ax.clickMouseButtonRight(self._coordinates())
+
+ def moveAndClick(self, dx, dy):
+ self.dx = dx
+ self.dy = dy
+ self.app.ax.clickMouseButtonLeft(self._coordinates())
+
+
+class UIElement(UIBase, MouseHandler):
+
+ def __init__(self, ax, app):
+ UIBase.__init__(self, ax, app)
+ MouseHandler.__init__(self, ax, app)
+
+ def setValue(self, value):
+ self.ax.AXValue = value
+
+ def getText(self):
+ if self.ax.AXValue is not None:
+ return self.ax.AXValue
+
+ return self.ax.AXTitle
+
+ def selectPopupElement(self, title):
+ langElements = self.find('AXList').findAll('AXStaticText', title)
+ if len(langElements) == 1:
+ self.click()
+ waitShort()
+ langElements[0].click()
+ return True
+
+ return False
+
+ def selectPopupMenu(self, nr):
+ self.clickRight()
+ waitShort()
+
+ i = 0
+ while i < nr:
+ self.app.sendSingleKey(DOWN)
+ i = i + 1
+ self.app.sendSingleKey(RETURN)
+
+
+class UIApp(UIElement, KeyboardHandler):
+
+ def __init__(self, app):
+ UIElement.__init__(self, app, None)
+ KeyboardHandler.__init__(self, app, None)
+
+ # bugfixes for event queue
+ self.app.keyboard = AXKeyboard.loadKeyboard()
+ self.app.eventList = deque()
+
+
+ @staticmethod
+ def getApp(bundleName):
+ ax = None
+ try:
+ ax = atomac.getAppRefByBundleId(bundleName)
+ except ValueError:
+ ax = atomac.launchAppByBundleId(bundleName)
+ if ax is None:
+ ax = atomac.getAppRefByBundleId(bundleName)
+
+ while ax.AXTitle is None:
+ ax = atomac.getAppRefByBundleId(bundleName)
+
+ ax.activate()
+ return UIApp(ax)
+
+
+ def selectMenuItem(self, menuText, menuItemText):
+ # AXMenuBar -> AXMenuBarItem -> AXMenu -> AXMenuItem
+ menu = self.app.ax.AXMenuBar.findFirst(AXRole='AXMenuBarItem', AXTitle=menuText)
+ menuitem = menu.findFirstR(AXRole='AXMenuItem', AXTitle=menuItemText)
+ menu.Press()
+ menuitem.Press()
+
+
+class UIAutomator:
+ def __init__(self):
+ self.app = None
+
+ self.appName = 'QMapShack*'
+ self.bundleId = 'org.qlandkarte.QMapShack'
+
+ def appWin(self, reload=False):
+ return self.app.find('AXWindow', None, reload)
+
+ def openFileDlg(self, dirname, filename=None):
+ fileDlg = self.app.find('AXWindow', 'Dateien*')
+ if fileDlg.valid() == False:
+ return False
+
+ # input for directory
+ self.app.sendKey('7', [SHIFT]) # /
+ waitShort()
+
+ dirInput = fileDlg.find('AXSheet')
+ dirInput.find('AXTextField').setValue(dirname)
+ waitShort()
+ dirInput.findNr('AXButton', None, 1).click()
+
+ # select file
+ subelement = fileDlg.find('AXGroup').find('AXSplitGroup').find('AXSplitGroup').find('AXScrollArea').find('AXOutline')
+ files = subelement.findAllR('AXTextField')
+
+ found = False
+ if filename is not None:
+ for f in files:
+ if f.ax.AXFilename == filename:
+ f.click()
+ break
+
+ if found == False:
+ files[0].click()
+
+ # open
+ fileDlg.find('AXButton', '\xd6ffnen').click()
+ waitShort()
+
+ return True
+
+
+ def safeFileDlg(self, dirname, filename = None):
+ fileDlg = self.app.find('AXWindow', 'Zieldatei*')
+ if fileDlg.valid() == False:
+ return False
+
+ # input for directory
+ self.app.sendKey('7', [SHIFT])
+ waitShort()
+
+ dirInput = fileDlg.find('AXSheet')
+ dirInput.find('AXTextField').setValue(dirname)
+ self.app.sendKey('\n')
+ waitShort()
+
+ # set filename
+ fileDlg.find('AXTextField').setValue(filename)
+ waitShort()
+
+ fileDlg.find('AXButton', 'Sichern').click()
+
+ waitShort()
+
+ return True
+
+
+ def safeDirectoryDlg(self, dirname):
+ # 'Zielpfad*'
+ fileDlg = self.app.find('AXWindow')
+ if fileDlg.valid() == False:
+ return False
+
+ # input for directory
+ self.app.sendKey('7', [SHIFT])
+ waitShort()
+
+ dirInput = fileDlg.find('AXSheet')
+ dirInput.find('AXTextField').setValue(dirname)
+ self.app.sendKey('\n')
+ waitShort()
+
+ fileDlg.find('AXButton', u'Öffnen').click()
+
+ waitShort()
+
+ return True
+
+
+ def getAppHandle(self):
+ self.app = UIApp.getApp(self.bundleId)
+ return self.app.valid()
+
+
+ def closeApp(self):
+ self.app.sendKey('q', [COMMAND])
+ # TODO assert
+ return True
+
+
+ @staticmethod
+ def debug(element, depth=1, nr=0, inv=0, typeMap=None):
+ if depth <= inv and depth > 0:
+ return
+
+ if element is None:
+ print "None element"
+ elif isinstance(element, list):
+ i = 0
+ ctypeMap = {}
+ for e in element:
+ UIAutomator.debug(e, depth, i, inv, ctypeMap)
+ i = i+1
+ else:
+ if typeMap is None: typeMap = {}
+ type = element.ax.AXRole
+ tcount = 0
+ if type in typeMap:
+ tcount = tcount + typeMap[type]
+ typeMap[type] = tcount
+
+ pre = "".ljust(inv*4)
+ print pre + str(nr) + " (" + str(typeMap[type]) +") " + str(element.ax)
+ print pre +" attributes " + str(element.ax.getAttributes())
+ print pre +" actions: " + str(element.ax.getActions())
+ print pre +" Pos / Size: " + str(element.ax.AXPosition) + " " + str(element.ax.AXSize)
+ print pre +" parent: "+ str(element.parent().ax)
+ print pre +" children: "
+
+ if element.ax.AXChildren is not None:
+ c = 0
+ cinv = inv+1
+ ctypeMap = {}
+ for child in element.ax.AXChildren:
+ UIAutomator.debug(UIElement(child, element.app), depth, c, cinv, ctypeMap)
+ c = c + 1
diff --git a/test/OSX_uitest/uitest.cfg b/test/OSX_uitest/uitest.cfg
new file mode 100644
index 0000000..06f4117
--- /dev/null
+++ b/test/OSX_uitest/uitest.cfg
@@ -0,0 +1,15 @@
+[directory]
+out.test.dir=/data/GPS/out
+vrt.out.file=test.vrt
+routing.out.file=test
+cache.dir=
+dem.dir.ch=/data/GPS/Relief/L32
+dem.dir=/data/GPS/Relief
+dem.name=l32 ch
+map.dir=/data/GPS/Karten
+map.name=raumbezug ch
+pbf.dir.ch=/data/GPS/Routing
+pdf.file.ch=switzerland-latest.osm.pbf
+mem.dir.ch=/data/GPS/Routing
+[flow]
+wait=1.0
\ No newline at end of file
diff --git a/src/map/cache/IDiskCache.cpp b/test/unittest/CFitProject.cpp
similarity index 67%
rename from src/map/cache/IDiskCache.cpp
rename to test/unittest/CFitProject.cpp
index e06c907..d2ec3b7 100644
--- a/src/map/cache/IDiskCache.cpp
+++ b/test/unittest/CFitProject.cpp
@@ -1,5 +1,5 @@
/**********************************************************************************************
- Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+ Copyright (C) 2016 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,14 +16,18 @@
**********************************************************************************************/
-#include "IDiskCache.h"
+#include <QtCore>
-IDiskCache::IDiskCache(QObject *parent)
- : QObject(parent)
-{
-}
+#include "TestHelper.h"
+#include "test_QMapShack.h"
+
+#include "gis/prj/IGisProject.h"
+#include "gis/fit/CFitProject.h"
-IDiskCache::~IDiskCache()
+void test_QMapShack::_readValidFitFiles()
{
+ delete readProjFile("2015-05-07-22-03-17.fit");
+ delete readProjFile("Warisouderghem_course.fit");
+ delete readProjFile("2016-03-12_15-16-50_4_20.fit");
}
diff --git a/src/test/CGisItemTrk.cpp b/test/unittest/CGisItemTrk.cpp
similarity index 96%
rename from src/test/CGisItemTrk.cpp
rename to test/unittest/CGisItemTrk.cpp
index 6556ce6..fdd285f 100644
--- a/src/test/CGisItemTrk.cpp
+++ b/test/unittest/CGisItemTrk.cpp
@@ -16,8 +16,8 @@
**********************************************************************************************/
-#include "test/TestHelper.h"
-#include "test/test_QMapShack.h"
+#include "TestHelper.h"
+#include "test_QMapShack.h"
#include "gis/gpx/CGpxProject.h"
#include "gis/trk/CGisItemTrk.h"
diff --git a/src/test/CGpxProject.cpp b/test/unittest/CGpxProject.cpp
similarity index 93%
rename from src/test/CGpxProject.cpp
rename to test/unittest/CGpxProject.cpp
index 82e1858..df44b12 100644
--- a/src/test/CGpxProject.cpp
+++ b/test/unittest/CGpxProject.cpp
@@ -16,8 +16,8 @@
**********************************************************************************************/
-#include "test/TestHelper.h"
-#include "test/test_QMapShack.h"
+#include "TestHelper.h"
+#include "test_QMapShack.h"
#include "gis/gpx/CGpxProject.h"
@@ -42,6 +42,7 @@ void test_QMapShack::_writeReadGpxFile()
writeReadGpxFile("qtt_gpx_file0.gpx");
writeReadGpxFile("gpx_ext_GarminTPX1_gpxtpx.gpx");
writeReadGpxFile("gpx_ext_GarminTPX1_tp1.gpx");
+ writeReadGpxFile("gpx_ext_GarminTPX1_cns.gpx");
writeReadGpxFile("V1.6.0_file1.qms");
writeReadGpxFile("V1.6.0_file2.qms");
}
diff --git a/src/test/CKnownExtension.cpp b/test/unittest/CKnownExtension.cpp
similarity index 98%
rename from src/test/CKnownExtension.cpp
rename to test/unittest/CKnownExtension.cpp
index ca222ed..8f5b4a7 100644
--- a/src/test/CKnownExtension.cpp
+++ b/test/unittest/CKnownExtension.cpp
@@ -16,8 +16,8 @@
**********************************************************************************************/
-#include "test/TestHelper.h"
-#include "test/test_QMapShack.h"
+#include "TestHelper.h"
+#include "test_QMapShack.h"
#include "gis/gpx/CGpxProject.h"
#include "gis/trk/CGisItemTrk.h"
diff --git a/test/unittest/CMakeLists.txt b/test/unittest/CMakeLists.txt
new file mode 100644
index 0000000..bfe89b7
--- /dev/null
+++ b/test/unittest/CMakeLists.txt
@@ -0,0 +1,90 @@
+# Find includes in corresponding build directories
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+# Instruct CMake to run moc automatically when needed.
+set(CMAKE_AUTOMOC ON)
+
+find_package(Qt5Test)
+
+find_package(Qt5Widgets)
+find_package(Qt5Core)
+find_package(Qt5Xml)
+find_package(Qt5Script)
+find_package(Qt5Sql)
+find_package(Qt5WebKitWidgets)
+find_package(Qt5LinguistTools)
+find_package(Qt5PrintSupport)
+if(UNIX)
+find_package(Qt5DBus)
+endif(UNIX)
+find_package(GDAL REQUIRED)
+find_package(PROJ REQUIRED)
+find_package(ROUTINO REQUIRED)
+
+if(UNIX)
+ set(DBUS_LIB Qt5::DBus)
+else(UNIX)
+ set(DBUS_LIB)
+endif(UNIX)
+
+if(UNIX)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+endif(UNIX)
+
+
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../src
+)
+
+include_directories(
+ SYSTEM # this prevents warnings from non-QMS headers
+ ${GDAL_INCLUDE_DIRS}
+ ${PROJ_INCLUDE_DIRS}
+ ${ROUTINO_INCLUDE_DIRS}
+)
+
+qt5_add_resources(RC_SRCS ./../../src/resources.qrc)
+
+add_executable(qttest EXCLUDE_FROM_ALL
+ main.cpp
+ test_QMapShack.h
+ CGpxProject.cpp
+ CFitProject.cpp
+ CQmsProject.cpp
+ CSlfReader.cpp
+ CKnownExtension.cpp
+ TestHelper.cpp
+ CGisItemTrk.cpp
+ ${RC_SRCS})
+
+# copy the input files required by the unittests to ./bin/input
+file(COPY input DESTINATION ${CMAKE_BINARY_DIR}/bin/)
+
+target_link_libraries(qttest
+ Qt5::Widgets
+ Qt5::Xml
+ Qt5::Script
+ Qt5::Sql
+ Qt5::WebKitWidgets
+ Qt5::PrintSupport
+ Qt5::Test
+ QMS
+ ${DBUS_LIB}
+ ${GDAL_LIBRARIES}
+ ${PROJ_LIBRARIES}
+ ${ROUTINO_LIBRARIES}
+)
+
+add_custom_command(
+ OUTPUT tests_run.log
+ COMMAND qttest
+ DEPENDS qttest
+ COMMENT "Executing the Unittests"
+ VERBATIM
+)
+
+add_custom_target(
+ run_tests
+ DEPENDS tests_run.log
+)
+
diff --git a/src/test/CQmsProject.cpp b/test/unittest/CQmsProject.cpp
similarity index 96%
rename from src/test/CQmsProject.cpp
rename to test/unittest/CQmsProject.cpp
index 754f164..8fb3e5d 100644
--- a/src/test/CQmsProject.cpp
+++ b/test/unittest/CQmsProject.cpp
@@ -18,8 +18,8 @@
#include <QtCore>
-#include "test/TestHelper.h"
-#include "test/test_QMapShack.h"
+#include "TestHelper.h"
+#include "test_QMapShack.h"
#include "gis/gpx/CGpxProject.h"
#include "gis/qms/CQmsProject.h"
diff --git a/src/test/CSlfReader.cpp b/test/unittest/CSlfReader.cpp
similarity index 97%
rename from src/test/CSlfReader.cpp
rename to test/unittest/CSlfReader.cpp
index cca76e7..018fb8f 100644
--- a/src/test/CSlfReader.cpp
+++ b/test/unittest/CSlfReader.cpp
@@ -16,7 +16,7 @@
**********************************************************************************************/
-#include "test/test_QMapShack.h"
+#include "test_QMapShack.h"
#include "gis/prj/IGisProject.h"
diff --git a/src/test/TestHelper.cpp b/test/unittest/TestHelper.cpp
similarity index 99%
rename from src/test/TestHelper.cpp
rename to test/unittest/TestHelper.cpp
index 7b75ffd..f5a2a9b 100644
--- a/src/test/TestHelper.cpp
+++ b/test/unittest/TestHelper.cpp
@@ -21,7 +21,7 @@
#include <QTemporaryFile>
#include <QTest>
-#include "test/TestHelper.h"
+#include "TestHelper.h"
QString TestHelper::getTempFileName(const QString &ext)
{
diff --git a/src/test/TestHelper.h b/test/unittest/TestHelper.h
similarity index 95%
rename from src/test/TestHelper.h
rename to test/unittest/TestHelper.h
index d6bfc5e..3e8fa96 100644
--- a/src/test/TestHelper.h
+++ b/test/unittest/TestHelper.h
@@ -23,7 +23,7 @@
#define SUBVERIFY(EXPR, MSG) { \
if(!(EXPR)) { \
- throw QString("Verification of `%1` failed: %2").arg(#EXPR).arg(MSG); \
+ throw QString("Verification of `%1` failed: %2 (%3:%4)").arg(#EXPR).arg(MSG).arg(__FILE__).arg(__LINE__); \
} \
}
diff --git a/test/unittest/input/fit/2015-05-07-22-03-17.fit b/test/unittest/input/fit/2015-05-07-22-03-17.fit
new file mode 100644
index 0000000..6dca40a
Binary files /dev/null and b/test/unittest/input/fit/2015-05-07-22-03-17.fit differ
diff --git a/src/test/input/slf/qtt_slf_file0.slf.xml b/test/unittest/input/fit/2015-05-07-22-03-17.fit.xml
similarity index 72%
copy from src/test/input/slf/qtt_slf_file0.slf.xml
copy to test/unittest/input/fit/2015-05-07-22-03-17.fit.xml
index e6f402a..1b359aa 100644
--- a/src/test/input/slf/qtt_slf_file0.slf.xml
+++ b/test/unittest/input/fit/2015-05-07-22-03-17.fit.xml
@@ -1,27 +1,24 @@
<expected>
- <name>qttest slf file 0</name>
- <desc>QTTest .slf input file 0</desc>
+ <name>2015-07-05-22-03-17</name>
+ <desc></desc>
- <waypoints>
- <waypoint name="Break 0" />
- <waypoint name="Break 1" />
- <waypoint name="Lap 0" />
- </waypoints>
+ <waypoints></waypoints>
+ <!-- name="5/7/2015 10:03:17 PM" -->
<tracks>
- <track name="qttest slf file 0" colorIdx="4" colorName="DarkBlue" segcount="2" pointcount="2764">
+ <track name="2015-07-05-22-03-17" colorIdx="12" colorName="DarkGray" segcount="1" pointcount="2341">
<colorSources>
<colorSource known="true" everypoint="false" derived="true" name="::ql:slope" />
- <colorSource known="true" everypoint="false" derived="true" name="::ql:speed" />
<colorSource known="true" everypoint="false" derived="false" name="::ql:ele" />
<colorSource known="true" everypoint="false" derived="true" name="::ql:progress" />
+ <colorSource known="true" everypoint="false" derived="true" name="::ql:speed" />
<colorSource known="true" everypoint="true" derived="false" name="speed" />
<colorSource known="true" everypoint="true" derived="false" name="gpxtpx:TrackPointExtension|gpxtpx:atemp" />
+ <colorSource known="true" everypoint="false" derived="false" name="gpxtpx:TrackPointExtension|gpxtpx:cad" />
</colorSources>
</track>
</tracks>
<routes></routes>
-
<areas></areas>
</expected>
diff --git a/test/unittest/input/fit/2016-03-12_15-16-50_4_20.fit b/test/unittest/input/fit/2016-03-12_15-16-50_4_20.fit
new file mode 100644
index 0000000..5939d48
Binary files /dev/null and b/test/unittest/input/fit/2016-03-12_15-16-50_4_20.fit differ
diff --git a/test/unittest/input/fit/2016-03-12_15-16-50_4_20.fit.xml b/test/unittest/input/fit/2016-03-12_15-16-50_4_20.fit.xml
new file mode 100644
index 0000000..5f4d3c6
--- /dev/null
+++ b/test/unittest/input/fit/2016-03-12_15-16-50_4_20.fit.xml
@@ -0,0 +1,24 @@
+<expected>
+ <name>2016-12-03-15-13-03</name>
+ <desc></desc>
+
+ <waypoints></waypoints>
+
+ <!-- name="8/30/2014 2:00:00 AM" -->
+ <tracks>
+ <track name="2016-12-03-15-13-03" colorIdx="12" colorName="DarkGray" segcount="2" pointcount="62">
+ <colorSources>
+ <colorSource known="true" everypoint="false" derived="true" name="::ql:slope" />
+ <colorSource known="true" everypoint="false" derived="false" name="::ql:ele" />
+ <colorSource known="true" everypoint="false" derived="true" name="::ql:progress" />
+ <colorSource known="true" everypoint="false" derived="true" name="::ql:speed" />
+ <colorSource known="true" everypoint="true" derived="false" name="speed" />
+ <colorSource known="true" everypoint="false" derived="false" name="gpxtpx:TrackPointExtension|gpxtpx:hr" />
+ <colorSource known="true" everypoint="false" derived="false" name="gpxtpx:TrackPointExtension|gpxtpx:cad" />
+ </colorSources>
+ </track>
+ </tracks>
+
+ <routes></routes>
+ <areas></areas>
+</expected>
diff --git a/test/unittest/input/fit/Warisouderghem_course.fit b/test/unittest/input/fit/Warisouderghem_course.fit
new file mode 100644
index 0000000..dc5e426
Binary files /dev/null and b/test/unittest/input/fit/Warisouderghem_course.fit differ
diff --git a/test/unittest/input/fit/Warisouderghem_course.fit.xml b/test/unittest/input/fit/Warisouderghem_course.fit.xml
new file mode 100644
index 0000000..95cfebe
--- /dev/null
+++ b/test/unittest/input/fit/Warisouderghem_course.fit.xml
@@ -0,0 +1,22 @@
+<expected>
+ <name>Warisouderghem</name>
+ <desc></desc>
+
+ <waypoints></waypoints>
+
+ <!-- name="8/30/2014 2:00:00 AM" -->
+ <tracks>
+ <track name="Warisouderghem" colorIdx="12" colorName="DarkGray" segcount="1" pointcount="1790">
+ <colorSources>
+ <colorSource known="true" everypoint="false" derived="true" name="::ql:slope" />
+ <colorSource known="true" everypoint="false" derived="false" name="::ql:ele" />
+ <colorSource known="true" everypoint="false" derived="true" name="::ql:progress" />
+ <colorSource known="true" everypoint="false" derived="true" name="::ql:speed" />
+ <colorSource known="true" everypoint="true" derived="false" name="speed" />
+ </colorSources>
+ </track>
+ </tracks>
+
+ <routes></routes>
+ <areas></areas>
+</expected>
diff --git a/test/unittest/input/gpx/gpx_ext_GarminTPX1_cns.gpx b/test/unittest/input/gpx/gpx_ext_GarminTPX1_cns.gpx
new file mode 100644
index 0000000..dea3942
--- /dev/null
+++ b/test/unittest/input/gpx/gpx_ext_GarminTPX1_cns.gpx
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<gpx xmlns="http://www.topografix.com/GPX/1/1" version="1.1" xmlns:cns="http://www.garmin.com/xmlschemas/TrackPointExtension/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd http://www.garmin.com/xmlschemas/TrackPointExtension/v1 http://www.garmin.com/xmlschemas/TrackPointExtensionv1.xsd">
+ <metadata>
+ <name>Garmin TPX1 Test NS cns</name>
+ <desc></desc>
+ <time>2015-11-14T19:09:45Z</time>
+ </metadata>
+ <trk>
+ <name>Track</name>
+ <trkseg>
+ <trkpt lat="49.43892301" lon="11.40093000">
+ <ele>525</ele>
+ <time>2015-10-02T13:56:08Z</time>
+ <extensions>
+ <cns:TrackPointExtension>
+ <cns:atemp>20.0</cns:atemp>
+ <cns:wtemp>10.0</cns:wtemp>
+ <cns:depth>100.0</cns:depth>
+ <cns:hr>90</cns:hr>
+ <cns:cad>60</cns:cad>
+ </cns:TrackPointExtension>
+ </extensions>
+ </trkpt>
+ <trkpt lat="49.43895997" lon="11.40101994">
+ <ele>526</ele>
+ <time>2015-10-02T13:56:10Z</time>
+ <extensions>
+ <cns:TrackPointExtension>
+ <cns:atemp>21.0</cns:atemp>
+ <cns:wtemp>11.0</cns:wtemp>
+ <cns:depth>101.0</cns:depth>
+ <cns:hr>91</cns:hr>
+ <cns:cad>61</cns:cad>
+ </cns:TrackPointExtension>
+ </extensions>
+ </trkpt>
+ <trkpt lat="49.43899702" lon="11.40111197">
+ <ele>527</ele>
+ <time>2015-10-02T13:56:12Z</time>
+ <extensions>
+ <cns:TrackPointExtension>
+ <cns:atemp>22.0</cns:atemp>
+ <cns:wtemp>12.0</cns:wtemp>
+ <cns:depth>102.0</cns:depth>
+ <cns:hr>92</cns:hr>
+ <cns:cad>62</cns:cad>
+ </cns:TrackPointExtension>
+ </extensions>
+ </trkpt>
+ <trkpt lat="49.43903197" lon="11.40118993">
+ <ele>528</ele>
+ <time>2015-10-02T13:56:14Z</time>
+ <extensions>
+ <cns:TrackPointExtension>
+ <cns:atemp>23.0</cns:atemp>
+ <cns:wtemp>13.0</cns:wtemp>
+ <cns:depth>103.0</cns:depth>
+ <cns:hr>93</cns:hr>
+ <cns:cad>63</cns:cad>
+ </cns:TrackPointExtension>
+ </extensions>
+ </trkpt>
+ <trkpt lat="49.43905997" lon="11.40126696">
+ <ele>529</ele>
+ <time>2015-10-02T13:56:16Z</time>
+ <extensions>
+ <cns:TrackPointExtension>
+ <cns:atemp>24.0</cns:atemp>
+ <cns:wtemp>14.0</cns:wtemp>
+ <cns:depth>104.0</cns:depth>
+ <cns:hr>94</cns:hr>
+ <cns:cad>64</cns:cad>
+ </cns:TrackPointExtension>
+ </extensions>
+ </trkpt>
+ <trkpt lat="49.43908000" lon="11.40133300">
+ <ele>530</ele>
+ <time>2015-10-02T13:56:18Z</time>
+ <extensions>
+ <cns:TrackPointExtension>
+ <cns:atemp>25.0</cns:atemp>
+ <cns:wtemp>15.0</cns:wtemp>
+ <cns:depth>105.0</cns:depth>
+ <cns:hr>95</cns:hr>
+ <cns:cad>65</cns:cad>
+ </cns:TrackPointExtension>
+ </extensions>
+ </trkpt>
+ <trkpt lat="49.43910699" lon="11.40139495">
+ <ele>531</ele>
+ <time>2015-10-02T13:56:20Z</time>
+ <extensions>
+ <cns:TrackPointExtension>
+ <cns:atemp>26.0</cns:atemp>
+ <cns:wtemp>16.0</cns:wtemp>
+ <cns:depth>106.0</cns:depth>
+ <cns:hr>96</cns:hr>
+ <cns:cad>66</cns:cad>
+ </cns:TrackPointExtension>
+ </extensions>
+ </trkpt>
+ <trkpt lat="49.43913800" lon="11.40145999">
+ <ele>531</ele>
+ <time>2015-10-02T13:56:22Z</time>
+ <extensions>
+ <cns:TrackPointExtension>
+ <cns:atemp>27.0</cns:atemp>
+ <cns:wtemp>17.0</cns:wtemp>
+ <cns:depth>107.0</cns:depth>
+ <cns:hr>97</cns:hr>
+ <cns:cad>67</cns:cad>
+ </cns:TrackPointExtension>
+ </extensions>
+ </trkpt>
+ </trkseg>
+ </trk>
+</gpx>
diff --git a/src/test/input/gpx/gpx_ext_GarminTPX1_tp1.gpx.xml b/test/unittest/input/gpx/gpx_ext_GarminTPX1_cns.gpx.xml
similarity index 77%
copy from src/test/input/gpx/gpx_ext_GarminTPX1_tp1.gpx.xml
copy to test/unittest/input/gpx/gpx_ext_GarminTPX1_cns.gpx.xml
index e000b54..87d14c5 100644
--- a/src/test/input/gpx/gpx_ext_GarminTPX1_tp1.gpx.xml
+++ b/test/unittest/input/gpx/gpx_ext_GarminTPX1_cns.gpx.xml
@@ -1,5 +1,5 @@
<expected>
- <name>Garmin TPX1 Test NS tp1</name>
+ <name>Garmin TPX1 Test NS cns</name>
<desc></desc>
<waypoints></waypoints>
@@ -11,11 +11,11 @@
<colorSource known="true" everypoint="false" derived="false" name="::ql:ele" />
<colorSource known="true" everypoint="false" derived="true" name="::ql:progress" />
<colorSource known="true" everypoint="false" derived="true" name="::ql:speed" />
- <colorSource known="true" everypoint="true" derived="false" name="tp1:TrackPointExtension|tp1:atemp" />
- <colorSource known="true" everypoint="true" derived="false" name="tp1:TrackPointExtension|tp1:wtemp" />
- <colorSource known="true" everypoint="true" derived="false" name="tp1:TrackPointExtension|tp1:depth" />
- <colorSource known="true" everypoint="true" derived="false" name="tp1:TrackPointExtension|tp1:hr" />
- <colorSource known="true" everypoint="true" derived="false" name="tp1:TrackPointExtension|tp1:cad" />
+ <colorSource known="true" everypoint="true" derived="false" name="cns:TrackPointExtension|cns:atemp" />
+ <colorSource known="true" everypoint="true" derived="false" name="cns:TrackPointExtension|cns:wtemp" />
+ <colorSource known="true" everypoint="true" derived="false" name="cns:TrackPointExtension|cns:depth" />
+ <colorSource known="true" everypoint="true" derived="false" name="cns:TrackPointExtension|cns:hr" />
+ <colorSource known="true" everypoint="true" derived="false" name="cns:TrackPointExtension|cns:cad" />
</colorSources>
</track>
</tracks>
diff --git a/src/test/input/gpx/gpx_ext_GarminTPX1_gpxtpx.gpx b/test/unittest/input/gpx/gpx_ext_GarminTPX1_gpxtpx.gpx
similarity index 100%
rename from src/test/input/gpx/gpx_ext_GarminTPX1_gpxtpx.gpx
rename to test/unittest/input/gpx/gpx_ext_GarminTPX1_gpxtpx.gpx
diff --git a/src/test/input/gpx/gpx_ext_GarminTPX1_gpxtpx.gpx.xml b/test/unittest/input/gpx/gpx_ext_GarminTPX1_gpxtpx.gpx.xml
similarity index 100%
rename from src/test/input/gpx/gpx_ext_GarminTPX1_gpxtpx.gpx.xml
rename to test/unittest/input/gpx/gpx_ext_GarminTPX1_gpxtpx.gpx.xml
diff --git a/src/test/input/gpx/gpx_ext_GarminTPX1_tp1.gpx b/test/unittest/input/gpx/gpx_ext_GarminTPX1_tp1.gpx
similarity index 100%
rename from src/test/input/gpx/gpx_ext_GarminTPX1_tp1.gpx
rename to test/unittest/input/gpx/gpx_ext_GarminTPX1_tp1.gpx
diff --git a/src/test/input/gpx/gpx_ext_GarminTPX1_tp1.gpx.xml b/test/unittest/input/gpx/gpx_ext_GarminTPX1_tp1.gpx.xml
similarity index 100%
rename from src/test/input/gpx/gpx_ext_GarminTPX1_tp1.gpx.xml
rename to test/unittest/input/gpx/gpx_ext_GarminTPX1_tp1.gpx.xml
diff --git a/src/test/input/gpx/qtt_gpx_file0.gpx b/test/unittest/input/gpx/qtt_gpx_file0.gpx
similarity index 100%
rename from src/test/input/gpx/qtt_gpx_file0.gpx
rename to test/unittest/input/gpx/qtt_gpx_file0.gpx
diff --git a/src/test/input/gpx/qtt_gpx_file0.gpx.xml b/test/unittest/input/gpx/qtt_gpx_file0.gpx.xml
similarity index 100%
rename from src/test/input/gpx/qtt_gpx_file0.gpx.xml
rename to test/unittest/input/gpx/qtt_gpx_file0.gpx.xml
diff --git a/src/test/input/qms/V1.6.0_file1.qms b/test/unittest/input/qms/V1.6.0_file1.qms
similarity index 100%
rename from src/test/input/qms/V1.6.0_file1.qms
rename to test/unittest/input/qms/V1.6.0_file1.qms
diff --git a/src/test/input/qms/V1.6.0_file1.qms.xml b/test/unittest/input/qms/V1.6.0_file1.qms.xml
similarity index 100%
rename from src/test/input/qms/V1.6.0_file1.qms.xml
rename to test/unittest/input/qms/V1.6.0_file1.qms.xml
diff --git a/src/test/input/qms/V1.6.0_file2.qms b/test/unittest/input/qms/V1.6.0_file2.qms
similarity index 100%
rename from src/test/input/qms/V1.6.0_file2.qms
rename to test/unittest/input/qms/V1.6.0_file2.qms
diff --git a/src/test/input/qms/V1.6.0_file2.qms.xml b/test/unittest/input/qms/V1.6.0_file2.qms.xml
similarity index 100%
rename from src/test/input/qms/V1.6.0_file2.qms.xml
rename to test/unittest/input/qms/V1.6.0_file2.qms.xml
diff --git a/src/test/input/randomize_hr.awk b/test/unittest/input/randomize_hr.awk
similarity index 100%
rename from src/test/input/randomize_hr.awk
rename to test/unittest/input/randomize_hr.awk
diff --git a/src/test/input/slf/qtt_slf_file0.slf b/test/unittest/input/slf/qtt_slf_file0.slf
similarity index 100%
rename from src/test/input/slf/qtt_slf_file0.slf
rename to test/unittest/input/slf/qtt_slf_file0.slf
diff --git a/src/test/input/slf/qtt_slf_file0.slf.xml b/test/unittest/input/slf/qtt_slf_file0.slf.xml
similarity index 100%
rename from src/test/input/slf/qtt_slf_file0.slf.xml
rename to test/unittest/input/slf/qtt_slf_file0.slf.xml
diff --git a/src/test/main.cpp b/test/unittest/main.cpp
similarity index 91%
rename from src/test/main.cpp
rename to test/unittest/main.cpp
index 89fa0bd..3634f2b 100644
--- a/src/test/main.cpp
+++ b/test/unittest/main.cpp
@@ -19,12 +19,13 @@
#include <QDebug>
#include <QTemporaryFile>
-#include "test/TestHelper.h"
-#include "test/test_QMapShack.h"
+#include "TestHelper.h"
+#include "test_QMapShack.h"
#include "gis/gpx/CGpxProject.h"
#include "gis/ovl/CGisItemOvlArea.h"
#include "gis/prj/IGisProject.h"
+#include "gis/fit/CFitProject.h"
#include "gis/qms/CQmsProject.h"
#include "gis/rte/CGisItemRte.h"
#include "gis/slf/CSlfProject.h"
@@ -106,7 +107,7 @@ void test_QMapShack::verify(expectedGisProject exp, const IGisProject &proj)
for(const QString &key : expTrk.extensions.keys())
{
- VERIFY_EQUAL(CKnownExtension::isKnown(key), expTrk.extensions[key].known);
+ VERIFY_EQUAL(expTrk.extensions[key].known, CKnownExtension::isKnown(key));
if(expTrk.extensions[key].everyPoint)
{
SUBVERIFY(trkpt.extensions.contains(key), QString("Missing extension `%1`on trackpoint").arg(key));
@@ -125,7 +126,11 @@ void test_QMapShack::verify(expectedGisProject exp, const IGisProject &proj)
SUBVERIFY(existingSources.contains(ext), QString("Missing extension `%1`").arg(ext));
existingSources.removeOne(ext);
}
- SUBVERIFY(existingSources.isEmpty(), "existingSources is not empty");
+
+ auto accuFunc = [](const QString &accu, const QString &b) { return accu.isEmpty() ? b : QString("%1, %2").arg(accu).arg(b); };
+ QString remainingExts = std::accumulate(existingSources.cbegin(), existingSources.cend(), QString(), accuFunc);
+
+ SUBVERIFY(existingSources.isEmpty(), QString("existingSources still contains: ") + remainingExts);
}
CGisItemRte *itemRte = dynamic_cast<CGisItemRte*>(item);
@@ -210,6 +215,11 @@ IGisProject* test_QMapShack::readProjFile(const QString &file, bool valid, bool
CSlfReader::readFile(fileToPath(file), slfProj);
SUBVERIFY(IGisProject::eTypeSlf == proj->getType(), "Project has invalid type");
}
+ else if(file.endsWith(".fit"))
+ {
+ proj = new CFitProject(fileToPath(file), (CGisListWks*) nullptr);
+ SUBVERIFY(IGisProject::eTypeFit == proj->getType(), "Project has invalid type");
+ }
else
{
SUBVERIFY(false, "Internal error: Can't read project file `" + file + "`");
@@ -218,11 +228,8 @@ IGisProject* test_QMapShack::readProjFile(const QString &file, bool valid, bool
catch(QString &errormsg)
{
SUBVERIFY(!valid, "Expected `" + file + "` to be valid, error while reading: " + errormsg);
- if(proj)
- {
- delete proj;
- proj = nullptr;
- }
+ delete proj;
+ proj = nullptr;
}
SUBVERIFY(valid || nullptr == proj, "File is neither valid, nor an exception was thrown");
diff --git a/src/test/test_QMapShack.h b/test/unittest/test_QMapShack.h
similarity index 71%
rename from src/test/test_QMapShack.h
rename to test/unittest/test_QMapShack.h
index 8e6688d..f35c4c6 100644
--- a/src/test/test_QMapShack.h
+++ b/test/unittest/test_QMapShack.h
@@ -19,7 +19,7 @@
#include <QTest>
#include <QtCore>
-#include "test/TestHelper.h"
+#include "TestHelper.h"
class IGisProject;
class CGpxProject;
@@ -64,18 +64,22 @@ class test_QMapShack : public QObject
void _readQmsFile_1_6_0();
void _writeReadQmsFile();
+ // CFitProject
+ void _readValidFitFiles();
+
// CGisItemTrk
void _filterDeleteExtension();
private slots:
void initTestCase();
- void readValidSLFFile() { TCWRAPPER( _readValidSLFFile() ) }
- void readNonExistingSLFFile() { TCWRAPPER( _readNonExistingSLFFile() ) }
- void writeReadGpxFile() { TCWRAPPER( _writeReadGpxFile() ) }
- void readQmsFile_1_6_0() { TCWRAPPER( _readQmsFile_1_6_0() ) }
- void writeReadQmsFile() { TCWRAPPER( _writeReadQmsFile() ) }
- void readExtGarminTPX1_gpxtpx() { TCWRAPPER( _readExtGarminTPX1_gpxtpx() ) }
- void readExtGarminTPX1_tp1() { TCWRAPPER( _readExtGarminTPX1_tp1() ) }
- void filterDeleteExtension() { TCWRAPPER( _filterDeleteExtension() ) }
+ void testreadValidSLFFile() { TCWRAPPER( _readValidSLFFile() ) }
+ void testreadNonExistingSLFFile() { TCWRAPPER( _readNonExistingSLFFile() ) }
+ void testwriteReadGpxFile() { TCWRAPPER( _writeReadGpxFile() ) }
+ void testreadQmsFile_1_6_0() { TCWRAPPER( _readQmsFile_1_6_0() ) }
+ void testwriteReadQmsFile() { TCWRAPPER( _writeReadQmsFile() ) }
+ void testreadExtGarminTPX1_gpxtpx() { TCWRAPPER( _readExtGarminTPX1_gpxtpx() ) }
+ void testreadExtGarminTPX1_tp1() { TCWRAPPER( _readExtGarminTPX1_tp1() ) }
+ void testreadValidFitFiles() { TCWRAPPER( _readValidFitFiles() ) }
+ void testfilterDeleteExtension() { TCWRAPPER( _filterDeleteExtension() ) }
};
--
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