[qmapshack] 01/09: Imported Upstream version 1.8.0
Bas Couwenberg
sebastic at debian.org
Mon Mar 27 06:08:43 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository qmapshack.
commit ec8542f8a19630b41283040199f806cb790b2d3a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Mar 26 13:47:40 2017 +0200
Imported Upstream version 1.8.0
---
3rdparty/alglib/src/alglibinternal.cpp | 8 +-
3rdparty/alglib/src/ap.cpp | 14 +-
3rdparty/alglib/src/dataanalysis.cpp | 2 +-
3rdparty/alglib/src/interpolation.cpp | 4 +-
3rdparty/alglib/src/optimization.cpp | 2 +-
CMakeLists.txt | 10 +-
CMakeLists.txt.user | 31 +-
MacOSX/HowtoBuildOSX.txt | 35 +-
MacOSX/build-quazip.sh | 57 +
MacOSX/bundle.sh | 1 +
MacOSX/env-path.sh | 6 +
changelog.txt | 21 +
cmake/Modules/CMakeLists.txt | 2 +-
cmake/Modules/FindALGLIB.cmake | 13 +-
cmake/Modules/FindQuaZip.cmake | 88 +
msvc_64/QMapShack_Installer.nsi | 8 +-
msvc_64/copyfiles.bat | 9 +-
msvc_64/qt.conf | 4 +
src/CAbout.cpp | 8 +
src/CMainWindow.cpp | 30 +-
src/CMainWindow.h | 4 +-
src/CMakeLists.txt | 94 +-
src/CSingleInstanceProxy.cpp | 102 +
templates/header.h => src/CSingleInstanceProxy.h | 27 +-
src/IAbout.ui | 28 +-
src/IMainWindow.ui | 13 +-
src/canvas/CCanvas.cpp | 17 +-
src/canvas/CCanvas.h | 6 +-
src/canvas/IDrawContext.cpp | 67 +-
src/canvas/IDrawObject.cpp | 132 +
src/canvas/IDrawObject.h | 9 +
src/cursors/wptHighlightBlue.png | Bin 0 -> 5295 bytes
.../{wptHighlight.svg => wptHighlightBlue.svg} | 26 +-
.../{wptHighlight.png => wptHighlightRed.png} | Bin
.../{wptHighlight.svg => wptHighlightRed.svg} | 0
src/dem/CDemDraw.cpp | 4 +-
src/dem/IDem.cpp | 22 +-
src/device/IDevice.cpp | 6 +-
src/gis/CGisListDB.cpp | 50 +
src/gis/CGisListDB.h | 2 +
src/gis/CGisListWks.cpp | 67 +-
src/gis/CGisListWks.h | 2 +
src/gis/CGisWidget.cpp | 61 +-
src/gis/CGisWidget.h | 16 +-
src/gis/IGisWidget.ui | 12 +
templates/header.h => src/gis/Poi.h | 19 +-
src/gis/WptIcons.cpp | 17 +-
src/gis/db/CDBProject.cpp | 55 +
src/gis/db/CDBProject.h | 2 +
src/gis/ovl/IDetailsOvlArea.ui | 2 +-
src/gis/prj/IGisProject.cpp | 56 +-
src/gis/prj/IGisProject.h | 9 +
src/gis/rte/CGisItemRte.cpp | 160 +
src/gis/rte/CGisItemRte.h | 2 +
src/gis/rte/IDetailsRte.ui | 2 +-
src/gis/rte/router/CRouterBRouter.cpp | 597 +++
src/gis/rte/router/CRouterBRouter.h | 106 +
src/gis/rte/router/CRouterRoutino.cpp | 8 +-
src/gis/rte/router/CRouterSetup.cpp | 9 +
src/gis/rte/router/CRouterSetup.h | 4 +
src/gis/rte/router/IRouterBRouter.ui | 220 +
.../gis/rte/router/brouter/CRouterBRouterInfo.cpp | 20 +-
.../gis/rte/router/brouter/CRouterBRouterInfo.h | 24 +-
src/gis/rte/router/brouter/CRouterBRouterSetup.cpp | 625 +++
src/gis/rte/router/brouter/CRouterBRouterSetup.h | 148 +
.../rte/router/brouter/CRouterBRouterSetupPage.cpp | 86 +
.../CRouterBRouterSetupPage.h} | 32 +-
.../router/brouter/CRouterBRouterSetupWizard.cpp | 968 ++++
.../rte/router/brouter/CRouterBRouterSetupWizard.h | 122 +
.../rte/router/brouter/CRouterBRouterTilesPage.cpp | 93 +
.../CRouterBRouterTilesPage.h} | 36 +-
.../router/brouter/CRouterBRouterTilesSelect.cpp | 811 +++
.../rte/router/brouter/CRouterBRouterTilesSelect.h | 114 +
.../brouter/CRouterBRouterTilesSelectArea.cpp | 188 +
.../router/brouter/CRouterBRouterTilesSelectArea.h | 94 +
.../brouter/CRouterBRouterTilesSelectLayout.h | 54 +
.../router/brouter/CRouterBRouterTilesStatus.h} | 58 +-
.../rte/router/brouter/CRouterBRouterToolShell.cpp | 81 +
.../router/brouter/CRouterBRouterToolShell.h} | 50 +-
src/gis/rte/router/brouter/IRouterBRouterInfo.ui | 74 +
.../router/brouter/IRouterBRouterSetupWizard.ui | 682 +++
.../{ => routino}/CRouterRoutinoPathSetup.cpp | 2 +-
.../router/{ => routino}/CRouterRoutinoPathSetup.h | 0
.../{ => routino}/IRouterRoutinoPathSetup.ui | 2 +-
src/gis/tcx/CTcxProject.cpp | 495 ++
src/gis/tcx/CTcxProject.h | 67 +
src/gis/tcx/serialization.cpp | 265 +
src/gis/trk/CActivityTrk.cpp | 4 +-
src/gis/trk/CCutTrk.cpp | 21 +
src/gis/trk/CCutTrk.h | 12 +
src/gis/trk/CGisItemTrk.cpp | 27 +-
src/gis/trk/CGisItemTrk.h | 20 +
src/gis/trk/ICombineTrk.ui | 32 +-
src/gis/trk/ICutTrk.ui | 86 +-
src/gis/trk/IDetailsTrk.ui | 8 +-
src/gis/wpt/CGisItemWpt.cpp | 7 +-
src/gis/wpt/CGisItemWpt.h | 6 +
src/gis/wpt/IDetailsWpt.ui | 2 +-
src/helpers/CProgressDialog.cpp | 6 +-
src/helpers/CSelectProjectDialog.cpp | 1 +
src/icons/32x32/CutMode1.png | Bin 0 -> 346 bytes
src/icons/32x32/CutMode2.png | Bin 0 -> 289 bytes
src/icons/32x32/QMapShack.png | Bin 1622 -> 1623 bytes
src/icons/32x32/TcxProject.png | Bin 0 -> 1196 bytes
src/icons/48x48/CutMode1.png | Bin 0 -> 469 bytes
src/icons/48x48/CutMode2.png | Bin 0 -> 367 bytes
src/icons/48x48/QMapShack.png | Bin 2751 -> 2746 bytes
src/icons/48x48/TcxProject.png | Bin 0 -> 1839 bytes
src/icons/CutMode1.svg | 123 +
src/icons/CutMode2.svg | 99 +
src/icons/TcxProject.svg | 114 +
src/icons/hicolor/128x128/apps/QMapShack.png | Bin 5461 -> 11023 bytes
src/icons/hicolor/16x16/apps/QMapShack.png | Bin 868 -> 721 bytes
src/icons/hicolor/192x192/apps/QMapShack.png | Bin 8793 -> 18972 bytes
src/icons/hicolor/22x22/apps/QMapShack.png | Bin 1153 -> 1025 bytes
src/icons/hicolor/24x24/apps/QMapShack.png | Bin 1239 -> 1136 bytes
src/icons/hicolor/256x256/apps/QMapShack.png | Bin 12480 -> 28348 bytes
src/icons/hicolor/32x32/apps/QMapShack.png | Bin 1178 -> 1623 bytes
src/icons/hicolor/36x36/apps/QMapShack.png | Bin 1316 -> 1898 bytes
src/icons/hicolor/40x40/apps/QMapShack.png | Bin 1443 -> 2163 bytes
src/icons/hicolor/42x42/apps/QMapShack.png | Bin 1530 -> 2267 bytes
src/icons/hicolor/48x48/apps/QMapShack.png | Bin 1738 -> 2746 bytes
src/icons/hicolor/512x512/apps/QMapShack.png | Bin 19731 -> 72355 bytes
src/icons/hicolor/64x64/apps/QMapShack.png | Bin 2323 -> 4086 bytes
src/icons/hicolor/72x72/apps/QMapShack.png | Bin 2709 -> 4893 bytes
src/icons/hicolor/80x80/apps/QMapShack.png | Bin 3161 -> 5558 bytes
src/icons/hicolor/8x8/apps/QMapShack.png | Bin 551 -> 344 bytes
src/icons/hicolor/96x96/apps/QMapShack.png | Bin 3908 -> 7338 bytes
src/icons/makeicons | 28 +-
src/icons/waypoints/1stCategory.svg | 117 +
src/icons/waypoints/2ndCategory.svg | 98 +
src/icons/waypoints/32x32/1stCategory.png | Bin 0 -> 832 bytes
src/icons/waypoints/32x32/2ndCategory.png | Bin 0 -> 963 bytes
src/icons/waypoints/32x32/3rdCategory.png | Bin 0 -> 1107 bytes
src/icons/waypoints/32x32/4thCategory.png | Bin 0 -> 942 bytes
src/icons/waypoints/32x32/Danger.png | Bin 0 -> 910 bytes
src/icons/waypoints/32x32/FirstAid.png | Bin 0 -> 467 bytes
src/icons/waypoints/32x32/Food.png | Bin 0 -> 1482 bytes
src/icons/waypoints/32x32/Generic.png | Bin 0 -> 779 bytes
src/icons/waypoints/32x32/HorsCategory.png | Bin 0 -> 850 bytes
src/icons/waypoints/32x32/Left.png | Bin 0 -> 663 bytes
src/icons/waypoints/32x32/Right.png | Bin 0 -> 623 bytes
src/icons/waypoints/32x32/Sprint.png | Bin 0 -> 1384 bytes
src/icons/waypoints/32x32/Straight.png | Bin 0 -> 650 bytes
src/icons/waypoints/32x32/Summit.png | Bin 0 -> 1208 bytes
src/icons/waypoints/32x32/Valley.png | Bin 0 -> 962 bytes
src/icons/waypoints/32x32/Water.png | Bin 0 -> 916 bytes
src/icons/waypoints/3rdCategory.svg | 99 +
src/icons/waypoints/4thCategory.svg | 99 +
src/icons/waypoints/Danger.svg | 93 +
src/icons/waypoints/FirstAid.svg | 109 +
src/icons/waypoints/Food.svg | 94 +
src/icons/waypoints/Generic.svg | 91 +
src/icons/waypoints/HorsCategory.svg | 99 +
src/icons/waypoints/Left.svg | 95 +
src/icons/waypoints/Right.svg | 91 +
src/icons/waypoints/Sprint.svg | 103 +
src/icons/waypoints/Straight.svg | 95 +
src/icons/waypoints/Summit.svg | 91 +
src/icons/waypoints/Valley.svg | 91 +
src/icons/waypoints/Water.svg | 104 +
src/locale/qmapshack.ts | 1937 +++++--
src/locale/qmapshack_cs.ts | 1938 +++++--
src/locale/qmapshack_de.ts | 1911 +++++--
src/locale/qmapshack_es.ts | 1915 +++++--
src/locale/qmapshack_fr.ts | 1932 +++++--
src/locale/qmapshack_nl.ts | 1934 +++++--
src/locale/qmapshack_ru.desktop | 3 +
src/locale/{qmapshack_cs.ts => qmapshack_ru.ts} | 5495 ++++++++++++--------
src/main.cpp | 16 +-
src/map/CMapDraw.cpp | 45 +-
src/map/CMapDraw.h | 3 +
src/map/CMapIMG.cpp | 151 +-
src/map/CMapIMG.h | 12 +-
src/map/CMapPropSetup.cpp | 3 +
src/map/CMapVRT.cpp | 15 +-
src/map/CMapWMTS.cpp | 1 -
src/map/IMap.cpp | 38 +-
src/map/IMap.h | 24 +-
src/map/IMapPropSetup.ui | 69 +-
src/mouse/CMouseMoveWpt.cpp | 55 +-
src/mouse/CMouseMoveWpt.h | 8 +-
src/mouse/CMouseNormal.cpp | 22 +-
src/mouse/CMouseNormal.h | 9 +-
src/mouse/CMouseRangeTrk.cpp | 139 +-
src/mouse/CMouseRangeTrk.h | 9 +-
src/mouse/CMouseSelect.cpp | 16 +
src/mouse/CMouseSelect.h | 1 +
src/mouse/IMouse.cpp | 48 -
src/mouse/IMouse.h | 7 -
src/mouse/IScrOptSelect.ui | 22 +-
src/mouse/line/CLineOpSelectRange.cpp | 38 +-
src/mouse/line/ILineOp.cpp | 3 +-
src/mouse/line/ILineOp.h | 1 +
src/mouse/line/IScrOptRangeLine.ui | 12 +
src/plot/IPlot.cpp | 18 +
src/plot/IPlot.h | 2 +
src/resources.qrc | 25 +-
src/setup/CAppSetupLinux.h | 1 +
src/setup/CAppSetupMac.h | 1 +
src/setup/CAppSetupWin.cpp | 8 +
src/setup/CAppSetupWin.h | 3 +
src/setup/CLogHandler.cpp | 1 +
src/setup/IAppSetup.h | 1 +
src/tool/CMapVrtBuilder.cpp | 3 +-
src/tool/CRoutinoDatabaseBuilder.cpp | 3 +-
src/tool/IToolShell.cpp | 42 +-
src/tool/IToolShell.h | 19 +-
templates/header.h | 2 +-
templates/source.c | 2 +-
templates/source.cpp | 2 +-
test/unittest/CMakeLists.txt | 8 +-
212 files changed, 21673 insertions(+), 6044 deletions(-)
diff --git a/3rdparty/alglib/src/alglibinternal.cpp b/3rdparty/alglib/src/alglibinternal.cpp
index 41a1c06..c2ca954 100755
--- a/3rdparty/alglib/src/alglibinternal.cpp
+++ b/3rdparty/alglib/src/alglibinternal.cpp
@@ -7056,8 +7056,8 @@ void matrixvectormultiply(/* Real */ ae_matrix* a,
{
return;
}
- ae_assert(j2-j1==ix2-ix1, "MatrixVectorMultiply: A and X dont match!", _state);
- ae_assert(i2-i1==iy2-iy1, "MatrixVectorMultiply: A and Y dont match!", _state);
+ ae_assert(j2-j1==ix2-ix1, "MatrixVectorMultiply: A and X don't match!", _state);
+ ae_assert(i2-i1==iy2-iy1, "MatrixVectorMultiply: A and Y don't match!", _state);
/*
* beta*y
@@ -7093,8 +7093,8 @@ void matrixvectormultiply(/* Real */ ae_matrix* a,
{
return;
}
- ae_assert(i2-i1==ix2-ix1, "MatrixVectorMultiply: A and X dont match!", _state);
- ae_assert(j2-j1==iy2-iy1, "MatrixVectorMultiply: A and Y dont match!", _state);
+ ae_assert(i2-i1==ix2-ix1, "MatrixVectorMultiply: A and X don't match!", _state);
+ ae_assert(j2-j1==iy2-iy1, "MatrixVectorMultiply: A and Y don't match!", _state);
/*
* beta*y
diff --git a/3rdparty/alglib/src/ap.cpp b/3rdparty/alglib/src/ap.cpp
index 78185df..1c04250 100755
--- a/3rdparty/alglib/src/ap.cpp
+++ b/3rdparty/alglib/src/ap.cpp
@@ -6276,11 +6276,11 @@ void alglib::ae_vector_wrapper::assign(const alglib::ae_vector_wrapper &rhs)
// Assignment to proxy object
//
if( rhs.p_vec==NULL )
- throw alglib::ap_error("ALGLIB: incorrect assignment to array (sizes dont match)");
+ throw alglib::ap_error("ALGLIB: incorrect assignment to array (sizes don't match)");
if( rhs.p_vec->datatype!=p_vec->datatype )
- throw alglib::ap_error("ALGLIB: incorrect assignment to array (types dont match)");
+ throw alglib::ap_error("ALGLIB: incorrect assignment to array (types don't match)");
if( rhs.p_vec->cnt!=p_vec->cnt )
- throw alglib::ap_error("ALGLIB: incorrect assignment to array (sizes dont match)");
+ throw alglib::ap_error("ALGLIB: incorrect assignment to array (sizes don't match)");
memcpy(p_vec->ptr.p_ptr, rhs.p_vec->ptr.p_ptr, p_vec->cnt*alglib_impl::ae_sizeof(p_vec->datatype));
}
}
@@ -6684,13 +6684,13 @@ void alglib::ae_matrix_wrapper::assign(const alglib::ae_matrix_wrapper &rhs)
//
ae_int_t i;
if( rhs.p_mat==NULL )
- throw alglib::ap_error("ALGLIB: incorrect assignment to array (sizes dont match)");
+ throw alglib::ap_error("ALGLIB: incorrect assignment to array (sizes don't match)");
if( rhs.p_mat->datatype!=p_mat->datatype )
- throw alglib::ap_error("ALGLIB: incorrect assignment to array (types dont match)");
+ throw alglib::ap_error("ALGLIB: incorrect assignment to array (types don't match)");
if( rhs.p_mat->rows!=p_mat->rows )
- throw alglib::ap_error("ALGLIB: incorrect assignment to array (sizes dont match)");
+ throw alglib::ap_error("ALGLIB: incorrect assignment to array (sizes don't match)");
if( rhs.p_mat->cols!=p_mat->cols )
- throw alglib::ap_error("ALGLIB: incorrect assignment to array (sizes dont match)");
+ throw alglib::ap_error("ALGLIB: incorrect assignment to array (sizes don't match)");
for(i=0; i<p_mat->rows; i++)
memcpy(p_mat->ptr.pp_void[i], rhs.p_mat->ptr.pp_void[i], p_mat->cols*alglib_impl::ae_sizeof(p_mat->datatype));
}
diff --git a/3rdparty/alglib/src/dataanalysis.cpp b/3rdparty/alglib/src/dataanalysis.cpp
index 8c82073..7ac90b7 100755
--- a/3rdparty/alglib/src/dataanalysis.cpp
+++ b/3rdparty/alglib/src/dataanalysis.cpp
@@ -26328,7 +26328,7 @@ static void mlpbase_mlphessianbatchinternal(multilayerperceptron* network,
/*
* For a softmax + squared error we have expression
- * far beyond human imagination so we dont even try
+ * far beyond human imagination so we don't even try
* to comment on it. Just enjoy the code...
*
* P.S. That's why "natural error" is called "natural" -
diff --git a/3rdparty/alglib/src/interpolation.cpp b/3rdparty/alglib/src/interpolation.cpp
index 78bfae3..45caf36 100755
--- a/3rdparty/alglib/src/interpolation.cpp
+++ b/3rdparty/alglib/src/interpolation.cpp
@@ -19192,7 +19192,7 @@ REMARK:
Assume, that exist one root only at [A;B], else
function may be work incorrectly.
-The function dont check value A0,B0!
+The function don't check value A0,B0!
-- ALGLIB PROJECT --
Copyright 26.09.2011 by Bochkanov Sergey
@@ -19953,7 +19953,7 @@ Result:
REMARK:
-The function dont check value A0,B0 and A1,B1!
+The function don't check value A0,B0 and A1,B1!
-- ALGLIB PROJECT --
Copyright 26.09.2011 by Bochkanov Sergey
diff --git a/3rdparty/alglib/src/optimization.cpp b/3rdparty/alglib/src/optimization.cpp
index 28340d9..6b7e803 100755
--- a/3rdparty/alglib/src/optimization.cpp
+++ b/3rdparty/alglib/src/optimization.cpp
@@ -25144,7 +25144,7 @@ void qpbleicoptimize(convexquadraticmodel* a,
sstate->tmp1.ptr.p_double[i] = sstate->solver.g.ptr.p_double[i]*s->ptr.p_double[i];
v = v+ae_sqr(sstate->tmp0.ptr.p_double[i], _state);
}
- ae_assert(ae_fp_greater(v,(double)(0)), "QPBLEICOptimize: inernal errror (scaled direction is zero)", _state);
+ ae_assert(ae_fp_greater(v,(double)(0)), "QPBLEICOptimize: internal error (scaled direction is zero)", _state);
v = 1/ae_sqrt(v, _state);
ae_v_muld(&sstate->tmp0.ptr.p_double[0], 1, ae_v_len(0,n-1), v);
v = ae_v_dotproduct(&sstate->tmp0.ptr.p_double[0], 1, &sstate->tmp1.ptr.p_double[0], 1, ae_v_len(0,n-1));
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3b571b..e6e74a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,11 @@ cmake_minimum_required(VERSION 3.0.0)
project(QMapShack)
option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
+if(WIN32)
+option(USE_QT5DBus "Enable device detection via DBus" OFF)
+else(WIN32)
+option(USE_QT5DBus "Enable device detection via DBus" ON)
+endif(WIN32)
# Needed to properly handle extract translations strings when using the Ninja
# generator.
@@ -17,6 +22,7 @@ set(QT_DEV_PATH "C:\\Qt5\\5.5\\msvc2013_64" CACHE PATH "Path to directory cont
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:\\routino" CACHE PATH "Path to directory containing routino include and lib, e.g. M:\\lib\\routino")
+set(QUAZIP_DEV_PATH "C:\\quazip" CACHE PATH "Path to directory containing quazip include and lib, e.g. M:\\lib\\quazip5")
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_DEV_PATH})
endif(WIN32)
@@ -24,8 +30,8 @@ endif(WIN32)
set(APPLICATION_NAME qmapshack)
set(APPLICATION_VERSION_MAJOR "1")
-set(APPLICATION_VERSION_MINOR "7")
-set(APPLICATION_VERSION_PATCH "2")
+set(APPLICATION_VERSION_MINOR "8")
+set(APPLICATION_VERSION_PATCH "0")
add_definitions(-DVER_MAJOR=${APPLICATION_VERSION_MAJOR} -DVER_MINOR=${APPLICATION_VERSION_MINOR} -DVER_STEP=${APPLICATION_VERSION_PATCH} -DAPPLICATION_NAME=${PROJECT_NAME})
diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user
index 60b3a9a..1fb8c7b 100644
--- a/CMakeLists.txt.user
+++ b/CMakeLists.txt.user
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.1.0, 2016-12-12T08:44:47. -->
+<!-- Written by QtCreator 4.2.1, 2017-03-26T12:51:41. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
- <value type="QByteArray">{2664d6c3-cac3-44ef-bde0-590e210eae25}</value>
+ <value type="QByteArray">{dde28225-baec-4799-bf76-35ee2cd74ec5}</value>
</data>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -54,26 +54,21 @@
</data>
<data>
<variable>ProjectExplorer.Project.PluginSettings</variable>
- <valuemap type="QVariantMap">
- <valuelist type="QVariantList" key="ClangStaticAnalyzer.SuppressedDiagnostics"/>
- </valuemap>
+ <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="QString" key="ProjectExplorer.ProjectConfiguration.Id">{d45dd77d-c492-49f6-8679-9d0bf3a1f5ad}</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
<valuelist type="QVariantList" key="CMake.Configuration">
- <value type="QString">CMAKE_BUILD_TYPE:STRING=RelWithDebInfo</value>
- <value type="QString">CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/g++-5</value>
- <value type="QString">CMAKE_C_COMPILER:FILEPATH=/usr/bin/cc</value>
- <value type="QString">CMAKE_INSTALL_PREFIX:PATH=/usr</value>
- <value type="QString">QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable}</value>
+ <value type="QString">BUILD_FOR_LOCAL_SYSTEM:BOOL=ON</value>
+ <value type="QString">CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/g++-6</value>
<value type="QString">UPDATE_TRANSLATIONS:BOOL=OFF</value>
</valuelist>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/oeichler/Code/cpp/build_QMapShack</value>
@@ -112,8 +107,8 @@
<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.DefaultDisplayName">Vorgabe</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Vorgabe</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
@@ -134,7 +129,7 @@
<valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
<value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
<value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
- <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">0</value>
+ <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</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"/>
@@ -173,8 +168,7 @@
</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="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default">/home/oeichler/Code/cpp/build_QMapShack/bin</value>
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
@@ -191,7 +185,7 @@
<valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.1">
<value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
<value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
- <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">0</value>
+ <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</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"/>
@@ -230,10 +224,9 @@
</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="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default">/home/oeichler/Code/cpp/build_QMapShack/bin</value>
- <value type="int" key="PE.EnvironmentAspect.Base">2</value>
+ <value type="int" key="PE.EnvironmentAspect.Base">-1</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qttest</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
diff --git a/MacOSX/HowtoBuildOSX.txt b/MacOSX/HowtoBuildOSX.txt
index ff2649f..80c82da 100644
--- a/MacOSX/HowtoBuildOSX.txt
+++ b/MacOSX/HowtoBuildOSX.txt
@@ -9,13 +9,14 @@ Additional Software & Installation
**********************************
To be able to build QMapShack there are several software packages and libraries
required:
-- proj4 library (version x)
-- gdal library (version x)
-- qt5 framework (version 5.5 and above)
-- routino library (version)
+- proj4 library (version 4.9.x)
+- gdal library (version 2.1.x)
+- qt5 framework (version 5.5.x)
+- routino library (version 3.1.x)
+- quazip library (version 0.7.x)
- qmapshack
- cmake (version 3.x and above)
-- svn command line tool
+- svn command line tool (for routino)
- mercurial (hg) command line tool
The best way is to install most of the required packages is by using brew.
@@ -24,7 +25,7 @@ ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/
After istalling brew use it to install most of the required packages:
brew install proj4
-brew install gdal
+brew install gdal (unfortunately not the newest version is prvided with brew)
brew install cmake
brew install qt5 --with-d-bus, --with-mysql
brew install svn
@@ -49,14 +50,23 @@ variables in advanced:
ROUTINO_LIB_DIR=... (absolute path to directory where the build library and other files will be stored)
ROUTINO_SRC_DIR=... (absolute path to directory where the source code will be checked out)
-Now call the script:
-
+Script call:
./build-routino.sh routino-build
+For building the Quazip library there is the bash script "build-quazip.sh" in the MacOSX subdirectory.
+The Quazip source has to be downloaded manually from "https://sourceforge.net/projects/quazip/".
+To run the script, you need to set three environment variables in advanced:
+QUAZIP_LIB_DIR=.. (absolute path to directory where the build library and other files will be stored)
+QUAZIP_SRC_DIR=.. (absolute path to directory where the extracted source code has been saved to)
+QT_DIR=.. (absolute path to directory where QT has been installed to. If done with brew, it is like /usr/local/Cellar/qt5/5.5..)
+
+Script call:
+./build-quazip.sh quazip-build
+
Building and Bundling QMapShack
*******************************
-Now you need to get the source of QMapShack:
+To get the source of QMapShack:
hg clone https://bitbucket.org/maproom/qmapshack
In the same directory as this how to is the bash script "bundle.sh". The script
@@ -65,7 +75,7 @@ So you need to build the binary first with the command:
mkdir build_QMapShack
cd build_QMapShack
-cmake ../QMapShack -DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.5.1_2 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 -DROUTINO_DEV_PATH=/data/GPS/dev/routino-lib -DCMAKE_BUILD_TYPE=Release
+cmake ../QMapShack -DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.5... -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DROUTINO_DEV_PATH=... -DQUAZIP_DEV_PATH=... -DCMAKE_BUILD_TYPE=Release
make
"QMapShack" is the relative path to where you have checked out QMapShack.
@@ -75,6 +85,7 @@ The four passed parameter are more or less self describing:
CMAKE_PREFIX_PATH path to used libraries by QMapShack, QT5 needs to be set by default.
CMAKE_OSX_DEPLOYMENT_TARGET the target system of the build (10.11 is the El Capitan OS-X, see https://en.wikipedia.org/wiki/OS_X#Versions for a full list)
ROUTINO_DEV_PATH The path to the routino library (is the same as you set previously with ROUTINO_LIB_DIR)
+QUAZIP_DEV_PATH The path to the quazip library (is the same as you set previously with QUAZIP_LIB_DIR)
CMAKE_BUILD_TYPE "Debug" or "Release" depending what you want.
If the build was successful, you can run the packaging with several environment
@@ -84,6 +95,7 @@ QT_DIR=... (absolute path to the qt5 library base package, same as in
GDAL_DIR=... (absolute path to the gdal library base package)
PROJ_DIR=... (absolute path to the proj4 library base package)
ROUTINO_LIB_DIR=.. (absolute path to the routino library base package, same as ROUTINO_LIB_DIR / ROUTINO_DEV_PATH)
+QUAZIP_LIB_DIR=.. (absolute path to the Quazip library base package)
BUILD_DIR=.. (absolute path to the QMapShack build directory, the created directory "build_QMapShack" for the cmake build)
QMS_SRC_DIR=... (absolute path to the QMapShack source, the directory "QMapShack" used by cmake)
BUILD_BIN_DIR=... (absolute path to the directory with the qmapshack binary, typically build_QMapShack/bin for cmake build; depends on IDE)
@@ -111,8 +123,7 @@ option "-G Xcode".
Nothing to be done, just open the Project folder in CLion.
You need to set "CMake options" under "Preferences > Build, Execution, Development > CMake".
--DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.5.1_2 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 -DROUTINO_DEV_PATH=/data/GPS/dev/routino-lib
-
+-DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.5... -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DROUTINO_DEV_PATH=... -DQUAZIP_DEV_PATH=...
The list is the same as described for the cmake build above.
diff --git a/MacOSX/build-quazip.sh b/MacOSX/build-quazip.sh
new file mode 100755
index 0000000..7e4bb22
--- /dev/null
+++ b/MacOSX/build-quazip.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+if [[ "$QUAZIP_LIB_DIR" == "" ]]; then
+ echo "QUAZIP_LIB_DIR not set"
+fi
+if [[ "$QUAZIP_SRC_DIR" == "" ]]; then
+ echo "QUAZIP_SRC_DIR not set"
+fi
+if [[ "$QT_DIR" == "" ]]; then
+ echo "QT_DIR not set"
+fi
+
+if [[ "$QUAZIP_BUILD_DIR" == "" ]]; then
+ QUAZIP_BUILD_DIR=$QUAZIP_SRC_DIR/../build_quazip
+fi
+
+QUAZIP_LIB_LIB_DIR=$QUAZIP_LIB_DIR/lib
+QUAZIP_LIB_H_DIR=$QUAZIP_LIB_DIR/include
+
+# build
+function buildQuazipLib {
+ rm -R $QUAZIP_BUILD_DIR/*
+ mkdir $QUAZIP_BUILD_DIR
+ cd $QUAZIP_BUILD_DIR
+
+ PATH=$PATH:$QT_DIR/bin
+ qmake $QUAZIP_SRC_DIR -config release LIBS+=-lz
+ make
+}
+
+# copy
+function copyQuazipFiles {
+ rm -R $QUAZIP_LIB_DIR
+ mkdir $QUAZIP_LIB_DIR
+ mkdir $QUAZIP_LIB_LIB_DIR
+ mkdir $QUAZIP_LIB_H_DIR
+
+ cp $QUAZIP_SRC_DIR/quazip/*.h $QUAZIP_LIB_H_DIR
+ cp $QUAZIP_BUILD_DIR/quazip/libquazip.1.0.0.dylib $QUAZIP_LIB_LIB_DIR
+ cp $QUAZIP_BUILD_DIR/quazip/libquazip.1.0.0.dylib $QUAZIP_LIB_LIB_DIR/libquazip.1.dylib
+ cp $QUAZIP_BUILD_DIR/quazip/libquazip.1.0.0.dylib $QUAZIP_LIB_LIB_DIR/libquazip5.dylib
+
+ chmod a+rx $QUAZIP_LIB_LIB_DIR/*
+ chmod a+r $QUAZIP_LIB_H_DIR/*
+
+ cp $QUAZIP_LIB_LIB_DIR/libquazip.1.0.0.dylib /usr/local/lib/libquazip.1.dylib
+}
+
+function adjustLinking {
+ sudo install_name_tool -id $QUAZIP_LIB_LIB_DIR/libquazip.1.dylib $QUAZIP_LIB_LIB_DIR/libquazip.1.dylib
+}
+
+if [[ "$1" == "quazip-build" ]]; then
+ buildQuazipLib
+ copyQuazipFiles
+ adjustLinking
+fi
\ No newline at end of file
diff --git a/MacOSX/bundle.sh b/MacOSX/bundle.sh
index a9f26d3..92a260e 100755
--- a/MacOSX/bundle.sh
+++ b/MacOSX/bundle.sh
@@ -195,6 +195,7 @@ function checkLibraries {
function copyAdditionalLibraries {
cp -v $ROUTINO_LIB_LIB_DIR/libroutino.so $BUILD_BUNDLE_FRW_DIR
+ cp -v $QUAZIP_LIB_LIB_DIR/libquazip.1.dylib $BUILD_BUNDLE_FRW_DIR
cp -v -R $QT_DIR/lib/QtSensors.framework $BUILD_BUNDLE_FRW_DIR
cp -v -R $QT_DIR/lib/QtPositioning.framework $BUILD_BUNDLE_FRW_DIR
cp -v -R $QT_DIR/lib/QtMultimediaWidgets.framework $BUILD_BUNDLE_FRW_DIR
diff --git a/MacOSX/env-path.sh b/MacOSX/env-path.sh
index 3ec56e4..1f25634 100644
--- a/MacOSX/env-path.sh
+++ b/MacOSX/env-path.sh
@@ -12,6 +12,9 @@ fi
if [[ "$ROUTINO_LIB_DIR" == "" ]]; then
echo "ROUTINO_LIB_DIR not set"
fi
+if [[ "$QUAZIP_LIB_DIR" == "" ]]; then
+ echo "QUAZIP_LIB_DIR not set"
+fi
if [[ "$BUILD_DIR" == "" ]]; then
echo "BUILD_DIR not set"
fi
@@ -50,4 +53,7 @@ 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
ROUTINO_LIB_XML_DIR=$ROUTINO_LIB_DIR/xml
+
+QUAZIP_LIB_LIB_DIR=$QUAZIP_LIB_DIR/lib
+QUAZIP_LIB_H_DIR=$QUAZIP_LIB_DIR/include
set +a
diff --git a/changelog.txt b/changelog.txt
index ca7252f..b47f41b 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,24 @@
+V 1.8.0
+Add: Links to quickstart help
+Add: Russian translation
+Add: TCX file read and write support
+Add: Different cut modes for track cut function
+Add: Option for optimized build for local system architecture
+Add: Support for BRouter (online/offline)
+Add: Enhance reprojection between projections like merc/utm/lcc
+[Issue #152] Garmin maps: Alter scale to detail level table
+[Issue #189] Fix drawing of range selection in trkptedit mode
+[Issue #189] Draw bubble after line to prevent drawing over bubble
+[Issue #195] Copy errors in message (file)?
+[Issue #198] Logfile encoding
+[Issue #201] Provide 'Import GIS data' in database menu
+[Issue #204] Option to allow only one QMS instance at one time
+[Issue #211] Desired feature: change symbol for multiple selected waypoints
+[Issue #213] Adding a Garmin POI as waypoint
+[Issue #214] Crash when creating Routino database
+[Issue #217] BRouter setup window - not translated string
+[Issue #218] CSingleInstanceProxy & Multiuser
+
V 1.7.2
* Add: Export to GPX V1.1 without extensions
diff --git a/cmake/Modules/CMakeLists.txt b/cmake/Modules/CMakeLists.txt
index f4a32dd..bbd1cd5 100644
--- a/cmake/Modules/CMakeLists.txt
+++ b/cmake/Modules/CMakeLists.txt
@@ -16,7 +16,7 @@ set(FILES_TO_REMOVE
install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/remove_files.cmake )
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/remove_files.cmake "#generated by cmake, dont edit\n\n")
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/remove_files.cmake "#generated by cmake, don't edit\n\n")
foreach ( _current_FILE ${FILES_TO_REMOVE})
file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/remove_files.cmake "message(STATUS \"Removing ${module_install_dir}/${_current_FILE}\" )\n" )
file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/remove_files.cmake "exec_program( ${CMAKE_COMMAND} ARGS -E remove ${module_install_dir}/${_current_FILE} OUTPUT_VARIABLE _dummy)\n" )
diff --git a/cmake/Modules/FindALGLIB.cmake b/cmake/Modules/FindALGLIB.cmake
index f70b6c4..b5f7b69 100644
--- a/cmake/Modules/FindALGLIB.cmake
+++ b/cmake/Modules/FindALGLIB.cmake
@@ -30,14 +30,15 @@ else (ALGLIB_LIBRARIES AND ALGLIB_INCLUDE_DIRS)
${CMAKE_INSTALL_PREFIX}/include
PATH_SUFFIXES
alglib
-
+ libalglib
)
mark_as_advanced(ALGLIB_INCLUDE_DIR)
find_library(ALGLIB_LIBRARY
NAMES
- alg
+ alglib
PATHS
+ /usr/lib64
/usr/lib
/usr/local/lib
/opt/local/lib
@@ -50,11 +51,9 @@ else (ALGLIB_LIBRARIES AND ALGLIB_INCLUDE_DIRS)
${ALGLIB_INCLUDE_DIR}
)
- if (ALGLIB_FOUND)
- set(ALGLIB_LIBRARIES
- ${ALGLIB_LIBRARY}
- )
- endif (ALGLIB_FOUND)
+ set(ALGLIB_LIBRARIES
+ ${ALGLIB_LIBRARY}
+ )
if (ALGLIB_INCLUDE_DIRS AND ALGLIB_LIBRARIES)
set(ALGLIB_FOUND TRUE)
diff --git a/cmake/Modules/FindQuaZip.cmake b/cmake/Modules/FindQuaZip.cmake
new file mode 100644
index 0000000..8fb805c
--- /dev/null
+++ b/cmake/Modules/FindQuaZip.cmake
@@ -0,0 +1,88 @@
+# - Try to find QUAZIP
+# Once done this will define
+#
+# QUAZIP_FOUND - system has QUAZIP
+# QUAZIP_INCLUDE_DIRS - the QUAZIP include directory
+# QUAZIP_LIBRARIES - Link these to use QUAZIP
+# QUAZIP_DEFINITIONS - Compiler switches required for using QUAZIP
+#
+# Redistribution and use is allowed according to the terms of the New
+# BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+
+if (QUAZIP_LIBRARIES AND QUAZIP_INCLUDE_DIRS)
+ # in cache already
+ set(QUAZIP_FOUND TRUE)
+else (QUAZIP_LIBRARIES AND QUAZIP_INCLUDE_DIRS)
+
+ find_path(QUAZIP_INCLUDE_DIR
+ NAMES
+ quazip.h
+ PATHS
+ /usr/include
+ /usr/local/include
+ /opt/local/include
+ /sw/include
+ /usr/include/quazip5
+ /usr/local/include/quazip5
+ /opt/local/include/quazip5
+ /sw/include/quazip5
+ ${CMAKE_INSTALL_PREFIX}/include
+ ${QUAZIP_DEV_PATH}/include/
+ )
+ mark_as_advanced(QUAZIP_INCLUDE_DIR)
+
+ IF (WIN32)
+ FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h HINTS ${QT_DEV_PATH}/include/QtZlib/)
+ ENDIF (WIN32)
+
+ find_library(LIBQUAZIP_LIBRARY
+ NAMES
+ quazip5
+ PATHS
+ /usr/lib
+ /usr/local/lib
+ /opt/local/lib
+ /sw/lib
+ ${CMAKE_INSTALL_PREFIX}/include
+ ${QUAZIP_DEV_PATH}/lib
+ )
+ mark_as_advanced(LIBQUAZIP_LIBRARY)
+
+ if (LIBQUAZIP_LIBRARY)
+ set(LIBQUAZIP_FOUND TRUE)
+ endif (LIBQUAZIP_LIBRARY)
+
+ set(QUAZIP_INCLUDE_DIRS
+ ${QUAZIP_INCLUDE_DIR}
+ IF (WIN32)
+ ${QUAZIP_ZLIB_INCLUDE_DIR}
+ ENDIF (WIN32)
+ )
+
+ if (LIBQUAZIP_FOUND)
+ set(QUAZIP_LIBRARIES ${QUAZIP_LIBRARIES} ${LIBQUAZIP_LIBRARY})
+ endif (LIBQUAZIP_FOUND)
+
+ if (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
+ set(QUAZIP_FOUND TRUE)
+ endif (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
+
+ if (QUAZIP_FOUND)
+ if (NOT QUAZIP_FIND_QUIETLY)
+ message(STATUS "Found QUAZIP: ${QUAZIP_LIBRARIES}")
+ message(STATUS "Found QUAZIP: ${QUAZIP_INCLUDE_DIR}")
+ endif (NOT QUAZIP_FIND_QUIETLY)
+ else (QUAZIP_FOUND)
+ if (QUAZIP_FIND_REQUIRED)
+ message(FATAL_ERROR "Could not find QUAZIP")
+ endif (QUAZIP_FIND_REQUIRED)
+ endif (QUAZIP_FOUND)
+
+ # show the QUAZIP_INCLUDE_DIRS and QUAZIP_LIBRARIES variables only in the advanced view
+ mark_as_advanced(QUAZIP_INCLUDE_DIRS QUAZIP_LIBRARIES)
+
+endif (QUAZIP_LIBRARIES AND QUAZIP_INCLUDE_DIRS)
+
diff --git a/msvc_64/QMapShack_Installer.nsi b/msvc_64/QMapShack_Installer.nsi
index 49c5ba5..542e712 100644
--- a/msvc_64/QMapShack_Installer.nsi
+++ b/msvc_64/QMapShack_Installer.nsi
@@ -183,6 +183,11 @@ Section "QMapShack" QMapShack
SetOutPath "$INSTDIR\share\"
File /r Files\share\*.*
;END PROJ.4 Files
+
+ ;BEGIN QuaZip Files
+ SetOutPath $INSTDIR
+ File Files\quazip5.dll
+ ;END QuaZip Files
;BEGIN Routino Files
SetOutPath $INSTDIR
@@ -198,6 +203,7 @@ Section "QMapShack" QMapShack
SetOutPath $INSTDIR
File Files\libmysql.dll
File Files\3rdparty.txt
+ File Files\qt.conf
;File Files\libexif-12.dll
;END additional Files
@@ -278,6 +284,6 @@ SectionEnd
Function .onInit
# set section 'MSVC' as unselected
- SectionSetFlags ${MSVC} 0
+ #SectionSetFlags ${MSVC} 0
FunctionEnd
diff --git a/msvc_64/copyfiles.bat b/msvc_64/copyfiles.bat
index 86af906..f2cc96c 100644
--- a/msvc_64/copyfiles.bat
+++ b/msvc_64/copyfiles.bat
@@ -13,6 +13,7 @@ rem set QLGTI_LIBEXIF_PATH="D:\qlgt\tools\libexif"
set QMSI_GDAL_PATH="M:\lib\gdal"
set QMSI_PROJ_PATH="M:\lib\PROJ"
set QMSI_ROUT_PATH="M:\src\routino_pkg"
+set QMSI_QUAZIP_PATH="M:\lib\quazip"
rem runtime libraries from mingw/msys - in my installation originally at C:\msys\opt\windows_64\bin
set QMSI_MGW6_PATH="M:\lib\mingw64"
rem runtime libraries from mysql/mariadb
@@ -99,6 +100,8 @@ copy %QMSI_MGW6_PATH%\libz-1.dll
xcopy %QMSI_ROUT_PATH%\xml routino-xml /s /i
rem section 2.2.6) MySql/MariaDB
copy %QMSI_MSQL_PATH%\libmysql.dll
+rem section 2.2.7) QuaZip
+copy %QMSI_QUAZIP_PATH%\lib\quazip5.dll
rem section 2.3) Copy MSVC Redist Files
copy %QMSI_VCREDIST_PATH%\vcredist_x64.exe
@@ -111,4 +114,8 @@ copy ..\*.ico
rem section 2.5) 3rd party SW description
copy ..\3rdparty.txt
-pause
\ No newline at end of file
+rem section 2.6) qt.conf
+copy ..\qt.conf
+
+
+pause
diff --git a/msvc_64/qt.conf b/msvc_64/qt.conf
new file mode 100644
index 0000000..6e6d3b8
--- /dev/null
+++ b/msvc_64/qt.conf
@@ -0,0 +1,4 @@
+[Paths]
+Plugins=.
+Translations=translations
+
diff --git a/src/CAbout.cpp b/src/CAbout.cpp
index 7f8b80a..690bac2 100644
--- a/src/CAbout.cpp
+++ b/src/CAbout.cpp
@@ -41,6 +41,14 @@ CAbout::CAbout(QWidget *parent)
{
labelRoutinoVersion->setText(tr("%1 (API V%2)").arg(Routino_Version).arg(Routino_APIVersion));
}
+
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
+ #if defined (HAVE_DBUS)
+ labelNoDBus->setText("");
+ #else
+ labelNoDBus->setText(tr("(no DBUS: device detection and handling disabled)"));
+ #endif
+#endif
}
CAbout::~CAbout()
diff --git a/src/CMainWindow.cpp b/src/CMainWindow.cpp
index 3e89cbe..4353926 100644
--- a/src/CMainWindow.cpp
+++ b/src/CMainWindow.cpp
@@ -94,9 +94,9 @@ CMainWindow::CMainWindow()
}
// end ---- restore window geometry -----
-
connect(actionAbout, &QAction::triggered, this, &CMainWindow::slotAbout);
connect(actionHelp, &QAction::triggered, this, &CMainWindow::slotHelp);
+ connect(actionQuickstart, &QAction::triggered, this, &CMainWindow::slotQuickstart);
connect(actionAddMapView, &QAction::triggered, this, &CMainWindow::slotAddCanvas);
connect(actionCloneMapView, &QAction::triggered, this, &CMainWindow::slotCloneCanvas);
connect(actionShowScale, &QAction::changed, this, &CMainWindow::slotUpdateCurrentWidget);
@@ -490,6 +490,32 @@ void CMainWindow::slotHelp()
QDesktopServices::openUrl(QUrl("https://bitbucket.org/maproom/qmapshack/wiki/DocMain"));
}
+void CMainWindow::slotQuickstart()
+{
+ // show menu action for German help if system language is German.
+ QString locale = QLocale::system().name();
+ if(locale.size() >= 2)
+ {
+ locale = locale.left(2).toLower();
+ if(locale == "de")
+ {
+ QDesktopServices::openUrl(QUrl("https://bitbucket.org/maproom/qmapshack/wiki/DocQuickStartGerman"));
+ }
+ else if(locale == "ru")
+ {
+ QDesktopServices::openUrl(QUrl("https://bitbucket.org/maproom/qmapshack/wiki/DocQuickStartRussian"));
+ }
+ else
+ {
+ QDesktopServices::openUrl(QUrl("https://bitbucket.org/maproom/qmapshack/wiki/DocQuickStartEnglish"));
+ }
+ }
+ else
+ {
+ QDesktopServices::openUrl(QUrl("https://bitbucket.org/maproom/qmapshack/wiki/DocQuickStartEnglish"));
+ }
+}
+
void CMainWindow::slotAddCanvas()
{
@@ -1049,7 +1075,7 @@ void CMainWindow::dragEnterEvent(QDragEnterEvent *event)
QFileInfo fi(urls[0].path());
QString ext = fi.suffix().toUpper();
- if( (ext == "QMS") || (ext == "GPX") || (ext == "SLF") || (ext == "FIT") )
+ if ((ext == "QMS") || (ext == "GPX") || (ext == "SLF") || (ext == "FIT") || (ext == "TCX"))
{
event->acceptProposedAction();
}
diff --git a/src/CMainWindow.h b/src/CMainWindow.h
index 2f2afac..e226ba3 100644
--- a/src/CMainWindow.h
+++ b/src/CMainWindow.h
@@ -86,6 +86,8 @@ public:
return actionSetupDEMPaths;
}
+ void loadGISData(const QStringList& filenames);
+
const qint32 id;
protected:
#ifdef WIN32
@@ -98,6 +100,7 @@ protected:
private slots:
void slotAbout();
void slotHelp();
+ void slotQuickstart();
void slotAddCanvas();
void slotCloneCanvas();
void slotTabCloseRequest(int i);
@@ -132,7 +135,6 @@ private slots:
private:
friend int main(int argc, char ** argv);
CMainWindow();
- void loadGISData(const QStringList& filenames);
void prepareMenuForMac();
void testForNoView();
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c92db40..d863d99 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,6 +10,30 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Instruct CMake to run moc automatically when needed.
set(CMAKE_AUTOMOC ON)
+option(BUILD_FOR_LOCAL_SYSTEM "Build for local system ONLY (resulting binary might not work on other systems!)" OFF)
+
+if(BUILD_FOR_LOCAL_SYSTEM)
+ set(flag "-march=native")
+ CHECK_CXX_COMPILER_FLAG(${flag} Flag:${flag})
+ if(Flag:${flag})
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}" PARENT_SCOPE)
+
+ message(WARNING [=[
+ BUILDING FOR LOCAL SYSTEM ONLY
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Specifying -DBUILD_FOR_LOCAL_SYSTEM=ON will pass -march=native to the compiler.
+ The generated binary will exhibit higher performance,
+ but will not be portable (e.g., might not work on other CPUs)]=])
+ else(Flag:${flag})
+ message(WARNING [=[
+ Your compiler does not support -march=native.
+ Ignoring -DBUILD_FOR_LOCAL_SYSTEM=ON!]=])
+ endif(Flag:${flag})
+
+
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
+endif(BUILD_FOR_LOCAL_SYSTEM)
+
# Find the QtWidgets library
find_package(Qt5Widgets)
find_package(Qt5Core)
@@ -19,12 +43,18 @@ find_package(Qt5Sql)
find_package(Qt5WebKitWidgets)
find_package(Qt5LinguistTools)
find_package(Qt5PrintSupport)
-if(UNIX AND NOT APPLE)
-find_package(Qt5DBus)
-endif(UNIX AND NOT APPLE)
find_package(GDAL REQUIRED)
find_package(PROJ REQUIRED)
find_package(ROUTINO REQUIRED)
+find_package(QuaZip REQUIRED)
+
+if(USE_QT5DBus)
+ find_package(Qt5DBus)
+ if(Qt5DBus_FOUND)
+ add_definitions(-DHAVE_DBUS)
+ endif(Qt5DBus_FOUND)
+endif(USE_QT5DBus)
+
if(${Qt5Widgets_VERSION} MATCHES "5\\.[0-2]+\\..*")
message( SEND_ERROR "You need at least Qt5.3 or newer.")
@@ -55,6 +85,7 @@ endif(APPLE)
set( SRCS
GeoMath.cpp
CMainWindow.cpp
+ CSingleInstanceProxy.cpp
CAbout.cpp
widgets/CTinySpinBox.cpp
widgets/CDoubleSpinBox.cpp
@@ -169,6 +200,8 @@ set( SRCS
gis/slf/CSlfReader.cpp
gis/tnv/CTwoNavProject.cpp
gis/tnv/serialization.cpp
+ gis/tcx/CTcxProject.cpp
+ gis/tcx/serialization.cpp
gis/db/IDB.cpp
gis/db/IDBSqlite.cpp
gis/db/IDBMysql.cpp
@@ -232,7 +265,16 @@ set( SRCS
gis/rte/router/CRouterSetup.cpp
gis/rte/router/CRouterRoutino.cpp
gis/rte/router/CRouterMapQuest.cpp
- gis/rte/router/CRouterRoutinoPathSetup.cpp
+ gis/rte/router/routino/CRouterRoutinoPathSetup.cpp
+ gis/rte/router/CRouterBRouter.cpp
+ gis/rte/router/brouter/CRouterBRouterInfo.cpp
+ gis/rte/router/brouter/CRouterBRouterSetup.cpp
+ gis/rte/router/brouter/CRouterBRouterSetupPage.cpp
+ gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp
+ gis/rte/router/brouter/CRouterBRouterToolShell.cpp
+ gis/rte/router/brouter/CRouterBRouterTilesPage.cpp
+ gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp
+ gis/rte/router/brouter/CRouterBRouterTilesSelectArea.cpp
gis/ovl/CGisItemOvlArea.cpp
gis/ovl/CScrOptOvlArea.cpp
gis/ovl/CDetailsOvlArea.cpp
@@ -294,12 +336,14 @@ set( SRCS
setup/CLogHandler.cpp
)
-if(UNIX AND NOT APPLE)
+
+if(Qt5DBus_FOUND)
set( SRCS
${SRCS}
device/CDeviceWatcherLinux.cpp
)
-endif(UNIX AND NOT APPLE)
+endif(Qt5DBus_FOUND)
+
if (APPLE)
set( SRCS
@@ -320,6 +364,7 @@ set( HDRS
version.h
GeoMath.h
CMainWindow.h
+ CSingleInstanceProxy.h
CAbout.h
widgets/CTinySpinBox.h
widgets/CDoubleSpinBox.h
@@ -421,6 +466,7 @@ set( HDRS
mouse/line/CLineOpAddPoint.h
mouse/line/CLineOpDeletePoint.h
mouse/line/CLineOpSelectRange.h
+ gis/Poi.h
gis/WptIcons.h
gis/CGisDraw.h
gis/IGisItem.h
@@ -433,6 +479,7 @@ set( HDRS
gis/CSelDevices.h
gis/qms/CQmsProject.h
gis/tnv/CTwoNavProject.h
+ gis/tcx/CTcxProject.h
gis/db/IDB.h
gis/db/IDBSqlite.h
gis/db/IDBMysql.h
@@ -495,7 +542,18 @@ set( HDRS
gis/rte/router/CRouterSetup.h
gis/rte/router/CRouterRoutino.h
gis/rte/router/CRouterMapQuest.h
- gis/rte/router/CRouterRoutinoPathSetup.h
+ gis/rte/router/routino/CRouterRoutinoPathSetup.h
+ gis/rte/router/CRouterBRouter.h
+ gis/rte/router/brouter/CRouterBRouterInfo.h
+ gis/rte/router/brouter/CRouterBRouterSetup.h
+ gis/rte/router/brouter/CRouterBRouterSetupPage.h
+ gis/rte/router/brouter/CRouterBRouterSetupWizard.h
+ gis/rte/router/brouter/CRouterBRouterToolShell.h
+ gis/rte/router/brouter/CRouterBRouterTilesPage.h
+ gis/rte/router/brouter/CRouterBRouterTilesSelect.h
+ gis/rte/router/brouter/CRouterBRouterTilesSelectArea.h
+ gis/rte/router/brouter/CRouterBRouterTilesSelectLayout.h
+ gis/rte/router/brouter/CRouterBRouterTilesStatus.h
gis/ovl/CGisItemOvlArea.h
gis/ovl/CScrOptOvlArea.h
gis/ovl/CDetailsOvlArea.h
@@ -563,12 +621,14 @@ set( HDRS
setup/IAppSetup.h
)
-if(UNIX AND NOT APPLE)
+
+if(Qt5DBus_FOUND)
set( HDRS
${HDRS}
device/CDeviceWatcherLinux.h
)
-endif(UNIX AND NOT APPLE)
+endif(Qt5DBus_FOUND)
+
if(APPLE)
set( HDRS
@@ -653,7 +713,10 @@ set( UIS
gis/rte/router/IRouterSetup.ui
gis/rte/router/IRouterRoutino.ui
gis/rte/router/IRouterMapQuest.ui
- gis/rte/router/IRouterRoutinoPathSetup.ui
+ gis/rte/router/routino/IRouterRoutinoPathSetup.ui
+ gis/rte/router/IRouterBRouter.ui
+ gis/rte/router/brouter/IRouterBRouterInfo.ui
+ gis/rte/router/brouter/IRouterBRouterSetupWizard.ui
gis/ovl/IScrOptOvlArea.ui
gis/ovl/IDetailsOvlArea.ui
units/ITimeZoneSetup.ui
@@ -727,7 +790,7 @@ include_directories(
${PROJ_INCLUDE_DIRS}
${ROUTINO_INCLUDE_DIRS}
${ALGLIB_INCLUDE_DIRS}
-
+ ${QUAZIP_INCLUDE_DIRS}
)
if(APPLE)
@@ -738,11 +801,12 @@ endif(APPLE)
add_library(QMS ${LIBINP})
add_executable(${APPLICATION_NAME} WIN32 ${MAININP})
-if(UNIX AND NOT APPLE)
+
+if(Qt5DBus_FOUND)
set(DBUS_LIB Qt5::DBus)
-else(UNIX AND NOT APPLE)
+else(Qt5DBus_FOUND)
set(DBUS_LIB)
-endif(UNIX AND NOT APPLE)
+endif(Qt5DBus_FOUND)
target_link_libraries(QMS
Qt5::Widgets
@@ -756,6 +820,7 @@ target_link_libraries(QMS
${PROJ_LIBRARIES}
${ROUTINO_LIBRARIES}
${ALGLIB_LIBRARIES}
+ ${QUAZIP_LIBRARIES}
)
target_link_libraries(${APPLICATION_NAME}
@@ -771,6 +836,7 @@ target_link_libraries(${APPLICATION_NAME}
${PROJ_LIBRARIES}
${ROUTINO_LIBRARIES}
${ALGLIB_LIBRARIES}
+ ${QUAZIP_LIBRARIES}
)
if(APPLE)
diff --git a/src/CSingleInstanceProxy.cpp b/src/CSingleInstanceProxy.cpp
new file mode 100644
index 0000000..7e83ed4
--- /dev/null
+++ b/src/CSingleInstanceProxy.cpp
@@ -0,0 +1,102 @@
+/**********************************************************************************************
+ Copyright (C) 2017 Oliver Eichler oliver.eichler at gmx.de
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#include "CMainWindow.h"
+#include "CSingleInstanceProxy.h"
+#include <QtNetwork>
+
+CSingleInstanceProxy::CSingleInstanceProxy(const QStringList filenames)
+{
+ serverName = CMainWindow::self().getUser();
+ if(serverName != "QMapShack")
+ {
+ serverName = "QMapShack-" + serverName;
+ }
+
+ QLocalSocket socket;
+ socket.connectToServer(serverName);
+ if(socket.waitForConnected(1000))
+ {
+ // if the connection is successful another instance
+ // is already running. In that case the list of files to
+ // open is sent to the primary instance. And this instance
+ // will be closed imediately.
+ QDataStream stream(&socket);
+ stream << filenames;
+ socket.waitForBytesWritten(3000);
+
+ // wait for confirmation
+ socket.waitForReadyRead(3000);
+ bool ok;
+ stream >> ok;
+ qDebug() << "Sent parameters to primary instance. Result" << ok;
+ qDebug() << "There can only be one. Exit.";
+ exit(0);
+ }
+
+ // Looks like we are the first instance.
+ // Create a server socket and wait for other instances to connect.
+ server = new QLocalServer(this);
+ connect(server, &QLocalServer::newConnection, this, &CSingleInstanceProxy::slotNewConnection);
+ server->removeServer(serverName);
+ if(!server->listen(serverName))
+ {
+ qDebug() << "CSingleInstanceProxy: Failed to start single instance server socket.";
+ }
+ else
+ {
+ qDebug() << "CSingleInstanceProxy: Single instance server socket listening to" << server->fullServerName();
+ }
+}
+
+CSingleInstanceProxy::~CSingleInstanceProxy()
+{
+ qDebug() << "CSingleInstanceProxy::~CSingleInstanceProxy()";
+}
+
+void CSingleInstanceProxy::slotNewConnection()
+{
+ QLocalSocket * socket = server->nextPendingConnection();
+ if(socket == nullptr)
+ {
+ return;
+ }
+
+ // Each secondoray instance will send a QStringList with files to open
+ // The list can be empty.
+ if(socket->waitForReadyRead(3000))
+ {
+ QStringList filenames;
+ QDataStream stream(socket);
+ stream >> filenames;
+
+ CMainWindow& w = CMainWindow::self();
+ w.loadGISData(filenames);
+
+ // confirm that files are loaded
+ stream << true;
+ socket->waitForBytesWritten(3000);
+
+ // raise the application window to top of desktop
+ w.raise();
+ QApplication::setActiveWindow(&w);
+ }
+
+ socket->close();
+ delete socket;
+}
diff --git a/templates/header.h b/src/CSingleInstanceProxy.h
similarity index 65%
copy from templates/header.h
copy to src/CSingleInstanceProxy.h
index 0679fac..c211c8c 100644
--- a/templates/header.h
+++ b/src/CSingleInstanceProxy.h
@@ -1,5 +1,5 @@
/**********************************************************************************************
- Copyright (C) 2016 Oliver Eichler oliver.eichler at gmx.de
+ Copyright (C) 2017 Oliver Eichler oliver.eichler at gmx.de
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,15 +16,26 @@
**********************************************************************************************/
-#ifndef CLASSNAME_H
-#define CLASSNAME_H
+#ifndef CSINGLEINSTANCEPROXY_H
+#define CSINGLEINSTANCEPROXY_H
-class CLASSNAME
+#include <QObject>
+class QLocalServer;
+
+class CSingleInstanceProxy : public QObject
{
- public:
- CLASSNAME();
- virtual ~CLASSNAME() = default;
+public:
+ CSingleInstanceProxy(const QStringList filenames);
+ virtual ~CSingleInstanceProxy();
+
+private slots:
+ void slotNewConnection();
+
+private:
+ QLocalServer * server = nullptr;
+
+ QString serverName;
};
-#endif //CLASSNAME_H
+#endif //CSINGLEINSTANCEPROXY_H
diff --git a/src/IAbout.ui b/src/IAbout.ui
index 101bfc0..5067520 100644
--- a/src/IAbout.ui
+++ b/src/IAbout.ui
@@ -64,6 +64,13 @@
</widget>
</item>
<item>
+ <widget class="QLabel" name="labelNoDBus">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
@@ -202,7 +209,7 @@
<item row="1" column="1">
<widget class="QLabel" name="label_10">
<property name="text">
- <string>Josef Latt</string>
+ <string>Oliver Eichler</string>
</property>
</widget>
</item>
@@ -282,6 +289,20 @@
</property>
</widget>
</item>
+ <item row="3" column="2">
+ <widget class="QLabel" name="label_29">
+ <property name="text">
+ <string>Russian:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="3">
+ <widget class="QLabel" name="label_30">
+ <property name="text">
+ <string>Wolfgang Thämelt</string>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
<item>
@@ -379,7 +400,8 @@
<widget class="QLabel" name="label_26">
<property name="text">
<string>Christian Eichler (qms at christian-eichler.de)
-Ivo Kronenberg</string>
+Ivo Kronenberg
+Norbert Truchsess (norbert.truchsess at t-online.de)</string>
</property>
<property name="wordWrap">
<bool>true</bool>
@@ -403,7 +425,7 @@ Ivo Kronenberg</string>
<item>
<widget class="QLabel" name="label_7">
<property name="text">
- <string>© 2016 Oliver Eichler (oliver.eichler at gmx.de)</string>
+ <string>© 2017 Oliver Eichler (oliver.eichler at gmx.de)</string>
</property>
</widget>
</item>
diff --git a/src/IMainWindow.ui b/src/IMainWindow.ui
index e069aee..6615ecf 100644
--- a/src/IMainWindow.ui
+++ b/src/IMainWindow.ui
@@ -55,7 +55,7 @@
<x>0</x>
<y>0</y>
<width>800</width>
- <height>21</height>
+ <height>23</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
@@ -103,6 +103,7 @@
<string>Window</string>
</property>
<addaction name="actionCloseTab"/>
+ <addaction name="separator"/>
</widget>
<widget class="QMenu" name="menu">
<property name="title">
@@ -110,6 +111,7 @@
</property>
<addaction name="actionAbout"/>
<addaction name="actionHelp"/>
+ <addaction name="actionQuickstart"/>
</widget>
<widget class="QMenu" name="menuProject">
<property name="title">
@@ -793,6 +795,15 @@
<string>Ctrl+W</string>
</property>
</action>
+ <action name="actionQuickstart">
+ <property name="icon">
+ <iconset resource="resources.qrc">
+ <normaloff>:/icons/32x32/Help.png</normaloff>:/icons/32x32/Help.png</iconset>
+ </property>
+ <property name="text">
+ <string>Quickstart Help</string>
+ </property>
+ </action>
</widget>
<customwidgets>
<customwidget>
diff --git a/src/canvas/CCanvas.cpp b/src/canvas/CCanvas.cpp
index 524963a..2e8dcfb 100644
--- a/src/canvas/CCanvas.cpp
+++ b/src/canvas/CCanvas.cpp
@@ -24,6 +24,7 @@
#include "gis/CGisDraw.h"
#include "gis/CGisWidget.h"
#include "gis/IGisLine.h"
+#include "gis/Poi.h"
#include "gis/ovl/CGisItemOvlArea.h"
#include "gis/trk/CGisItemTrk.h"
#include "grid/CGrid.h"
@@ -119,6 +120,13 @@ CCanvas::CCanvas(QWidget *parent, const QString &name)
CCanvas::~CCanvas()
{
+ /* stop running drawing-threads and don't destroy unless they have finished*/
+ map->quit();
+ dem->quit();
+ gis->quit();
+ map->wait();
+ dem->wait();
+ gis->wait();
/*
Some mouse objects call methods from their canvas on destruction.
So they are better deleted now explicitly before any other object
@@ -696,12 +704,12 @@ void CCanvas::convertGridPos2Str(const QPointF& pos, QString& str, bool simple)
grid->convertPos2Str(pos, str, simple);
}
-void CCanvas::convertRad2Px(QPointF& pos)
+void CCanvas::convertRad2Px(QPointF& pos) const
{
map->convertRad2Px(pos);
}
-void CCanvas::convertPx2Rad(QPointF& pos)
+void CCanvas::convertPx2Rad(QPointF& pos) const
{
map->convertPx2Rad(pos);
}
@@ -718,6 +726,11 @@ void CCanvas::displayInfo(const QPoint& px)
QToolTip::hideText();
}
+poi_t CCanvas::findPOICloseBy(const QPoint& px) const
+{
+ return map->findPOICloseBy(px);
+}
+
void CCanvas::setup()
{
CCanvasSetup dlg(this);
diff --git a/src/canvas/CCanvas.h b/src/canvas/CCanvas.h
index 32d22f7..1a7d593 100644
--- a/src/canvas/CCanvas.h
+++ b/src/canvas/CCanvas.h
@@ -44,6 +44,7 @@ class QMovie;
class QLabel;
class IPlot;
struct SGisLine;
+struct poi_t;
class CCanvas : public QWidget
{
@@ -61,8 +62,8 @@ public:
void setupGrid();
void convertGridPos2Str(const QPointF& pos, QString& str, bool simple);
- void convertRad2Px(QPointF &pos);
- void convertPx2Rad(QPointF& pos);
+ void convertRad2Px(QPointF &pos) const;
+ void convertPx2Rad(QPointF& pos) const;
void setupBackgroundColor();
@@ -86,6 +87,7 @@ public:
void moveMap(const QPointF &delta);
void zoomTo(const QRectF& rect);
void displayInfo(const QPoint& px);
+ poi_t findPOICloseBy(const QPoint& px) const;
enum redraw_e
{
diff --git a/src/canvas/IDrawContext.cpp b/src/canvas/IDrawContext.cpp
index 5857775..b6232fd 100644
--- a/src/canvas/IDrawContext.cpp
+++ b/src/canvas/IDrawContext.cpp
@@ -294,23 +294,82 @@ void IDrawContext::convertRad2Px(QPointF &p) const
mutex.unlock(); // --------- stop serialize with thread
}
+
void IDrawContext::convertRad2Px(QPolygonF& poly) const
{
+ if(pjsrc == nullptr)
+ {
+ return;
+ }
+
mutex.lock(); // --------- start serialize with thread
QPointF f = focus;
convertRad2M(f);
- for(int i = 0; i < poly.size(); i++)
+ const int N = poly.size();
+
+ struct p_t
+ {
+ qreal fixWest;
+ qreal fixEast;
+ };
+
+ QVector<p_t> fixes(N, {NOFLOAT, NOFLOAT});
+
+ qreal * pY = &poly.data()->ry();
+ p_t * pFix = fixes.data();
+
+ /*
+ Proj4 makes a wrap around for values outside the
+ range of -180..180°. But the draw context has no
+ turnaround. It exceeds the values. We have to
+ apply fixes in that case.
+ */
+ for(int i = 0; i < N; ++i, ++pFix, pY += 2)
+ {
+ if(*pY < (-180*DEG_TO_RAD))
+ {
+ pFix->fixWest = *pY;
+ }
+ if(*pY > ( 180*DEG_TO_RAD))
+ {
+ pFix->fixEast = *pY;
+ }
+ }
+
+ pj_transform(pjtar, pjsrc, N, 2, &poly.data()->rx(), &poly.data()->ry(), 0);
+
+
+ QPointF * pPt = poly.data();
+ pFix = fixes.data();
+ for(int i = 0; i < N; ++i, ++pFix, ++pPt)
{
- QPointF& p = poly[i];
- convertRad2M(p);
- p = (p - f) / (scale * zoomFactor) + center;
+ /*
+ The idea of the fix is to calculate a point
+ at the boundary with the same latitude and use it
+ as offset.
+ */
+ if(pFix->fixWest != NOFLOAT)
+ {
+ QPointF o(-180*DEG_TO_RAD, pFix->fixWest);
+ convertRad2M(o);
+ pPt->rx() = 2*o.x() + pPt->x();
+ }
+ if(pFix->fixEast != NOFLOAT)
+ {
+ QPointF o(180*DEG_TO_RAD, pFix->fixEast);
+ convertRad2M(o);
+ pPt->rx() = 2*o.x() + pPt->x();
+ }
+
+ *pPt = (*pPt - f) / (scale * zoomFactor) + center;
}
mutex.unlock(); // --------- stop serialize with thread
}
+
void IDrawContext::draw(QPainter& p, CCanvas::redraw_e needsRedraw, const QPointF& f)
{
if(pjsrc == nullptr)
diff --git a/src/canvas/IDrawObject.cpp b/src/canvas/IDrawObject.cpp
index 0e6ac96..539ed6f 100644
--- a/src/canvas/IDrawObject.cpp
+++ b/src/canvas/IDrawObject.cpp
@@ -16,6 +16,7 @@
**********************************************************************************************/
+#include "canvas/IDrawContext.h"
#include "canvas/IDrawObject.h"
#include "units/IUnit.h"
@@ -89,3 +90,134 @@ void IDrawObject::setMaxScale(qreal s)
}
maxScale = s;
}
+
+void IDrawObject::drawTileLQ(const QImage& img, QPolygonF& l, QPainter& p, IDrawContext& context, projPJ pjsrc, projPJ pjtar)
+{
+ QPolygonF tmp = l;
+ context.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));
+
+ // switch to HQ if the gaps get visible
+ if((qAbs(dy1) > 2) || (qAbs(dx2) > 2))
+ {
+ drawTileHQ(img, tmp, p, context, pjsrc, pjtar);
+ return;
+ }
+
+ // 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;
+
+ // finally translate, scale, rotate and draw tile
+ p.save();
+ p.translate(l[0]);
+ p.scale(w/img.width(), h/img.height());
+ p.rotate(a);
+ p.drawImage(0,0,img);
+ p.restore();
+}
+
+
+void IDrawObject::drawTileHQ(const QImage& img, QPolygonF& l, QPainter& p, IDrawContext& context, projPJ pjsrc, projPJ pjtar)
+{
+ // the sub-tiles need a sensible size
+ // if they get too small there will be too much
+ // rounding effects.
+ qint32 nStepsX = 8;
+ qint32 nStepsY = 8;
+ if(img.width()/nStepsX < 32)
+ {
+ nStepsX = 4;
+ }
+ if(img.height()/nStepsY < 32)
+ {
+ nStepsY = 4;
+ }
+
+ // transform the rad coordinates from l into the coord. system
+ // of the map
+ pj_transform(pjtar, pjsrc, 4, 2, &l[0].rx(), &l[0].ry(), 0);
+
+
+ // calculate nStepsX*nStepsY squares evenly distributed over the tile
+ // in map coords
+ qreal subStepX = (l[1].x() - l[0].x()) / nStepsX;
+ qreal subStepY = (l[3].y() - l[0].y()) / nStepsY;
+ qreal offsetX = l[0].x();
+ qreal offsetY = l[0].y();
+
+ QPolygonF quads(nStepsX * nStepsY * 4);
+ QPointF* pPt = quads.data();
+
+ for(int y = 0; y < nStepsY; ++y)
+ {
+ for(int x = 0; x < nStepsX; ++x)
+ {
+ pPt->rx() = offsetX;
+ pPt->ry() = offsetY;
+ ++pPt;
+ pPt->rx() = offsetX + subStepX;
+ pPt->ry() = offsetY;
+ ++pPt;
+ pPt->rx() = offsetX + subStepX;
+ pPt->ry() = offsetY + subStepY;
+ ++pPt;
+ pPt->rx() = offsetX;
+ pPt->ry() = offsetY + subStepY;
+ ++pPt;
+
+ offsetX += subStepX;
+ }
+
+ offsetX = l[0].x();
+ offsetY += subStepY;
+ }
+
+ // transform the squares back to lon/lat coords in rad
+ pj_transform(pjsrc, pjtar, nStepsX * nStepsY * 4, 2, &quads[0].rx(), &quads[0].ry(), 0);
+ // convert the lon/lat coords of the squares into pixel coords of the
+ // canvas using the view's projection
+ context.convertRad2Px(quads);
+
+ QRectF rect(0,0, img.width()/nStepsX, img.height() / nStepsY);
+ const qreal rw = rect.width();
+ const qreal rh = rect.height();
+
+ // iterate over all squares, calculate the translation and rotation and draw the part of the
+ // tile matching the square.
+ pPt = quads.data();
+ for(int y = 0; y < nStepsY; ++y)
+ {
+ rect.moveTop(y * rh);
+ for(int x = 0; x < nStepsX; ++x, pPt += 4)
+ {
+ // adjust the tiles width and height to fit the buffer's scale
+ qreal dx1 = pPt[0].x() - pPt[1].x();
+ qreal dy1 = pPt[0].y() - pPt[1].y();
+ qreal dx2 = pPt[0].x() - pPt[3].x();
+ qreal dy2 = pPt[0].y() - pPt[3].y();
+ qreal w = 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;
+
+ // move rect to select the part of the tile to draw.
+ rect.moveLeft(x * rw);
+
+ // finally translate, scale, rotate and draw tile
+ p.save();
+ p.translate(pPt[0]);
+ p.scale(w/rw, h/rh);
+ p.rotate(a);
+ p.drawImage(QPoint(0,0),img, rect);
+ p.restore();
+ }
+ }
+}
diff --git a/src/canvas/IDrawObject.h b/src/canvas/IDrawObject.h
index bef2380..3139c02 100644
--- a/src/canvas/IDrawObject.h
+++ b/src/canvas/IDrawObject.h
@@ -21,9 +21,12 @@
#include "units/IUnit.h"
#include <QObject>
+#include <proj_api.h>
class QSettings;
class QListWidget;
+class QPainter;
+class IDrawContext;
class IDrawObject : public QObject
{
@@ -127,6 +130,12 @@ protected:
{
}
+
+ // draw tiles with low quality re-projection but fast
+ void drawTileLQ(const QImage& img, QPolygonF& l, QPainter& p, IDrawContext& context, projPJ pjsrc, projPJ pjtar);
+ // draw tiles with high quality re-projection but slow
+ void drawTileHQ(const QImage& img, QPolygonF& l, QPainter& p, IDrawContext& context, projPJ pjsrc, projPJ pjtar);
+
private:
/// the opacity level of a map
qreal opacity = 100;
diff --git a/src/cursors/wptHighlightBlue.png b/src/cursors/wptHighlightBlue.png
new file mode 100644
index 0000000..b603b82
Binary files /dev/null and b/src/cursors/wptHighlightBlue.png differ
diff --git a/src/cursors/wptHighlight.svg b/src/cursors/wptHighlightBlue.svg
similarity index 84%
copy from src/cursors/wptHighlight.svg
copy to src/cursors/wptHighlightBlue.svg
index 1476738..9051b10 100644
--- a/src/cursors/wptHighlight.svg
+++ b/src/cursors/wptHighlightBlue.svg
@@ -14,8 +14,8 @@
height="64"
id="svg2"
version="1.1"
- inkscape:version="0.48.4 r9939"
- sodipodi:docname="Neues Dokument 1">
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="wptHighlightBlue.svg">
<defs
id="defs4">
<linearGradient
@@ -25,7 +25,7 @@
offset="0"
id="stop3817" />
<stop
- style="stop-color:#ff2a2a;stop-opacity:0;"
+ style="stop-color:#002aff;stop-opacity:0"
offset="1"
id="stop3819" />
</linearGradient>
@@ -71,15 +71,15 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="8"
- inkscape:cx="32.100954"
+ inkscape:cx="-29.774046"
inkscape:cy="49.055774"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1920"
- inkscape:window-height="996"
- inkscape:window-x="-2"
- inkscape:window-y="-3"
+ inkscape:window-height="989"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
@@ -97,7 +97,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>
@@ -114,28 +114,28 @@
sodipodi:cy="29"
sodipodi:rx="15"
sodipodi:ry="15"
- d="m 45,29 a 15,15 0 1 1 -1.33e-4,-0.06325"
+ d="M 45,29 A 15,15 0 0 1 30.015812,43.999992 15,15 0 0 1 15.000033,29.031623 15,15 0 0 1 29.952565,14.000075 15,15 0 0 1 44.999867,28.936754"
transform="matrix(0.97281118,0,0,0.97281118,0.87316707,989.09323)"
sodipodi:start="0"
sodipodi:end="6.2789689"
sodipodi:open="true"
- inkscape:export-filename="/home/oeichler/Code/cpp/QMapShack/src/cursors/wptHighlight.png"
+ inkscape:export-filename="/home/oeichler/Code/cpp/QMapShack/src/cursors/wptHighlightBlue.png"
inkscape:export-xdpi="137.22581"
inkscape:export-ydpi="137.22581" />
<path
sodipodi:type="arc"
- style="fill:none;stroke:#ff2a2a;stroke-width:0.50444174;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ style="fill:none;stroke:#2a2aff;stroke-width:0.50444174;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
id="path3823"
sodipodi:cx="-5"
sodipodi:cy="31.5"
sodipodi:rx="5"
sodipodi:ry="2.5"
- d="m 0,31.5 a 5,2.5 0 1 1 -4.4445158e-5,-0.01054"
+ d="m 0,31.5 a 5,2.5 0 0 1 -4.9947295,2.499999 5,2.5 0 0 1 -5.0052594,-2.494728 5,2.5 0 0 1 4.9841774,-2.505258 5,2.5 0 0 1 5.015767054842,2.489446"
transform="matrix(2.0535053,0,0,4.1070106,40.325029,887.93392)"
sodipodi:start="0"
sodipodi:end="6.2789689"
sodipodi:open="true"
- inkscape:export-filename="/home/oeichler/Code/cpp/QMapShack/src/cursors/wptHighlight.png"
+ inkscape:export-filename="/home/oeichler/Code/cpp/QMapShack/src/cursors/wptHighlightBlue.png"
inkscape:export-xdpi="137.22581"
inkscape:export-ydpi="137.22581" />
</g>
diff --git a/src/cursors/wptHighlight.png b/src/cursors/wptHighlightRed.png
similarity index 100%
rename from src/cursors/wptHighlight.png
rename to src/cursors/wptHighlightRed.png
diff --git a/src/cursors/wptHighlight.svg b/src/cursors/wptHighlightRed.svg
similarity index 100%
rename from src/cursors/wptHighlight.svg
rename to src/cursors/wptHighlightRed.svg
diff --git a/src/dem/CDemDraw.cpp b/src/dem/CDemDraw.cpp
index 7499b68..ba5de13 100644
--- a/src/dem/CDemDraw.cpp
+++ b/src/dem/CDemDraw.cpp
@@ -269,7 +269,7 @@ qreal CDemDraw::getElevationAt(const QPointF& pos)
if(!item || item->demfile.isNull())
{
// as all active maps have to be at the top of the list
- // it is ok to break ass soon as the first map with no
+ // it is ok to break as soon as the first map with no
// active files is hit.
break;
}
@@ -315,7 +315,7 @@ void CDemDraw::drawt(buffer_t& currentBuffer)
if(!item || item->demfile.isNull())
{
// as all active maps have to be at the top of the list
- // it is ok to break ass soon as the first map with no
+ // it is ok to break as soon as the first map with no
// active files is hit.
break;
}
diff --git a/src/dem/IDem.cpp b/src/dem/IDem.cpp
index 645419c..01ec879 100644
--- a/src/dem/IDem.cpp
+++ b/src/dem/IDem.cpp
@@ -269,27 +269,7 @@ void IDem::slopecolor(QVector<qint16>& data, qreal w, qreal h, QImage &img)
}
}
-
void IDem::drawTile(QImage& img, QPolygonF& l, QPainter& p)
{
- dem->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));
-
- // 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;
-
- // finally translate, scale, rotate and draw tile
- p.save();
- p.translate(l[0]);
- p.scale(w/img.width(), h/img.height());
- p.rotate(a);
- p.drawImage(0,0,img);
- p.restore();
+ drawTileLQ(img, l, p, *dem, pjsrc, pjtar);
}
diff --git a/src/device/IDevice.cpp b/src/device/IDevice.cpp
index 4fa75b3..5796dbe 100644
--- a/src/device/IDevice.cpp
+++ b/src/device/IDevice.cpp
@@ -22,7 +22,7 @@
#include "gis/prj/IGisProject.h"
#include "helpers/CSelectCopyAction.h"
-#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
+#ifdef HAVE_DBUS
#include <QtDBus>
#endif
@@ -52,7 +52,7 @@ IDevice::~IDevice()
void IDevice::mount(const QString& path)
{
-#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
+#ifdef HAVE_DBUS
QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.UDisks2",path,"org.freedesktop.UDisks2.Filesystem","Mount");
QVariantMap args;
args.insert("options", "sync");
@@ -68,7 +68,7 @@ void IDevice::mount(const QString& path)
void IDevice::umount(const QString &path)
{
-#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
+#ifdef HAVE_DBUS
QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.UDisks2",path,"org.freedesktop.UDisks2.Filesystem","Unmount");
QVariantMap args;
message << args;
diff --git a/src/gis/CGisListDB.cpp b/src/gis/CGisListDB.cpp
index e49bc21..61c9f29 100644
--- a/src/gis/CGisListDB.cpp
+++ b/src/gis/CGisListDB.cpp
@@ -25,6 +25,7 @@
#include "gis/db/CDBFolderMysql.h"
#include "gis/db/CDBFolderSqlite.h"
#include "gis/db/CDBItem.h"
+#include "gis/db/CDBProject.h"
#include "gis/db/CSearchDatabase.h"
#include "gis/db/CSelectDBFolder.h"
#include "gis/db/CSetupDatabase.h"
@@ -122,6 +123,8 @@ CGisListDB::CGisListDB(QWidget *parent)
actionCopyFolder = menuFolder->addAction(QIcon("://icons/32x32/Copy.png"), tr("Copy Folder"), this, SLOT(slotCopyFolder()));
actionMoveFolder = menuFolder->addAction(QIcon("://icons/32x32/Move.png"), tr("Move Folder"), this, SLOT(slotMoveFolder()));
actionDelFolder = menuFolder->addAction(QIcon("://icons/32x32/DeleteOne.png"), tr("Delete Folder"), this, SLOT(slotDelFolder()));
+ menuFolder->addSeparator();
+ actionImport = menuFolder->addAction(QIcon("://icons/32x32/LoadGIS.png"), tr("Import from Files..."), this, SLOT(slotImport()));
actionExportToGpx = menuFolder->addAction(QIcon("://icons/32x32/SaveGIS.png"), tr("Export to GPX..."), this, SLOT(slotExportToGpx()));
menuItem = new QMenu(this);
@@ -132,8 +135,11 @@ CGisListDB::CGisListDB(QWidget *parent)
actionSearch = menuDatabase->addAction(QIcon("://icons/32x32/Zoom.png"), tr("Search Database"), this, SLOT(slotSearchDatabase()));
actionUpdate = menuDatabase->addAction(QIcon("://icons/32x32/DatabaseSync.png"), tr("Sync. with Database"), this, SLOT(slotUpdateDatabase()));
actionDelDatabase = menuDatabase->addAction(QIcon("://icons/32x32/DeleteOne.png"), tr("Remove Database"), this, SLOT(slotDelDatabase()));
+ menuDatabase->addSeparator();
+ menuDatabase->addAction(actionImport);
menuDatabase->addAction(actionExportToGpx);
+
menuLostFound = new QMenu(this);
actionDelLostFound = menuLostFound->addAction(QIcon("://icons/32x32/Empty.png"), tr("Empty"), this, SLOT(slotDelLostFound()));
@@ -330,6 +336,7 @@ void CGisListDB::slotContextMenu(const QPoint& point)
actionUpdate->setEnabled(true);
actionAddFolder->setEnabled(isSingleSelection);
actionExportToGpx->setEnabled(isSingleSelection);
+ actionImport->setEnabled(isSingleSelection);
IDBFolderSql * database = dynamic_cast<IDBFolderSql*>(currentItem());
if(database)
@@ -1030,3 +1037,46 @@ void CGisListDB::slotExportToGpx()
folder->exportToGpx();
}
+
+void CGisListDB::slotImport()
+{
+ CGisListDBEditLock lock(false, this, "slotImport");
+
+ IDBFolder * folder = dynamic_cast<IDBFolder*>(currentItem());
+ if(folder == nullptr)
+ {
+ return;
+ }
+
+ SETTINGS;
+ QString path = cfg.value("Paths/lastGisPath", QDir::homePath()).toString();
+ QString filter = cfg.value("Paths/lastGisFilter", IGisProject::filedialogAllSupported).toString();
+
+ QStringList filenames = QFileDialog::getOpenFileNames(this, tr("Import GIS Data..."), path, IGisProject::filedialogLoadFilters, &filter);
+
+ if(filenames.isEmpty())
+ {
+ return;
+ }
+
+ for(const QString& filename : filenames)
+ {
+ CDBProject * prjDb = new CDBProject(filename, folder, nullptr);
+ if(prjDb->isValid())
+ {
+ prjDb->save();
+ }
+
+ delete prjDb;
+ }
+
+ IDBFolderSql * dbfolder = folder->getDBFolder();
+ if(dbfolder)
+ {
+ dbfolder->announceChange();
+ }
+
+ path = QFileInfo(filenames.first()).absolutePath();
+ cfg.setValue("Paths/lastGisPath", path);
+ cfg.setValue("Paths/lastGisFilter", filter);
+}
diff --git a/src/gis/CGisListDB.h b/src/gis/CGisListDB.h
index b1cfa67..9d7c9db 100644
--- a/src/gis/CGisListDB.h
+++ b/src/gis/CGisListDB.h
@@ -67,6 +67,7 @@ private slots:
void slotMoveFolder();
void slotReadyRead();
void slotExportToGpx();
+ void slotImport();
private:
friend class CGisListDBEditLock;
@@ -86,6 +87,7 @@ private:
QAction * actionMoveFolder;
QAction * actionDelFolder;
QAction * actionExportToGpx;
+ QAction * actionImport;
QMenu * menuDatabase;
QAction * actionDelDatabase;
diff --git a/src/gis/CGisListWks.cpp b/src/gis/CGisListWks.cpp
index d23ae8b..06c8ab5 100644
--- a/src/gis/CGisListWks.cpp
+++ b/src/gis/CGisListWks.cpp
@@ -45,12 +45,14 @@
#include "gis/rte/CGisItemRte.h"
#include "gis/search/CSearchGoogle.h"
#include "gis/slf/CSlfProject.h"
+#include "gis/tcx/CTcxProject.h"
#include "gis/trk/CGisItemTrk.h"
#include "gis/wpt/CGisItemWpt.h"
#include "helpers/CProgressDialog.h"
#include "helpers/CSelectCopyAction.h"
#include "helpers/CSelectProjectDialog.h"
#include "helpers/CSettings.h"
+#include "helpers/CWptIconDialog.h"
#include "setup/IAppSetup.h"
#include <QApplication>
@@ -191,6 +193,7 @@ CGisListWks::CGisListWks(QWidget *parent)
menuItem = new QMenu(this);
menuItem->addAction(actionCopyItem);
actionRteFromWpt = menuItem->addAction(QIcon("://icons/32x32/Route.png"), tr("Create Route"), this, SLOT(slotRteFromWpt()));
+ actionSymWpt = menuItem->addAction(QIcon("://icons/waypoints/32x32/PinBlue.png"), tr("Change Icon (sel. waypt. only)"), this, SLOT(slotSymWpt()));
menuItem->addAction(actionCombineTrk);
menuItem->addAction(actionDelete);
@@ -208,18 +211,20 @@ CGisListWks::CGisListWks(QWidget *parent)
QTimer::singleShot(saveEvery * 60000, this, SLOT(slotSaveWorkspace()));
}
-#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
- deviceWatcher = new CDeviceWatcherLinux(this);
- connect(deviceWatcher, &CDeviceWatcherLinux::sigChanged, this, &CGisListWks::sigChanged);
-#endif
#ifdef Q_OS_MAC
deviceWatcher = new CDeviceWatcherMac(this);
connect(deviceWatcher, &CDeviceWatcherMac::sigChanged, this, &CGisListWks::sigChanged);
-#endif
-#ifdef Q_OS_WIN
+#else
+ #ifdef Q_OS_WIN
deviceWatcher = new CDeviceWatcherWindows(this);
connect(deviceWatcher, &CDeviceWatcherWindows::sigChanged, this, &CGisListWks::sigChanged);
-#endif
+ #else
+ #ifdef HAVE_DBUS
+ deviceWatcher = new CDeviceWatcherLinux(this);
+ connect(deviceWatcher, &CDeviceWatcherLinux::sigChanged, this, &CGisListWks::sigChanged);
+ #endif // HAVE_DBUS
+ #endif // Q_OS_WIN
+#endif // Q_OS_MAC
}
CGisListWks::~CGisListWks()
@@ -892,6 +897,14 @@ void CGisListWks::slotLoadWorkspace()
*project << stream;
break;
}
+
+ case IGisProject::eTypeTcx:
+ {
+ project = new CTcxProject(name, this);
+ project->setCheckState(CGisListDB::eColumnCheckbox, visible);
+ *project << stream;
+ break;
+ }
}
if(nullptr != project)
@@ -975,6 +988,7 @@ void CGisListWks::slotContextMenu(const QPoint& point)
IGisItem *gisItem = dynamic_cast<IGisItem*>(currentItem());
if(nullptr != gisItem)
{
+ bool hasWpts = false;
bool onlyWpts = true;
bool onlyTrks = true;
for(QTreeWidgetItem *item : selectedItems())
@@ -983,6 +997,10 @@ void CGisListWks::slotContextMenu(const QPoint& point)
{
onlyWpts = false;
}
+ else
+ {
+ hasWpts = true;
+ }
if(item->type() != IGisItem::eTypeTrk)
{
@@ -997,6 +1015,7 @@ void CGisListWks::slotContextMenu(const QPoint& point)
actionRteFromWpt->setEnabled(onlyWpts);
actionCombineTrk->setEnabled(onlyTrks);
+ actionSymWpt->setEnabled(hasWpts);
menuItem->exec(p);
return;
@@ -1820,7 +1839,15 @@ bool CGisListWks::event(QEvent * e)
{
project->blockUpdateItems(false);
}
+ e->accept();
+ return true;
+ }
+ case eEvtA2WCutTrk:
+ {
+ CEvtA2WCutTrk * evt = (CEvtA2WCutTrk*)e;
+ CGisWidget::self().cutTrkByKey(evt->key);
+ e->accept();
return true;
}
}
@@ -1909,3 +1936,29 @@ void CGisListWks::slotCopyProject()
CGisWidget::self().copyItemsByKey(keys);
}
+
+
+void CGisListWks::slotSymWpt()
+{
+ CGisListWksEditLock lock(false, IGisItem::mutexItems);
+ QToolButton tb;
+ CWptIconDialog dlg(&tb);
+ if(dlg.exec() == QDialog::Rejected)
+ {
+ return;
+ }
+
+ QList<IGisItem::key_t> keys;
+ for(QTreeWidgetItem * item : selectedItems())
+ {
+ CGisItemWpt * wpt = dynamic_cast<CGisItemWpt*>(item);
+ if(wpt == nullptr)
+ {
+ continue;
+ }
+
+ keys << wpt->getKey();
+ }
+
+ CGisWidget::self().changeWptSymByKey(keys, tb.objectName());
+}
diff --git a/src/gis/CGisListWks.h b/src/gis/CGisListWks.h
index 87b47a5..d8d99cc 100644
--- a/src/gis/CGisListWks.h
+++ b/src/gis/CGisListWks.h
@@ -110,6 +110,7 @@ private slots:
void slotSyncDB();
void slotSetSortMode(IGisProject::sorting_folder_e mode, bool checked);
void slotCopyProject();
+ void slotSymWpt();
private:
@@ -171,6 +172,7 @@ private:
QAction * actionRte2Trk;
QAction * actionEditArea;
QAction * actionRteFromWpt;
+ QAction * actionSymWpt;
QMenu * menuNone = nullptr;
diff --git a/src/gis/CGisWidget.cpp b/src/gis/CGisWidget.cpp
index 096ce4f..25b12dc 100644
--- a/src/gis/CGisWidget.cpp
+++ b/src/gis/CGisWidget.cpp
@@ -24,14 +24,12 @@
#include "gis/db/CDBProject.h"
#include "gis/db/CSelectDBFolder.h"
#include "gis/db/CSetupFolder.h"
-#include "gis/fit/CFitProject.h"
#include "gis/gpx/CGpxProject.h"
#include "gis/ovl/CGisItemOvlArea.h"
#include "gis/prj/IGisProject.h"
#include "gis/qms/CQmsProject.h"
#include "gis/rte/CCreateRouteFromWpt.h"
#include "gis/rte/CGisItemRte.h"
-#include "gis/slf/CSlfProject.h"
#include "gis/trk/CCombineTrk.h"
#include "gis/trk/CGisItemTrk.h"
#include "gis/wpt/CGisItemWpt.h"
@@ -85,6 +83,7 @@ void CGisWidget::setOpacity(qreal val)
{
sliderOpacity->setValue(val * 100);
}
+
void CGisWidget::postEventForWks(QEvent * event)
{
QCoreApplication::postEvent(treeWks, event);
@@ -103,36 +102,8 @@ void CGisWidget::loadGisProject(const QString& filename)
treeWks->blockSignals(true);
QMutexLocker lock(&IGisItem::mutexItems);
- IGisProject *item = nullptr;
- QString suffix = QFileInfo(filename).suffix().toLower();
- if(suffix == "gpx")
- {
- item = new CGpxProject(filename, treeWks);
- }
- else if(suffix == "qms")
- {
- item = new CQmsProject(filename, treeWks);
- }
- else if(suffix == "slf")
- {
- item = new CSlfProject(filename);
-
- // the CSlfProject does not - as the other C*Project - register itself in the list
- // of currently opened projects. This is done manually here.
- treeWks->addProject(item);
- }
- else if(suffix == "fit")
- {
- item = new CFitProject(filename, treeWks);
- }
-
-
- if(item && !item->isValid())
- {
- delete item;
- item = nullptr;
- }
+ IGisProject * item = IGisProject::create(filename, treeWks);
// skip if project is already loaded
if(item && treeWks->hasProject(item))
{
@@ -560,6 +531,23 @@ void CGisWidget::copyItemsByKey(const QList<IGisItem::key_t> &keys)
}
}
+void CGisWidget::changeWptSymByKey(const QList<IGisItem::key_t>& keys, const QString& sym)
+{
+ QMutexLocker lock(&IGisItem::mutexItems);
+
+ for(const IGisItem::key_t& key : keys)
+ {
+ CGisItemWpt *wpt = dynamic_cast<CGisItemWpt*>(getItemByKey(key));
+ if(nullptr != wpt)
+ {
+ wpt->setIcon(sym);
+ }
+ }
+
+ emit sigChanged();
+}
+
+
void CGisWidget::projWptByKey(const IGisItem::key_t& key)
{
QMutexLocker lock(&IGisItem::mutexItems);
@@ -604,9 +592,9 @@ void CGisWidget::toggleWptBubble(const IGisItem::key_t &key)
}
}
-void CGisWidget::addWptByPos(QPointF pt) const
+void CGisWidget::addWptByPos(QPointF pt, const QString& label, const QString& desc) const
{
- QString name;
+ QString name = label;
QString icon;
if(!CGisItemWpt::getNewWptData(pt, icon, name))
{
@@ -621,6 +609,10 @@ void CGisWidget::addWptByPos(QPointF pt) const
QMutexLocker lock(&IGisItem::mutexItems);
CGisItemWpt * wpt = new CGisItemWpt(pt, name, icon, project);
+ if(!desc.isEmpty())
+ {
+ wpt->setDescription(desc);
+ }
wpt->edit();
}
@@ -873,6 +865,7 @@ void CGisWidget::makeRteFromWpt(const QList<IGisItem::key_t>& keys)
dlg.exec();
}
+
void CGisWidget::draw(QPainter& p, const QPolygonF& viewport, CGisDraw * gis)
{
QFontMetricsF fm(CMainWindow::self().getMapFont());
@@ -953,3 +946,5 @@ void CGisWidget::fastDraw(QPainter& p, const QRectF& viewport, CGisDraw *gis)
}
}
}
+
+
diff --git a/src/gis/CGisWidget.h b/src/gis/CGisWidget.h
index 8435945..1c5b6f1 100644
--- a/src/gis/CGisWidget.h
+++ b/src/gis/CGisWidget.h
@@ -43,6 +43,8 @@ enum event_types_e
,eEvtW2DAckInfo = QEvent::User + 100
,eEvtW2DCreate = QEvent::User + 101
+
+ ,eEvtA2WCutTrk = QEvent::User + 200
};
struct evt_item_t
@@ -195,6 +197,17 @@ public:
};
+class CEvtA2WCutTrk : public QEvent
+{
+public:
+ CEvtA2WCutTrk(const IGisItem::key_t& key) : QEvent(QEvent::Type(eEvtA2WCutTrk)), key(key)
+ {
+ }
+
+ const IGisItem::key_t key;
+};
+
+
class CGisWidget : public QWidget, private Ui::IGisWidget
{
Q_OBJECT
@@ -308,7 +321,7 @@ public:
@brief Add a new waypoint by Position
@param pt the position in [�]
*/
- void addWptByPos(QPointF pt) const;
+ void addWptByPos(QPointF pt, const QString& label = QString::Null(), const QString& desc = QString::Null()) const;
void toggleWptBubble(const IGisItem::key_t &key);
@@ -361,6 +374,7 @@ public:
void makeRteFromWpt(const QList<IGisItem::key_t>& keys);
+ void changeWptSymByKey(const QList<IGisItem::key_t>& keys, const QString& sym);
/**
@brief Select a project via dialog
diff --git a/src/gis/IGisWidget.ui b/src/gis/IGisWidget.ui
index f36d145..79bcf76 100644
--- a/src/gis/IGisWidget.ui
+++ b/src/gis/IGisWidget.ui
@@ -31,6 +31,18 @@
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>3</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>3</number>
+ </property>
<item>
<widget class="QLabel" name="label_3">
<property name="text">
diff --git a/templates/header.h b/src/gis/Poi.h
similarity index 79%
copy from templates/header.h
copy to src/gis/Poi.h
index 0679fac..b24ffe7 100644
--- a/templates/header.h
+++ b/src/gis/Poi.h
@@ -1,5 +1,5 @@
/**********************************************************************************************
- Copyright (C) 2016 Oliver Eichler oliver.eichler at gmx.de
+ Copyright (C) 2017 Oliver Eichler oliver.eichler at gmx.de
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,15 +16,18 @@
**********************************************************************************************/
-#ifndef CLASSNAME_H
-#define CLASSNAME_H
+#ifndef POI_H
+#define POI_H
-class CLASSNAME
+#include "units/IUnit.h"
+
+struct poi_t
{
- public:
- CLASSNAME();
- virtual ~CLASSNAME() = default;
+ poi_t() : pos(NOPOINTF){}
+ QString name;
+ QString desc;
+ QPointF pos;
};
-#endif //CLASSNAME_H
+#endif //POI_H
diff --git a/src/gis/WptIcons.cpp b/src/gis/WptIcons.cpp
index 8ea269e..ac9d577 100644
--- a/src/gis/WptIcons.cpp
+++ b/src/gis/WptIcons.cpp
@@ -55,7 +55,22 @@ void initWptIcons()
wptIcons["Parking Area"] = icon_t("://icons/cache/32x32/parking.png", 16, 16);
wptIcons["Trailhead"] = icon_t("://icons/cache/32x32/trailhead.png", 16, 16);
wptIcons["Waypoint"] = icon_t("://icons/waypoints/32x32/Waypoint.png", 16, 16);
-
+ wptIcons["1stCategory"] = icon_t("://icons/waypoints/32x32/1stCategory.png", 16, 16);
+ wptIcons["2ndCategory"] = icon_t("://icons/waypoints/32x32/2ndCategory.png", 16, 16);
+ wptIcons["3rdCategory"] = icon_t("://icons/waypoints/32x32/3rdCategory.png", 16, 16);
+ wptIcons["4thCategory"] = icon_t("://icons/waypoints/32x32/4thCategory.png", 16, 16);
+ wptIcons["Danger"] = icon_t("://icons/waypoints/32x32/Danger.png", 16, 16);
+ wptIcons["FirstAid"] = icon_t("://icons/waypoints/32x32/FirstAid.png", 16, 16);
+ wptIcons["Food"] = icon_t("://icons/waypoints/32x32/Food.png", 16, 16);
+ wptIcons["Generic"] = icon_t("://icons/waypoints/32x32/Generic.png", 16, 16);
+ wptIcons["HorsCategory"] = icon_t("://icons/waypoints/32x32/HorsCategory.png", 16, 16);
+ wptIcons["Left"] = icon_t("://icons/waypoints/32x32/Left.png", 16, 16);
+ wptIcons["Right"] = icon_t("://icons/waypoints/32x32/Right.png", 16, 16);
+ wptIcons["Sprint"] = icon_t("://icons/waypoints/32x32/Sprint.png", 16, 16);
+ wptIcons["Straight"] = icon_t("://icons/waypoints/32x32/Straight.png", 16, 16);
+ wptIcons["Summit"] = icon_t("://icons/waypoints/32x32/Summit.png", 16, 16);
+ wptIcons["Valley"] = icon_t("://icons/waypoints/32x32/Valley.png", 16, 16);
+ wptIcons["Water"] = icon_t("://icons/waypoints/32x32/Water.png", 16, 16);
setWptIconByName("Traditional Cache", "://icons/cache/32x32/traditional.png");
setWptIconByName("Multi-cache", "://icons/cache/32x32/multi.png");
diff --git a/src/gis/db/CDBProject.cpp b/src/gis/db/CDBProject.cpp
index 870771e..323487d 100644
--- a/src/gis/db/CDBProject.cpp
+++ b/src/gis/db/CDBProject.cpp
@@ -102,6 +102,61 @@ CDBProject::CDBProject(const QString& dbName, quint64 id, CGisListWks *parent)
valid = true;
}
+CDBProject::CDBProject(const QString& filename, IDBFolder * parentFolder, CGisListWks *parent)
+ : IGisProject(eTypeDb, parentFolder->getDBName(), parent)
+ , db(parentFolder->getDb())
+{
+ IGisProject * prjIn = IGisProject::create(filename, nullptr);
+ if(prjIn == nullptr)
+ {
+ QMessageBox::information(CMainWindow::self().getBestWidgetForParent(), tr("Failed to load..."),
+ tr("Can't load file \"%1\" . It will be skipped.").arg(QFileInfo(filename).completeBaseName()),
+ QMessageBox::Ok);
+ return;
+ }
+
+
+ // test if the project has been imported already
+ QSqlQuery query(db);
+ query.prepare("SELECT id FROM folders WHERE keyqms=:keyqms");
+ query.bindValue(":keyqms", prjIn->getKey());
+ QUERY_EXEC(return );
+ if(query.next())
+ {
+ QMessageBox::information(CMainWindow::self().getBestWidgetForParent(), tr("Project already in database..."),
+ tr("The project \"%1\" has already been imported into the database. It will be skipped.").arg(prjIn->getName()),
+ QMessageBox::Ok);
+ return;
+ }
+
+ // create a new folder in the database
+ id = parentFolder->addFolder(IDBFolder::eTypeProject, prjIn->getName());
+ query.prepare("UPDATE folders SET keyqms=:keyqms WHERE id=:id");
+ query.bindValue(":keyqms", prjIn->getKey());
+ query.bindValue(":id", id);
+ QUERY_EXEC(return );
+
+
+ // copy data
+ key = prjIn->getKey();
+ metadata = prjIn->getMetadata();
+
+ QList<QTreeWidgetItem*> items = prjIn->takeChildren();
+ addChildren(items);
+
+ // set change indication else the item will not be saved
+ for(QTreeWidgetItem * item : items)
+ {
+ IGisItem * gisItem = dynamic_cast<IGisItem*>(item);
+ if(gisItem)
+ {
+ gisItem->updateDecoration(IGisItem::eMarkChanged, IGisItem::eMarkNone);
+ }
+ }
+
+ valid = true;
+}
+
CDBProject::~CDBProject()
{
CEvtW2DAckInfo * info = new CEvtW2DAckInfo(Qt::Unchecked, getId(), getDBName(), getDBHost());
diff --git a/src/gis/db/CDBProject.h b/src/gis/db/CDBProject.h
index 6e8703c..2e747bd 100644
--- a/src/gis/db/CDBProject.h
+++ b/src/gis/db/CDBProject.h
@@ -25,6 +25,7 @@
class CEvtD2WShowItems;
class CEvtD2WHideItems;
class CQlgtFolder;
+class IDBFolder;
class CDBProject : public IGisProject
{
@@ -32,6 +33,7 @@ class CDBProject : public IGisProject
public:
CDBProject(CGisListWks * parent);
CDBProject(const QString &dbName, quint64 id, CGisListWks * parent);
+ CDBProject(const QString &filename, IDBFolder *parentFolder, CGisListWks *parent);
CDBProject(CQlgtFolder& folder);
virtual ~CDBProject();
diff --git a/src/gis/ovl/IDetailsOvlArea.ui b/src/gis/ovl/IDetailsOvlArea.ui
index 3a546a8..bdfae7d 100644
--- a/src/gis/ovl/IDetailsOvlArea.ui
+++ b/src/gis/ovl/IDetailsOvlArea.ui
@@ -129,7 +129,7 @@
</size>
</property>
<property name="toolTip">
- <string><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></string>
+ <string>The area was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </string>
</property>
<property name="text">
<string/>
diff --git a/src/gis/prj/IGisProject.cpp b/src/gis/prj/IGisProject.cpp
index 626bdac..7351a92 100644
--- a/src/gis/prj/IGisProject.cpp
+++ b/src/gis/prj/IGisProject.cpp
@@ -28,6 +28,9 @@
#include "gis/prj/IGisProject.h"
#include "gis/qms/CQmsProject.h"
#include "gis/rte/CGisItemRte.h"
+#include "gis/slf/CSlfProject.h"
+#include "gis/tcx/CTcxProject.h"
+#include "gis/tcx/CTcxProject.h"
#include "gis/trk/CGisItemTrk.h"
#include "gis/wpt/CGisItemWpt.h"
#include "helpers/CProgressDialog.h"
@@ -37,13 +40,14 @@
#include <QtWidgets>
-const QString IGisProject::filedialogAllSupported = "All Supported (*.gpx *.GPX *.qms *.slf *.fit)";
+const QString IGisProject::filedialogAllSupported = "All Supported (*.gpx *.GPX *.tcx *.TCX *.qms *.slf *.fit)";
const QString IGisProject::filedialogFilterGPX = "GPS Exchange Format (*.gpx *.GPX)";
+const QString IGisProject::filedialogFilterTCX = "TCX Garmin Proprietary (*.tcx *.TCX)";
const QString IGisProject::filedialogFilterQMS = "QMapShack Binary (*.qms)";
const QString IGisProject::filedialogFilterSLF = "Sigma Log Format (*.slf)";
const QString IGisProject::filedialogFilterFIT = "Garmin FIT Format (*.fit)";
-const QString IGisProject::filedialogSaveFilters = filedialogFilterGPX + ";; " + filedialogFilterQMS;
-const QString IGisProject::filedialogLoadFilters = filedialogAllSupported +";; " + filedialogFilterGPX + ";; " + filedialogFilterQMS + ";; " + filedialogFilterSLF + ";;" + filedialogFilterFIT;
+const QString IGisProject::filedialogSaveFilters = filedialogFilterGPX + ";; " + filedialogFilterQMS + ";; " + filedialogFilterTCX;
+const QString IGisProject::filedialogLoadFilters = filedialogAllSupported + ";; " + filedialogFilterGPX + ";; " + filedialogFilterTCX + ";; " + filedialogFilterQMS + ";; " + filedialogFilterSLF + ";;" + filedialogFilterFIT;
@@ -94,6 +98,48 @@ IGisProject::~IGisProject()
delete dlgDetails;
}
+IGisProject * IGisProject::create(const QString filename, CGisListWks * parent)
+{
+ IGisProject *item = nullptr;
+ QString suffix = QFileInfo(filename).suffix().toLower();
+ if(suffix == "gpx")
+ {
+ item = new CGpxProject(filename, parent);
+ }
+ else if(suffix == "qms")
+ {
+ item = new CQmsProject(filename, parent);
+ }
+ else if(suffix == "slf")
+ {
+ item = new CSlfProject(filename);
+
+ // the CSlfProject does not - as the other C*Project - register itself in the list
+ // of currently opened projects. This is done manually here.
+ if(parent)
+ {
+ parent->addProject(item);
+ }
+ }
+ else if(suffix == "fit")
+ {
+ item = new CFitProject(filename, parent);
+ }
+ else if(suffix == "tcx")
+ {
+ item = new CTcxProject(filename, parent);
+ }
+
+
+ if(item && !item->isValid())
+ {
+ delete item;
+ item = nullptr;
+ }
+
+ return item;
+}
+
QString IGisProject::html2Dev(const QString& str)
{
return isOnDevice() == IDevice::eTypeGarmin ? IGisItem::removeHtml(str) : str;
@@ -359,6 +405,10 @@ bool IGisProject::saveAs(QString fn, QString filter)
{
res = CQmsProject::saveAs(fn, *this);
}
+ else if (filter == filedialogFilterTCX)
+ {
+ res = CTcxProject::saveAs(fn, *this);
+ }
else
{
return false;
diff --git a/src/gis/prj/IGisProject.h b/src/gis/prj/IGisProject.h
index 30429a0..e601c7e 100644
--- a/src/gis/prj/IGisProject.h
+++ b/src/gis/prj/IGisProject.h
@@ -45,6 +45,7 @@ public:
, eTypeTwoNav
, eTypeSlf // the Sigma Log Format
, eTypeFit
+ , eTypeTcx
};
enum sorting_roadbook_e
@@ -95,6 +96,7 @@ public:
static const QString filedialogAllSupported;
static const QString filedialogFilterGPX;
+ static const QString filedialogFilterTCX;
static const QString filedialogFilterQMS;
static const QString filedialogFilterSLF;
static const QString filedialogFilterFIT;
@@ -105,6 +107,8 @@ public:
IGisProject(type_e type, const QString &filename, IDevice *parent);
virtual ~IGisProject();
+ static IGisProject * create(const QString filename, CGisListWks * parent);
+
/**
@brief Ask to save the project before it is closed.
@@ -230,6 +234,11 @@ public:
return metadata.links;
}
+ const metadata_t& getMetadata() const
+ {
+ return metadata;
+ }
+
/**
@brief Get the sorting mode
@return One of sorting_e
diff --git a/src/gis/rte/CGisItemRte.cpp b/src/gis/rte/CGisItemRte.cpp
index e98f98b..3921752 100644
--- a/src/gis/rte/CGisItemRte.cpp
+++ b/src/gis/rte/CGisItemRte.cpp
@@ -1,5 +1,6 @@
/**********************************************************************************************
Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+ Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -1051,4 +1052,163 @@ void CGisItemRte::setResult(const QDomDocument& xml, const QString &options)
updateHistory();
}
+void CGisItemRte::setResultFromBRouter(const QDomDocument &xml, const QString &options)
+{
+ QMutexLocker lock(&mutexItems);
+
+ QVector<subpt_t> shape;
+
+ const QDomElement &gpx = xml.documentElement();
+ // read the shape
+ const QDomElement &xmlShape = gpx.firstChildElement("trk");
+ const QDomElement &xmlShapePoints = xmlShape.firstChildElement("trkseg");
+ const QDomNodeList &xmlLatLng = xmlShapePoints.elementsByTagName("trkpt");
+ const qint32 N = xmlLatLng.size();
+ for(int n = 0; n < N; n++)
+ {
+ const QDomElement &elem = xmlLatLng.item(n).toElement();
+ shape << subpt_t();
+ subpt_t& subpt = shape.last();
+ subpt.lon = elem.attribute("lon").toFloat();
+ subpt.lat = elem.attribute("lat").toFloat();
+ subpt.ele = elem.firstChildElement("ele").text().toFloat();
+ }
+
+ // build list of maneuvers
+ const QDomElement &xmlLeg = gpx.firstChildElement("rte");
+ if (!xmlLeg.isNull())
+ {
+ const QDomNodeList &xmlManeuvers = xmlLeg.elementsByTagName("rtept");
+ const qint32 M = xmlManeuvers.size();
+ for(int m = 0; m < M; m++)
+ {
+ const QDomNode &xmlManeuver = xmlManeuvers.item(m);
+ /* <rtept lat="48.322380" lon="11.601220">
+ <desc>right</desc>
+ <extensions>
+ <turn>TR</turn>
+ <turn-angle>45.655945</turn-angle>
+ <offset>76</offset>
+ </extensions>
+ </rtept> */
+ quint32 idx = xmlManeuver.firstChildElement("extensions").firstChildElement("offset").text().toUInt();
+ subpt_t& subpt = shape[idx];
+ subpt.type = subpt_t::eTypeJunct;
+ subpt.instruction = xmlManeuver.firstChildElement("desc").text();
+ const QString &command = xmlManeuver.firstChildElement("extensions").firstChildElement("turn").text(); // command
+ if(command=="TU") // u-turn
+ {
+ subpt.bearing = 180;
+ }
+ else if(command=="TSHL") // turn sharp left
+ {
+ subpt.bearing = -135;
+ }
+ else if(command=="TL") // turn left
+ {
+ subpt.bearing = -90;
+ }
+ else if(command=="TSLL") // turn slight left
+ {
+ subpt.bearing = -45;
+ }
+ else if(command=="KL") // keep left
+ {
+ subpt.bearing = 0;
+ }
+ else if(command=="C") // straight
+ {
+ subpt.bearing = 0;
+ }
+ else if(command=="KR") // keep right
+ {
+ subpt.bearing = 0;
+ }
+ else if(command=="TSLR") // turn slight right
+ {
+ subpt.bearing = 45;
+ }
+ else if(command=="TR") // turn right
+ {
+ subpt.bearing = 90;
+ }
+ else if(command=="TSHR") // turn sharp right
+ {
+ subpt.bearing = 135;
+ }
+ else if(command=="TRU") // u-turn
+ {
+ subpt.bearing = 180;
+ }
+ else if(command.startsWith("RNDB")) // take roundabout exit nr
+ {
+ subpt.bearing = 0;
+ }
+ else if(command.startsWith("RNLB")) // take roundabout exit nr. (to the left)
+ {
+ subpt.bearing = 0;
+ }
+
+ subpt.turn = xmlManeuver.firstChildElement("extensions").firstChildElement("turn-angle").text().toUInt(); // turn angle (degree)
+ }
+ }
+
+ // match routepoints to shape
+ qint32 startIdx = 0;
+ qint32 minDistIdx = 0;
+
+ for(qint32 rtIdx = 0; rtIdx < rte.pts.size() - 1; rtIdx++)
+ {
+ rtept_t &routePoint = rte.pts[rtIdx];
+ const rtept_t &nextRoutePoint = rte.pts[rtIdx+1];
+
+ qreal minDist = std::pow(nextRoutePoint.lon - shape[minDistIdx].lon, 2) + std::pow(nextRoutePoint.lat - shape[minDistIdx].lat, 2);
+ for (qint32 idx = startIdx+1; idx < shape.size(); idx++)
+ {
+ qreal dist = std::pow(nextRoutePoint.lon - shape[idx].lon, 2) + std::pow(nextRoutePoint.lat - shape[idx].lat, 2);
+ if (dist < minDist)
+ {
+ minDist = dist;
+ minDistIdx = idx;
+ }
+ }
+ routePoint.ele = shape[startIdx].ele;
+ routePoint.subpts = shape.mid(startIdx,minDistIdx-startIdx);
+ routePoint.fakeSubpt.lon = routePoint.lon;
+ routePoint.fakeSubpt.lat = routePoint.lat;
+ routePoint.fakeSubpt.ele = routePoint.ele;
+ startIdx = minDistIdx;
+ }
+
+ rtept_t &rtept = rte.pts.last();
+ rtept.ele = shape[minDistIdx].ele;
+ rtept.fakeSubpt.lon = rtept.lon;
+ rtept.fakeSubpt.lat = rtept.lat;
+ rtept.fakeSubpt.ele = rtept.ele;
+
+ rte.lastRoutedTime = QDateTime::currentDateTimeUtc();
+ rte.lastRoutedWith = QString("BRouter %1").arg(options);
+
+// <!-- track-length = 9624 filtered ascend = 59 plain-ascend = -8 cost=19415 -->
+ const QDomNodeList &nodes = xml.childNodes();
+ for (int i = 0; i < nodes.count(); i++)
+ {
+ const QDomNode &node = nodes.at(i);
+ if (node.isComment())
+ {
+ const QString &commentTxt = node.toComment().data();
+ // ' track-length = 180864 filtered ascend = 428 plain-ascend = -172 cost=270249 '
+ const QRegExp rxAscDes("(\\s*track-length\\s*=\\s*)(-?\\d+)(\\s*)(filtered ascend\\s*=\\s*-?\\d+)(\\s*)(plain-ascend\\s*=\\s*-?\\d+)(\\s*)(cost\\s*=\\s*-?\\d+)(\\s*)");
+ int pos = rxAscDes.indexIn(commentTxt);
+ if (pos > -1)
+ {
+ rte.totalDistance = rxAscDes.cap(2).toFloat();
+ rte.cmt = QString("%1, %2, %3").arg(rxAscDes.cap(4)).arg(rxAscDes.cap(6)).arg(rxAscDes.cap(8));
+ }
+ break;
+ }
+ }
+ deriveSecondaryData();
+ updateHistory();
+}
diff --git a/src/gis/rte/CGisItemRte.h b/src/gis/rte/CGisItemRte.h
index c278e7b..e6eda9a 100644
--- a/src/gis/rte/CGisItemRte.h
+++ b/src/gis/rte/CGisItemRte.h
@@ -1,5 +1,6 @@
/**********************************************************************************************
Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+ Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -212,6 +213,7 @@ public:
void setResult(Routino_Output * route, const QString &options);
void setResult(const QDomDocument& xml, const QString &options);
+ void setResultFromBRouter(const QDomDocument& xml, const QString &options);
bool isCalculated();
diff --git a/src/gis/rte/IDetailsRte.ui b/src/gis/rte/IDetailsRte.ui
index 86821ce..03dec6c 100644
--- a/src/gis/rte/IDetailsRte.ui
+++ b/src/gis/rte/IDetailsRte.ui
@@ -151,7 +151,7 @@
</size>
</property>
<property name="toolTip">
- <string><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></string>
+ <string>The route was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </string>
</property>
<property name="text">
<string/>
diff --git a/src/gis/rte/router/CRouterBRouter.cpp b/src/gis/rte/router/CRouterBRouter.cpp
new file mode 100644
index 0000000..1fad1f2
--- /dev/null
+++ b/src/gis/rte/router/CRouterBRouter.cpp
@@ -0,0 +1,597 @@
+/**********************************************************************************************
+ Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+ Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#include "CMainWindow.h"
+#include "canvas/CCanvas.h"
+#include "gis/CGisWidget.h"
+#include "gis/rte/CGisItemRte.h"
+#include "gis/rte/router/CRouterBRouter.h"
+#include "gis/rte/router/brouter/CRouterBRouterInfo.h"
+#include "gis/rte/router/brouter/CRouterBRouterSetup.h"
+#include "gis/rte/router/brouter/CRouterBRouterSetupWizard.h"
+#include "gis/rte/router/brouter/CRouterBRouterToolShell.h"
+#include "helpers/CProgressDialog.h"
+#include "helpers/CSettings.h"
+#include <QtNetwork>
+#include <QtWidgets>
+
+CRouterBRouter::CRouterBRouter(QWidget *parent)
+ : IRouter(false, parent)
+{
+ setupUi(this);
+
+ labelBRouterWarning->hide();
+
+ setup = new CRouterBRouterSetup(this);
+ setup->load();
+
+ connect(toolSetup, &QToolButton::clicked, this, &CRouterBRouter::slotToolSetupClicked);
+ connect(toolProfileInfo, &QToolButton::clicked, this, &CRouterBRouter::slotToolProfileInfoClicked);
+ connect(setup, &CRouterBRouterSetup::sigDisplayOnlineProfileFinished, this, &CRouterBRouter::slotDisplayProfileInfo);
+ connect(setup, &CRouterBRouterSetup::sigError, this, &CRouterBRouter::slotDisplayError);
+
+ comboAlternative->addItem(tr("original"), "0");
+ comboAlternative->addItem(tr("first alternative"), "1");
+ comboAlternative->addItem(tr("second alternative"), "2");
+ comboAlternative->addItem(tr("third alternative"), "3");
+
+ networkAccessManager = new QNetworkAccessManager(this);
+ connect(networkAccessManager, &QNetworkAccessManager::finished, this, &CRouterBRouter::slotRequestFinished);
+
+ timerCloseStatusMsg = new QTimer(this);
+ timerCloseStatusMsg->setSingleShot(true);
+ timerCloseStatusMsg->setInterval(5000);
+ connect(timerCloseStatusMsg, &QTimer::timeout, this, &CRouterBRouter::slotCloseStatusMsg);
+
+ routerSetup = dynamic_cast<CRouterSetup*>(parent);
+
+ connect(toolConsole, &QToolButton::clicked, this, &CRouterBRouter::slotToggleConsole);
+ connect(toolToggleBRouter, &QToolButton::clicked, this, &CRouterBRouter::slotToggleBRouter);
+
+ textBRouterOutput->setVisible(false);
+ textBRouterError->setVisible(false);
+
+ //set textBRouterOutput as parent of ToolShell to ensure Toolshell is destroyed before text
+ brouterShell = new CRouterBRouterToolShell(textBRouterOutput,textBRouterOutput);
+ connect(brouterShell, &CRouterBRouterToolShell::sigProcessStateChanged, this, &CRouterBRouter::slotBRouterStateChanged);
+ connect(brouterShell, &CRouterBRouterToolShell::sigProcessError, this, &CRouterBRouter::slotBRouterError);
+
+ updateDialog();
+
+ SETTINGS;
+
+ cfg.beginGroup("Route/brouter");
+ comboProfile->setCurrentIndex(cfg.value("profile", 0).toInt());
+ checkFastRecalc->setChecked(cfg.value("fastRecalc", false).toBool() && (setup->installMode == CRouterBRouterSetup::eModeLocal));
+ comboAlternative->setCurrentIndex(cfg.value("alternative", 0).toInt());
+ cfg.endGroup();
+}
+
+CRouterBRouter::~CRouterBRouter()
+{
+ isShutdown = true;
+ if (brouterState != QProcess::NotRunning)
+ {
+ stopBRouter();
+ }
+ SETTINGS;
+ cfg.beginGroup("Route/brouter");
+ cfg.setValue("profile", comboProfile->currentIndex());
+ cfg.setValue("alternative", comboAlternative->currentIndex());
+ cfg.setValue("fastRecalc", checkFastRecalc->isChecked());
+ cfg.endGroup();
+}
+
+void CRouterBRouter::slotToolSetupClicked()
+{
+ stopBRouter();
+ CRouterBRouterSetupWizard setupWizard;
+ setupWizard.exec();
+ clearError();
+ setup->load();
+ updateDialog();
+}
+
+void CRouterBRouter::slotToolProfileInfoClicked() const
+{
+ const int index = comboProfile->currentIndex();
+ if (index > -1)
+ {
+ setup->displayProfileAsync(setup->getProfiles().at(index));
+ }
+}
+
+void CRouterBRouter::slotDisplayError(const QString &error, const QString &details) const
+{
+ textBRouterError->setText(error + ": " + details);
+ textBRouterError->setVisible(true);
+ QTimer::singleShot(5000,this,&CRouterBRouter::clearError);
+}
+
+void CRouterBRouter::clearError()
+{
+ textBRouterError->clear();
+ textBRouterError->setVisible(false);
+ brouterError = QProcess::UnknownError;
+}
+
+void CRouterBRouter::slotDisplayProfileInfo(const QString &profile, const QString &content)
+{
+ clearError();
+ CRouterBRouterInfo info;
+ info.setLabel(profile);
+ info.setInfo(content);
+ info.exec();
+}
+
+void CRouterBRouter::updateDialog() const
+{
+ if (setup->installMode == CRouterBRouterSetup::eModeLocal)
+ {
+ routerSetup->setRouterTitle(CRouterSetup::RouterBRouter,tr("BRouter (offline)"));
+ }
+ else
+ {
+ Q_ASSERT(setup->installMode == CRouterBRouterSetup::eModeOnline);
+ routerSetup->setRouterTitle(CRouterSetup::RouterBRouter,tr("BRouter (online)"));
+ }
+ comboProfile->clear();
+ bool hasItems = false;
+ for(const QString& profile : setup->getProfiles())
+ {
+ comboProfile->addItem(profile,profile);
+ hasItems = true;
+ }
+ comboProfile->setEnabled(hasItems);
+ toolProfileInfo->setEnabled(hasItems);
+ comboAlternative->setEnabled(hasItems);
+ updateLocalBRouterStatus();
+}
+
+void CRouterBRouter::slotCloseStatusMsg() const
+{
+ timerCloseStatusMsg->stop();
+ CCanvas * canvas = CMainWindow::self().getVisibleCanvas();
+ if(canvas)
+ {
+ canvas->slotTriggerCompleteUpdate(CCanvas::eRedrawGis);
+ canvas->reportStatus("BRouter", "");
+ }
+}
+
+QString CRouterBRouter::getOptions()
+{
+ return QString(tr("profile: %1, alternative: %2")
+ .arg(comboProfile->currentData().toString())
+ .arg(comboAlternative->currentData().toInt()+1));
+}
+
+bool CRouterBRouter::hasFastRouting()
+{
+ return setup->installMode == CRouterBRouterSetup::eModeLocal && checkFastRecalc->isChecked();
+}
+
+QNetworkRequest CRouterBRouter::getRequest(const QVector<wpt_t>& routePoints) const
+{
+ QString lonLats;
+ bool isNext = false;
+
+ for(const wpt_t &pt : routePoints)
+ {
+ if (isNext)
+ {
+ lonLats.append(QString("|%1,%2").arg(pt.lon).arg(pt.lat));
+ }
+ else
+ {
+ lonLats = QString("%1,%2").arg(pt.lon).arg(pt.lat);
+ isNext = true;
+ }
+ }
+
+ QUrlQuery urlQuery;
+ urlQuery.addQueryItem("lonlats",lonLats.toLatin1());
+ urlQuery.addQueryItem("nogos", "");
+ urlQuery.addQueryItem("profile", comboProfile->currentData().toString());
+ urlQuery.addQueryItem("alternativeidx", comboAlternative->currentData().toString());
+ urlQuery.addQueryItem("format", "gpx");
+
+ QUrl url = getServiceUrl();
+ url.setPath("/brouter");
+ url.setQuery(urlQuery);
+
+ return QNetworkRequest(url);
+}
+
+int CRouterBRouter::calcRoute(const QPointF& p1, const QPointF& p2, QPolygonF& coords)
+{
+ if(!hasFastRouting() || !mutex.tryLock())
+ {
+ return -1;
+ }
+ if (setup->installMode == CRouterBRouterSetup::eModeLocal && brouterState == QProcess::NotRunning)
+ {
+ startBRouter();
+ }
+
+ QVector<wpt_t> points;
+ points << wpt_t(p1.y()*RAD_TO_DEG,p1.x()*RAD_TO_DEG);
+ points << wpt_t(p2.y()*RAD_TO_DEG,p2.x()*RAD_TO_DEG);
+
+ synchronous = true;
+
+ QNetworkReply * reply = networkAccessManager->get(getRequest(points));
+
+ try
+ {
+ reply->setProperty("options", getOptions());
+ reply->setProperty("time", QDateTime::currentDateTimeUtc().toMSecsSinceEpoch());
+
+ progress = new CProgressDialog(tr("Calculate route with %1").arg(getOptions()), 0, NOINT, this);
+
+ QEventLoop eventLoop;
+ connect(progress, &CProgressDialog::rejected, reply, &QNetworkReply::abort);
+ connect(reply, &QNetworkReply::finished, &eventLoop, &QEventLoop::quit);
+ eventLoop.exec();
+
+ delete progress;
+
+ if (reply->error() != QNetworkReply::NoError)
+ {
+ throw reply->errorString();
+ }
+ else
+ {
+ clearError();
+
+ const QByteArray &res = reply->readAll();
+
+ if(res.isEmpty())
+ {
+ throw tr("response is empty");
+ }
+ else
+ {
+ QDomDocument xml;
+ xml.setContent(res);
+
+ const QDomElement &xmlGpx = xml.documentElement();
+ if(xmlGpx.isNull() || xmlGpx.tagName() != "gpx")
+ {
+ throw QString(res);
+ }
+ else
+ {
+ // read the shape
+ const QDomNodeList &xmlLatLng = xmlGpx.firstChildElement("trk")
+ .firstChildElement("trkseg")
+ .elementsByTagName("trkpt");
+ for(int n = 0; n < xmlLatLng.size(); n++)
+ {
+ const QDomElement &elem = xmlLatLng.item(n).toElement();
+ coords << QPointF();
+ QPointF &point = coords.last();
+ point.setX(elem.attribute("lon").toFloat()*DEG_TO_RAD);
+ point.setY(elem.attribute("lat").toFloat()*DEG_TO_RAD);
+ }
+ }
+ }
+ }
+ }
+ catch(const QString& msg)
+ {
+ coords.clear();
+ if(!msg.isEmpty())
+ {
+ reply->deleteLater();
+ mutex.unlock();
+ throw tr("Bad response from server: %1").arg(msg);
+ }
+ }
+
+ reply->deleteLater();
+ slotCloseStatusMsg();
+ mutex.unlock();
+ return coords.size();
+}
+
+void CRouterBRouter::calcRoute(const IGisItem::key_t& key)
+{
+ mutex.lock();
+ if (setup->installMode == CRouterBRouterSetup::eModeLocal && brouterState == QProcess::NotRunning)
+ {
+ startBRouter();
+ }
+ CGisItemRte *rte = dynamic_cast<CGisItemRte*>(CGisWidget::self().getItemByKey(key));
+ if(nullptr == rte)
+ {
+ mutex.unlock();
+ return;
+ }
+
+ rte->reset();
+
+ slotCloseStatusMsg();
+
+ QVector<wpt_t> points;
+ for(const CGisItemRte::rtept_t &pt : rte->getRoute().pts)
+ {
+ points << wpt_t(pt.lat,pt.lon);
+ }
+
+ synchronous = false;
+
+ QNetworkReply * reply = networkAccessManager->get(getRequest(points));
+
+ reply->setProperty("key.item", key.item);
+ reply->setProperty("key.project", key.project);
+ reply->setProperty("key.device", key.device);
+ reply->setProperty("options", getOptions());
+ reply->setProperty("time", QDateTime::currentDateTimeUtc().toMSecsSinceEpoch());
+
+ CCanvas * canvas = CMainWindow::self().getVisibleCanvas();
+ if(canvas)
+ {
+ canvas->slotTriggerCompleteUpdate(CCanvas::eRedrawGis);
+ canvas->reportStatus("BRouter", tr("<b>BRouter</b><br/>Routing request sent to server. Please wait..."));
+ }
+
+ progress = new CProgressDialog(tr("Calculate route with %1").arg(getOptions()), 0, NOINT, this);
+
+ connect(progress, &CProgressDialog::rejected, reply, &QNetworkReply::abort);
+}
+
+void CRouterBRouter::slotRequestFinished(QNetworkReply* reply)
+{
+ if (synchronous)
+ {
+ return;
+ }
+
+ delete progress;
+
+ try
+ {
+ if(reply->error() != QNetworkReply::NoError)
+ {
+ throw reply->errorString();
+ }
+
+ const QByteArray &res = reply->readAll();
+ reply->deleteLater();
+
+ if(res.isEmpty())
+ {
+ throw tr("response is empty");
+ }
+
+ clearError();
+
+ QDomDocument xml;
+ xml.setContent(res);
+
+ const QDomElement &xmlGpx = xml.documentElement();
+ if(xmlGpx.isNull() || xmlGpx.tagName() != "gpx")
+ {
+ throw QString(res);
+ }
+
+ IGisItem::key_t key;
+ key.item = reply->property("key.item").toString();
+ key.project = reply->property("key.project").toString();
+ key.device = reply->property("key.device").toString();
+ qint64 time = reply->property("time").toLongLong();
+ time = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch() - time;
+
+ CGisItemRte * rte = dynamic_cast<CGisItemRte*>(CGisWidget::self().getItemByKey(key));
+ if(rte != nullptr)
+ {
+ rte->setResultFromBRouter(xml, reply->property("options").toString() + tr("<br/>Calculation time: %1s").arg(time/1000.0, 0,'f',2));
+ }
+ }
+ catch(const QString& msg)
+ {
+ if(!msg.isEmpty())
+ {
+ CCanvas * canvas = CMainWindow::self().getVisibleCanvas();
+ if(canvas)
+ {
+ canvas->reportStatus("BRouter", tr("<b>BRouter</b><br/>Bad response from server:<br/>%1").arg(msg));
+ }
+ timerCloseStatusMsg->start();
+ reply->deleteLater();
+ mutex.unlock();
+ return;
+ }
+ }
+
+ slotCloseStatusMsg();
+ mutex.unlock();
+}
+
+QUrl CRouterBRouter::getServiceUrl() const
+{
+ if (setup->installMode == CRouterBRouterSetup::eModeLocal)
+ {
+ QUrl url(QString("http://"));
+ url.setHost(setup->localHost);
+ url.setPort(setup->localPort.toInt());
+ return url;
+ }
+ else
+ {
+ Q_ASSERT(setup->installMode == CRouterBRouterSetup::eModeOnline);
+ return QUrl(setup->onlineServiceUrl);
+ }
+}
+
+void CRouterBRouter::slotToggleConsole() const
+{
+ textBRouterOutput->setVisible(!textBRouterOutput->isVisible());
+ textBRouterError->setVisible(brouterError != QProcess::UnknownError && !textBRouterOutput->isVisible());
+}
+
+void CRouterBRouter::slotToggleBRouter() const
+{
+ if (brouterState == QProcess::NotRunning)
+ {
+ startBRouter();
+ }
+ else
+ {
+ stopBRouter();
+ }
+}
+
+void CRouterBRouter::startBRouter() const
+{
+ if (setup->isLocalBRouterInstalled())
+ {
+ textBRouterOutput->clear();
+ //# BRouter standalone server
+ //# java -cp brouter.jar btools.brouter.RouteServer <segmentdir> <profile-map> <customprofiledir> <port> <maxthreads>
+ //# maxRunningTime is the request timeout in seconds, set to 0 to disable timeout// JAVA_OPTS=
+ // CLASSPATH=../brouter.jar
+ // java $JAVA_OPTS -cp $CLASSPATH btools.server.RouteServer ../segments4 ../profiles2 ../customprofiles 17777 1
+
+ if (brouterState == QProcess::NotRunning)
+ {
+ QStringList args;
+ args << setup->localJavaOpts.split(QRegExp("\\s+"));
+ args << QString("-DmaxRunningTime=%1").arg(setup->localMaxRunningTime);
+ args << "-cp";
+ args << "brouter.jar";
+ args << "btools.server.RouteServer";
+ args << setup->localSegmentsDir;
+ args << setup->localProfileDir;
+ args << setup->localCustomProfileDir;
+ args << setup->localPort;
+ args << setup->localNumberThreads;
+ brouterShell->start(setup->localDir, setup->localJavaExecutable, args);
+ }
+ }
+}
+
+void CRouterBRouter::stopBRouter() const
+{
+ if (brouterState != QProcess::NotRunning)
+ {
+ brouterShell->stop();
+ }
+ textBRouterOutput->setVisible(false);
+}
+
+void CRouterBRouter::slotBRouterStateChanged(const QProcess::ProcessState newState)
+{
+ brouterState = newState;
+ updateLocalBRouterStatus();
+}
+
+void CRouterBRouter::slotBRouterError(const QProcess::ProcessError error, const QString &errorString)
+{
+ brouterError = error;
+ slotDisplayError(tr("Error"),errorString);
+ updateLocalBRouterStatus();
+}
+
+void CRouterBRouter::updateLocalBRouterStatus() const
+{
+ static const QString msgBRouterWarning = tr(
+ "QMapShack communicates with BRouter via a network connection. Usually this is done on a special "
+ "address that can't be reached from outside your device. However BRouter listens for connections "
+ "on all available interfaces. If you are in your own private network with an active firewall, this "
+ "is not much of a problem. If you are in a public network every open port is a risk as it can be "
+ "used by someone else to compromise your system. We do not recommend to use the local BRouter service "
+ "in this case."
+ );
+
+ if (isShutdown)
+ {
+ return;
+ }
+
+ labelBRouterWarning->hide();
+ if (setup->installMode == CRouterBRouterSetup::eModeLocal)
+ {
+ if (setup->isLocalBRouterInstalled())
+ {
+ switch(brouterState)
+ {
+ case QProcess::Starting:
+ {
+ SETTINGS;
+ if(cfg.value("Route/brouter/local/showWarning", true).toBool())
+ {
+ QMessageBox mbox;
+ mbox.setWindowTitle(tr("Warning..."));
+ mbox.setIcon(QMessageBox::Warning);
+ mbox.setStandardButtons(QMessageBox::Ok);
+ mbox.setText(msgBRouterWarning);
+
+ QCheckBox * checkAgree = new QCheckBox(tr("I understand the risk. Don't tell me again."), &mbox);
+ mbox.setCheckBox(checkAgree);
+ mbox.exec();
+ cfg.setValue("Route/brouter/local/showWarning", !checkAgree->isChecked());
+ }
+
+ labelStatus->setText(tr("starting"));
+ toolConsole->setVisible(true);
+ break;
+ }
+
+ case QProcess::Running:
+ {
+ labelBRouterWarning->show();
+ labelStatus->setText(tr("running"));
+ toolConsole->setVisible(true);
+ break;
+ }
+
+ case QProcess::NotRunning:
+ {
+ labelStatus->setText(tr("stopped"));
+ toolConsole->setVisible(brouterError != QProcess::UnknownError);
+ break;
+ }
+ }
+
+ checkFastRecalc->setEnabled(true);
+ toolToggleBRouter->setEnabled(true);
+ }
+ else
+ {
+ labelStatus->setText(tr("not installed"));
+ toolConsole->setVisible(false);
+ toolToggleBRouter->setEnabled(false);
+ checkFastRecalc->setEnabled(false);
+ }
+ toolToggleBRouter->setVisible(true);
+ checkFastRecalc->setVisible(true);
+ }
+ else
+ {
+ Q_ASSERT(setup->installMode == CRouterBRouterSetup::eModeOnline);
+ labelStatus->setText(tr("online"));
+ toolConsole->setVisible(false);
+ toolToggleBRouter->setVisible(false);
+ checkFastRecalc->setVisible(false);
+ textBRouterOutput->clear();
+ textBRouterOutput->setVisible(false);
+ }
+}
diff --git a/src/gis/rte/router/CRouterBRouter.h b/src/gis/rte/router/CRouterBRouter.h
new file mode 100644
index 0000000..6bee80d
--- /dev/null
+++ b/src/gis/rte/router/CRouterBRouter.h
@@ -0,0 +1,106 @@
+/**********************************************************************************************
+ Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+ Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#ifndef CROUTERBROUTER_H
+#define CROUTERBROUTER_H
+
+#include "gis/rte/router/IRouter.h"
+#include "ui_IRouterBRouter.h"
+
+#include <QNetworkAccessManager>
+#include <QProcess>
+#include <QTimer>
+
+class CRouterBRouterSetup;
+class CRouterBRouterSetupWizard;
+class CRouterBRouterInfo;
+class CRouterBRouterToolShell;
+class CRouterSetup;
+class CProgressDialog;
+
+class CRouterBRouter : public IRouter, private Ui::IRouterBRouter
+{
+ Q_OBJECT
+public:
+ CRouterBRouter(QWidget * parent);
+ virtual ~CRouterBRouter();
+
+ void calcRoute(const IGisItem::key_t& key) override;
+ int calcRoute(const QPointF& p1, const QPointF& p2, QPolygonF& coords) override;
+ bool hasFastRouting() override;
+ QString getOptions() override;
+
+private slots:
+ void slotToolSetupClicked();
+ void slotRequestFinished(QNetworkReply* reply);
+ void slotCloseStatusMsg() const;
+ void slotToolProfileInfoClicked() const;
+ void slotDisplayError(const QString &error, const QString &details) const;
+ void slotDisplayProfileInfo(const QString &profile, const QString &content);
+ void slotBRouterStateChanged(const QProcess::ProcessState newState);
+ void slotBRouterError(const QProcess::ProcessError error, const QString &errorString);
+ void slotToggleBRouter() const;
+ void slotToggleConsole() const;
+
+private:
+
+ struct wpt_t
+ {
+ wpt_t() :
+ lat(NOFLOAT),
+ lon(NOFLOAT)
+ {
+ }
+
+ wpt_t(qreal lat, qreal lon) :
+ lat(lat),
+ lon(lon)
+ {
+ }
+ qreal lat;
+ qreal lon;
+ };
+
+ void updateDialog() const;
+ void startBRouter() const;
+ void stopBRouter() const;
+ void updateLocalBRouterStatus() const;
+ QNetworkRequest getRequest(const QVector<wpt_t>& routePoints) const;
+ QUrl getServiceUrl() const;
+ void clearError();
+
+ QNetworkAccessManager * networkAccessManager;
+ QTimer * timerCloseStatusMsg;
+ bool synchronous = false;
+ QMutex mutex {QMutex::NonRecursive};
+ CRouterBRouterSetup * setup;
+ CRouterSetup * routerSetup;
+ CRouterBRouterInfo * info;
+ CRouterBRouterToolShell * brouterShell {nullptr};
+ QProcess::ProcessState brouterState { QProcess::NotRunning };
+ QProcess::ProcessError brouterError { QProcess::UnknownError };
+ CProgressDialog * progress;
+ bool isError { false };
+ QString error;
+ QString errorDetails;
+ bool isShutdown { false };
+};
+
+#endif //CROUTERBROUTER_H
+
diff --git a/src/gis/rte/router/CRouterRoutino.cpp b/src/gis/rte/router/CRouterRoutino.cpp
index a5ab7be..0fbe77c 100644
--- a/src/gis/rte/router/CRouterRoutino.cpp
+++ b/src/gis/rte/router/CRouterRoutino.cpp
@@ -21,7 +21,7 @@
#include "gis/CGisWidget.h"
#include "gis/rte/CGisItemRte.h"
#include "gis/rte/router/CRouterRoutino.h"
-#include "gis/rte/router/CRouterRoutinoPathSetup.h"
+#include "gis/rte/router/routino/CRouterRoutinoPathSetup.h"
#include "helpers/CProgressDialog.h"
#include "helpers/CSettings.h"
#include "setup/IAppSetup.h"
@@ -232,12 +232,6 @@ void CRouterRoutino::buildDatabaseList()
}
#ifdef Q_OS_WIN
- QFileInfo fi(dir.absoluteFilePath(filename));
- if(fi.size() > 0x0FFFFFFFFLL)
- {
- QMessageBox::warning(this, tr("Warning..."), tr("%1: Due to limitations in the Windows POSIX API Routino can't handle files larger than 4GB.").arg(prefix), QMessageBox::Ok);
- continue;
- }
Routino_Database * data = Routino_LoadDatabase(dir.absolutePath().toLocal8Bit(), prefix.toLocal8Bit());
#else
Routino_Database * data = Routino_LoadDatabase(dir.absolutePath().toUtf8(), prefix.toUtf8());
diff --git a/src/gis/rte/router/CRouterSetup.cpp b/src/gis/rte/router/CRouterSetup.cpp
index 4a2e10f..ec2a06d 100644
--- a/src/gis/rte/router/CRouterSetup.cpp
+++ b/src/gis/rte/router/CRouterSetup.cpp
@@ -1,5 +1,6 @@
/**********************************************************************************************
Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+ Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,6 +19,7 @@
#include "gis/CGisWidget.h"
#include "gis/rte/CGisItemRte.h"
+#include "gis/rte/router/CRouterBRouter.h"
#include "gis/rte/router/CRouterMapQuest.h"
#include "gis/rte/router/CRouterRoutino.h"
#include "gis/rte/router/CRouterSetup.h"
@@ -35,9 +37,11 @@ CRouterSetup::CRouterSetup(QWidget * parent)
comboRouter->addItem(tr("Routino (offline)"));
comboRouter->addItem(tr("MapQuest (online)"));
+ comboRouter->addItem(tr("BRouter (online)"));
stackedWidget->addWidget(new CRouterRoutino(this));
stackedWidget->addWidget(new CRouterMapQuest(this));
+ stackedWidget->addWidget(new CRouterBRouter(this));
connect(comboRouter, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &CRouterSetup::slotSelectRouter);
@@ -85,3 +89,8 @@ int CRouterSetup::calcRoute(const QPointF& p1, const QPointF& p2, QPolygonF& coo
return false;
}
+
+void CRouterSetup::setRouterTitle(const router_e router, const QString title)
+{
+ comboRouter->setItemText(router,title);
+}
diff --git a/src/gis/rte/router/CRouterSetup.h b/src/gis/rte/router/CRouterSetup.h
index ba36a8a..0d30ef8 100644
--- a/src/gis/rte/router/CRouterSetup.h
+++ b/src/gis/rte/router/CRouterSetup.h
@@ -38,6 +38,10 @@ public:
bool hasFastRouting();
+ enum router_e {RouterRoutino, RouterMapquest, RouterBRouter};
+
+ void setRouterTitle(router_e, QString title);
+
private slots:
void slotSelectRouter(int i);
diff --git a/src/gis/rte/router/IRouterBRouter.ui b/src/gis/rte/router/IRouterBRouter.ui
new file mode 100644
index 0000000..7514a2a
--- /dev/null
+++ b/src/gis/rte/router/IRouterBRouter.ui
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>IRouterBRouter</class>
+ <widget class="QWidget" name="IRouterBRouter">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>400</width>
+ <height>327</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="windowTitle">
+ <string>Form</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QFormLayout" name="formLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Profile</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Alternative</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="comboAlternative">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QComboBox" name="comboProfile">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="toolProfileInfo">
+ <property name="toolTip">
+ <string>display selected routing profile</string>
+ </property>
+ <property name="text">
+ <string>...</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../../../resources.qrc">
+ <normaloff>:/icons/32x32/Help.png</normaloff>:/icons/32x32/Help.png</iconset>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QCheckBox" name="checkFastRecalc">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>on-the-fly routing</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QLabel" name="labelBRouter">
+ <property name="text">
+ <string>BRouter: </string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="labelStatus">
+ <property name="text">
+ <string>not running</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="toolToggleBRouter">
+ <property name="toolTip">
+ <string>start/stop BRouter</string>
+ </property>
+ <property name="text">
+ <string>...</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../../../resources.qrc">
+ <normaloff>:/icons/32x32/Off.png</normaloff>:/icons/32x32/Off.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="toolConsole">
+ <property name="toolTip">
+ <string>show BRouter console</string>
+ </property>
+ <property name="text">
+ <string>...</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../../../resources.qrc">
+ <normaloff>:/icons/32x32/TextLeft.png</normaloff>:/icons/32x32/TextLeft.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QToolButton" name="toolSetup">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Setup</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="labelBRouterWarning">
+ <property name="text">
+ <string>Caution! BRouter is listening on all ports for connections.</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QTextBrowser" name="textBRouterOutput">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QTextBrowser" name="textBRouterError"/>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ <resources>
+ <include location="../../../resources.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/templates/source.cpp b/src/gis/rte/router/brouter/CRouterBRouterInfo.cpp
similarity index 62%
copy from templates/source.cpp
copy to src/gis/rte/router/brouter/CRouterBRouterInfo.cpp
index fdd485e..96b02e3 100644
--- a/templates/source.cpp
+++ b/src/gis/rte/router/brouter/CRouterBRouterInfo.cpp
@@ -1,5 +1,5 @@
/**********************************************************************************************
- Copyright (C) 2016 Oliver Eichler oliver.eichler at gmx.de
+ Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,11 +16,25 @@
**********************************************************************************************/
-#include "CLASSNAME.h"
+#include "CMainWindow.h"
+#include "gis/rte/router/brouter/CRouterBRouterInfo.h"
-CLASSNAME::CLASSNAME()
+CRouterBRouterInfo::CRouterBRouterInfo() : QDialog(CMainWindow::getBestWidgetForParent())
{
+ setupUi(this);
+}
+CRouterBRouterInfo::~CRouterBRouterInfo()
+{
}
+void CRouterBRouterInfo::setLabel(const QString &infoLabel) const
+{
+ label->setText(infoLabel);
+}
+
+void CRouterBRouterInfo::setInfo(const QString &infoText) const
+{
+ textBrowser->setText(infoText);
+}
diff --git a/templates/header.h b/src/gis/rte/router/brouter/CRouterBRouterInfo.h
similarity index 66%
copy from templates/header.h
copy to src/gis/rte/router/brouter/CRouterBRouterInfo.h
index 0679fac..aeceb1a 100644
--- a/templates/header.h
+++ b/src/gis/rte/router/brouter/CRouterBRouterInfo.h
@@ -1,5 +1,5 @@
/**********************************************************************************************
- Copyright (C) 2016 Oliver Eichler oliver.eichler at gmx.de
+ Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,15 +16,19 @@
**********************************************************************************************/
-#ifndef CLASSNAME_H
-#define CLASSNAME_H
+#ifndef CROUTERBROUTERINFO_H
+#define CROUTERBROUTERINFO_H
-class CLASSNAME
-{
- public:
- CLASSNAME();
- virtual ~CLASSNAME() = default;
-};
+#include "ui_IRouterBRouterInfo.h"
-#endif //CLASSNAME_H
+class CRouterBRouterInfo : public QDialog, private Ui::IRouterBRouterInfo
+{
+ Q_OBJECT
+public:
+ CRouterBRouterInfo();
+ virtual ~CRouterBRouterInfo();
+ void setLabel(const QString &infoLabel) const;
+ void setInfo(const QString &infoText) const;
+};
+#endif
diff --git a/src/gis/rte/router/brouter/CRouterBRouterSetup.cpp b/src/gis/rte/router/brouter/CRouterBRouterSetup.cpp
new file mode 100644
index 0000000..045e611
--- /dev/null
+++ b/src/gis/rte/router/brouter/CRouterBRouterSetup.cpp
@@ -0,0 +1,625 @@
+/**********************************************************************************************
+ Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#include "gis/rte/router/brouter/CRouterBRouterSetup.h"
+
+#include "helpers/CSettings.h"
+#include "setup/IAppSetup.h"
+#include <QMessageBox>
+#include <QWebFrame>
+#include <QWebPage>
+#include <QtScript>
+#include <QtWebKit>
+
+CRouterBRouterSetup::CRouterBRouterSetup(QObject *parent)
+ : QObject(parent)
+{
+ networkAccessManager = new QNetworkAccessManager(this);
+ profilesWebPage = new QWebPage(this);
+ connect(networkAccessManager, &QNetworkAccessManager::finished, this, &CRouterBRouterSetup::slotOnlineRequestFinished);
+ connect(profilesWebPage, &QWebPage::loadFinished, this, &CRouterBRouterSetup::slotLoadOnlineProfilesRequestFinished);
+}
+
+CRouterBRouterSetup::~CRouterBRouterSetup()
+{
+}
+
+void CRouterBRouterSetup::load()
+{
+ SETTINGS;
+ cfg.beginGroup("Route/brouter");
+ installMode = modeFromString(cfg.value("installMode",stringFromMode(defaultInstallMode)).toString());
+ expertMode = cfg.value("expertMode",defaultExpertMode).toBool();
+ onlineWebUrl = cfg.value("onlineWebUrl", defaultOnlineWebUrl).toString();
+ onlineServiceUrl = cfg.value("onlineServiceUrl", defaultOnlineServiceUrl).toString();
+ onlineProfilesUrl = cfg.value("onlineProfilesUrl", defaultOnlineProfilesUrl).toString();
+ localDir = cfg.value("localDir", defaultLocalDir).toString();
+ localJavaExecutable = cfg.value("localJava",findJava()).toString();
+ localProfileDir = cfg.value("localProfileDir", defaultLocalProfileDir).toString();
+ localCustomProfileDir = cfg.value("localCustomProfileDir", defaultLocalCustomProfileDir).toString();
+ localSegmentsDir = cfg.value("localSegmentsDir", defaultLocalSegmentsDir).toString();
+ localHost = cfg.value("localHost", defaultLocalHost).toString();
+ localPort = cfg.value("localPort", defaultLocalPort).toString();
+ localNumberThreads = cfg.value("localNumberThreads", defaultLocalNumberThreads).toString();
+ localMaxRunningTime = cfg.value("localMaxRunningTime", defaultLocalMaxRunningTime).toString();
+ localJavaOpts = cfg.value("localJavaOpts", defaultLocalJavaOpts).toString();
+ binariesUrl = cfg.value("binariesUrl",defaultBinariesUrl).toString();
+ segmentsUrl = cfg.value("segmentsUrl",defaultSegmentsUrl).toString();
+ onlineProfiles.clear();
+ int size = cfg.beginReadArray("online");
+ for (int i=0; i < size; i++)
+ {
+ cfg.setArrayIndex(i);
+ onlineProfiles << cfg.value("profile").toString();
+ }
+ cfg.endArray();
+ localProfiles.clear();
+ size = cfg.beginReadArray("local");
+ for (int i=0; i < size; i++)
+ {
+ cfg.setArrayIndex(i);
+ localProfiles << cfg.value("profile").toString();
+ }
+ cfg.endArray();
+ cfg.endGroup();
+
+ if (installMode == eModeLocal)
+ {
+ readLocalProfiles();
+ }
+ else if (installMode == eModeOnline)
+ {
+ loadOnlineConfig();
+ }
+ else
+ {
+ onInvalidSetup();
+ }
+}
+
+void CRouterBRouterSetup::save()
+{
+ SETTINGS;
+ cfg.beginGroup("Route/brouter");
+ cfg.setValue("expertMode",expertMode);
+ cfg.setValue("installMode", stringFromMode(installMode));
+ cfg.setValue("onlineWebUrl", onlineWebUrl);
+ cfg.setValue("onlineServiceUrl", onlineServiceUrl);
+ cfg.setValue("onlineProfilesUrl", onlineProfilesUrl);
+ cfg.setValue("localDir", localDir);
+ cfg.setValue("localJava", localJavaExecutable);
+ cfg.setValue("localProfileDir", localProfileDir);
+ cfg.setValue("localCustomProfileDir", localCustomProfileDir);
+ cfg.setValue("localSegmentsDir", localSegmentsDir);
+ cfg.setValue("localHost", localHost);
+ cfg.setValue("localPort", localPort);
+ cfg.setValue("localNumberThreads", localNumberThreads);
+ cfg.setValue("localMaxRunningTime", localMaxRunningTime);
+ cfg.setValue("localJavaOpts", localJavaOpts);
+ cfg.setValue("binariesUrl", binariesUrl);
+ cfg.setValue("segmentsUrl", segmentsUrl);
+ cfg.beginWriteArray("online");
+ for (int i=0; i < onlineProfiles.size(); i++)
+ {
+ cfg.setArrayIndex(i);
+ cfg.setValue("profile", onlineProfiles.at(i));
+ }
+ cfg.endArray();
+ cfg.beginWriteArray("local");
+ for (int i=0; i < localProfiles.size(); i++)
+ {
+ cfg.setArrayIndex(i);
+ cfg.setValue("profile",localProfiles.at(i));
+ }
+ cfg.endArray();
+ cfg.endGroup();
+}
+
+void CRouterBRouterSetup::resetAll()
+{
+ resetInstallMode();
+ resetOnlineWebUrl();
+ resetOnlineServiceUrl();
+ resetOnlineProfilesUrl();
+ resetLocalProfileDir();
+ resetLocalCustomProfileDir();
+ resetLocalSegmentsDir();
+ resetLocalHost();
+ resetLocalPort();
+ resetLocalNumberThreads();
+ resetLocalMaxRunningTime();
+ resetLocalJavaOpts();
+ resetBinariesUrl();
+ resetSegmentsUrl();
+}
+
+CRouterBRouterSetup::mode_e CRouterBRouterSetup::modeFromString(const QString& mode) const
+{
+ if (mode == "online")
+ {
+ return eModeOnline;
+ }
+ else if (mode == "local")
+ {
+ return eModeLocal;
+ }
+ else
+ {
+ return eModeIllegal;
+ }
+}
+
+QString CRouterBRouterSetup::stringFromMode(const mode_e mode) const
+{
+ if (mode == eModeLocal)
+ {
+ return "local";
+ }
+ else
+ {
+ Q_ASSERT(mode == eModeOnline);
+ return "online";
+ }
+}
+
+void CRouterBRouterSetup::addProfile(const QString &profile)
+{
+ if (installMode == eModeLocal)
+ {
+ loadOnlineProfileAsync(profile, eProfileInstall);
+ }
+ else
+ {
+ Q_ASSERT(installMode == eModeOnline);
+ if (!onlineProfiles.contains(profile))
+ {
+ onlineProfiles << profile;
+ emit sigProfilesChanged();
+ }
+ }
+}
+
+void CRouterBRouterSetup::deleteProfile(const QString &profile)
+{
+ if (installMode == eModeLocal)
+ {
+ const QString &filename = getProfileDir(eModeLocal).absoluteFilePath(profile + ".brf");
+ QFile file(filename);
+ if (file.exists())
+ {
+ file.remove();
+ }
+ if (localProfiles.contains(profile))
+ {
+ localProfiles.removeAt(localProfiles.indexOf(profile));
+ emit sigProfilesChanged();
+ }
+ }
+ else
+ {
+ Q_ASSERT(installMode == eModeOnline);
+ onlineProfiles.removeAt(onlineProfiles.indexOf(profile));
+ emit sigProfilesChanged();
+ }
+}
+
+void CRouterBRouterSetup::profileUp(const QString &profile)
+{
+ if (installMode == eModeLocal)
+ {
+ int index = localProfiles.indexOf(profile);
+ if (index > 0)
+ {
+ localProfiles.removeAt(index);
+ localProfiles.insert(index-1,profile);
+ emit sigProfilesChanged();
+ }
+ }
+ else
+ {
+ Q_ASSERT(installMode == eModeOnline);
+ int index = onlineProfiles.indexOf(profile);
+ if (index > 0)
+ {
+ onlineProfiles.removeAt(index);
+ onlineProfiles.insert(index-1,profile);
+ emit sigProfilesChanged();
+ }
+ }
+}
+
+void CRouterBRouterSetup::profileDown(const QString &profile)
+{
+ if (installMode == eModeLocal)
+ {
+ int index = localProfiles.indexOf(profile);
+ if (index > -1 && index < localProfiles.size()-1)
+ {
+ localProfiles.removeAt(index);
+ localProfiles.insert(index+1,profile);
+ emit sigProfilesChanged();
+ }
+ }
+ else
+ {
+ Q_ASSERT(installMode == eModeOnline);
+ int index = onlineProfiles.indexOf(profile);
+ if (index > -1 && index < onlineProfiles.size()-1)
+ {
+ onlineProfiles.removeAt(index);
+ onlineProfiles.insert(index+1,profile);
+ emit sigProfilesChanged();
+ }
+ }
+}
+
+void CRouterBRouterSetup::readLocalProfiles()
+{
+ bool changed(false);
+ const QDir& dir = getProfileDir(eModeLocal);
+ QStringList installedProfiles;
+ if (dir.exists())
+ {
+ for(const QString &profile : dir.entryList())
+ {
+ if (profile.endsWith(".brf"))
+ {
+ installedProfiles << profile.left(profile.length()-4);
+ }
+ }
+ }
+ const QStringList localProfilesTmp(localProfiles);
+ for (const QString &profile : localProfilesTmp)
+ {
+ if (!installedProfiles.contains(profile))
+ {
+ localProfiles.removeAt(localProfiles.indexOf(profile));
+ changed = true;
+ }
+ }
+ for (const QString &profile : installedProfiles)
+ {
+ if (!localProfiles.contains(profile))
+ {
+ localProfiles << profile;
+ changed = true;
+ }
+ }
+ if (changed)
+ {
+ emit sigProfilesChanged();
+ }
+}
+
+QDir CRouterBRouterSetup::getProfileDir(const mode_e mode) const
+{
+ if (mode == eModeLocal)
+ {
+ return QDir(QDir(localDir).absoluteFilePath(localProfileDir));
+ }
+ else
+ {
+ Q_ASSERT(mode == eModeOnline);
+ QDir brouterDir(QDir(IAppSetup::getPlatformInstance()->defaultCachePath()).absoluteFilePath(onlineCacheDir));
+ if (!brouterDir.exists())
+ {
+ brouterDir.mkpath(brouterDir.absolutePath());
+ }
+ return brouterDir;
+ }
+}
+
+QStringList CRouterBRouterSetup::getProfiles() const
+{
+ if (installMode == eModeLocal)
+ {
+ return localProfiles;
+ }
+ else
+ {
+ Q_ASSERT(installMode == eModeOnline);
+ return onlineProfiles;
+ }
+}
+
+void CRouterBRouterSetup::loadLocalOnlineProfiles() const
+{
+ profilesWebPage->mainFrame()->load(QUrl(onlineProfilesUrl));
+}
+
+void CRouterBRouterSetup::loadOnlineConfig() const
+{
+ const QUrl configUrl(onlineWebUrl + "config.js");
+ const QString &configHost = configUrl.host();
+
+ QNetworkReply * reply = networkAccessManager->get(QNetworkRequest(configUrl));
+ reply->setProperty("configHost",configHost);
+ reply->setProperty("type",eTypeConfig);
+}
+
+void CRouterBRouterSetup::slotOnlineRequestFinished(QNetworkReply *reply)
+{
+ const request_e type = request_e(reply->property("type").toInt());
+ if (type == eTypeConfig)
+ {
+ loadOnlineConfigFinished(reply);
+ }
+ else
+ {
+ Q_ASSERT(type == eTypeProfile);
+ loadOnlineProfileFinished(reply);
+ }
+}
+
+void CRouterBRouterSetup::loadOnlineConfigFinished(QNetworkReply *reply)
+{
+ reply->deleteLater();
+
+ if (reply->error() != QNetworkReply::NoError)
+ {
+ emitNetworkError(reply->errorString());
+ return;
+ }
+ else
+ {
+ QString configHost = reply->property("configHost").toString();
+
+ const QString jsConfig(reply->readAll());
+
+ QScriptEngine engine;
+
+ const QString &jsSetup = QString( \
+ "(function(){\
+ window = {};\
+ window.location = {};\
+ window.location.hostname = '%1';\
+ window.location.search = {};\
+ window.location.search.slice = function() {};\
+ URLSearchParams = function() {};\
+ BR = {};\
+ })();").arg(configHost);
+
+ engine.evaluate(jsSetup).toString();
+ engine.evaluate(jsConfig).toString();
+ if (engine.hasUncaughtException())
+ {
+ emitOnlineConfigScriptError(engine.uncaughtException());
+ return;
+ }
+
+ const QScriptValue &br = engine.globalObject().property("BR");
+ if (!br.isValid() || br.isError())
+ {
+ emitOnlineConfigScriptError(br);
+ return;
+ }
+ const QScriptValue &conf = br.property("conf");
+ if (!conf.isValid() || conf.isError())
+ {
+ emitOnlineConfigScriptError(conf);
+ return;
+ }
+
+ const QScriptValue &host = conf.property("host").toString();
+ if (!host.isValid() || host.isError())
+ {
+ emitOnlineConfigScriptError(host);
+ return;
+ }
+ if (onlineServiceUrl != host.toString())
+ {
+ onlineServiceUrl = host.toString();
+ }
+ const QScriptValue &url = conf.property("profilesUrl").toString();
+ if (!url.isValid() || url.isError())
+ {
+ emitOnlineConfigScriptError(url);
+ return;
+ }
+ if (onlineProfilesUrl != url.toString())
+ {
+ onlineProfilesUrl = url.toString();
+ }
+
+ const QScriptValue &profiles = conf.property("profiles");
+ if (!profiles.isValid() || profiles.isError())
+ {
+ emitOnlineConfigScriptError(profiles);
+ return;
+ }
+ const qint32 len = profiles.property("length").toInt32();
+
+ QStringList onlineProfilesLoaded;
+ for(qint32 i=0; i<len; i++)
+ {
+ const QScriptValue &profile = profiles.property(i);
+ if (!profile.isValid() || profile.isError())
+ {
+ emitOnlineConfigScriptError(profile);
+ return;
+ }
+ onlineProfilesLoaded << profile.toString();
+ }
+
+ mergeOnlineProfiles(onlineProfilesLoaded);
+
+ const QStringList onlineProfilesTmp(onlineProfiles);
+ for (const QString &profile : onlineProfilesTmp)
+ {
+ if (!onlineProfilesAvailable.contains(profile))
+ {
+ onlineProfiles.removeAt(onlineProfiles.indexOf(profile));
+ }
+ }
+
+ emit sigProfilesChanged();
+ emit sigOnlineConfigLoaded();
+ }
+}
+
+void CRouterBRouterSetup::slotLoadOnlineProfilesRequestFinished(bool ok)
+{
+ if (!ok)
+ {
+ emitNetworkError(tr("%1 not accessible").arg(onlineProfilesUrl));
+ return;
+ }
+ else
+ {
+ const QWebElement &htmlElement = profilesWebPage->mainFrame()->documentElement();
+ const QWebElementCollection &anchorElements = htmlElement.findAll("table tr td a");
+
+ if (anchorElements.count() == 0)
+ {
+ emitNetworkError(tr("%1 invalid result").arg(onlineProfilesUrl));
+ return;
+ }
+
+ const QRegExp rxProfileName("(\\S+)\\.brf");
+
+ QStringList onlineProfilesLoaded;
+ for (const QWebElement &anchorElement : anchorElements)
+ {
+ const QString &profileName = anchorElement.toPlainText();
+ //only anchors matching the desired pattern
+ if (rxProfileName.indexIn(profileName) > -1)
+ {
+ onlineProfilesLoaded << rxProfileName.cap(1);
+ }
+ }
+
+ mergeOnlineProfiles(onlineProfilesLoaded);
+
+ emit sigProfilesChanged();
+ }
+}
+
+void CRouterBRouterSetup::mergeOnlineProfiles(const QStringList &onlineProfilesLoaded)
+{
+ const QStringList onlineProfilesAvailableTmp(onlineProfilesAvailable);
+ for (const QString &profile : onlineProfilesAvailableTmp)
+ {
+ if (!onlineProfilesLoaded.contains(profile))
+ {
+ onlineProfilesAvailable.removeAt(onlineProfilesAvailable.indexOf(profile));
+ }
+ }
+ for (const QString &profile : onlineProfilesLoaded)
+ {
+ if (!onlineProfilesAvailable.contains(profile))
+ {
+ onlineProfilesAvailable << profile;
+ }
+ }
+}
+
+void CRouterBRouterSetup::emitOnlineConfigScriptError(const QScriptValue &error) const
+{
+ emit sigError(tr("Error parsing online-config:"),error.toString());
+}
+
+void CRouterBRouterSetup::emitNetworkError(QString error) const
+{
+ emit sigError(tr("Network error:"),error);
+}
+
+void CRouterBRouterSetup::displayProfileAsync(const QString &profile) const
+{
+ if (installMode == eModeLocal)
+ {
+ QFile file(getProfileDir(eModeLocal).absoluteFilePath(profile + ".brf"));
+ if (file.exists())
+ {
+ file.open(QIODevice::ReadOnly);
+ const QByteArray &content = file.readAll();
+ file.close();
+ emit sigDisplayOnlineProfileFinished(profile, QString(content));
+ }
+ }
+ else
+ {
+ Q_ASSERT(installMode == eModeOnline);
+ loadOnlineProfileAsync(profile, eProfileDisplay);
+ }
+}
+
+void CRouterBRouterSetup::displayOnlineProfileAsync(const QString &profile) const
+{
+ loadOnlineProfileAsync(profile, eProfileDisplay);
+}
+
+void CRouterBRouterSetup::loadOnlineProfileAsync(const QString &profile, const profileRequest_e mode) const
+{
+ QNetworkReply * reply = networkAccessManager->get(QNetworkRequest(QUrl(onlineProfilesUrl + profile +".brf")));
+ reply->setProperty("type",eTypeProfile);
+ reply->setProperty("profile", profile);
+ reply->setProperty("request", mode);
+}
+
+void CRouterBRouterSetup::loadOnlineProfileFinished(QNetworkReply * reply)
+{
+ reply->deleteLater();
+ if (reply->error() != QNetworkReply::NoError)
+ {
+ emitNetworkError(reply->errorString());
+ }
+ else
+ {
+ const QString &profile = reply->property("profile").toString();
+ const profileRequest_e mode = profileRequest_e(reply->property("request").toInt());
+
+ const QByteArray &content = reply->readAll();
+ if (mode == eProfileInstall)
+ {
+ const QDir dir = getProfileDir(eModeLocal);
+ const QString filename = dir.absoluteFilePath(profile + ".brf");
+ QFile file(filename);
+ file.open(QIODevice::WriteOnly);
+ file.write(content);
+ file.close();
+ readLocalProfiles();
+ }
+ else
+ {
+ Q_ASSERT(mode == eProfileDisplay);
+ emit sigDisplayOnlineProfileFinished(profile, QString(content));
+ }
+ }
+}
+
+bool CRouterBRouterSetup::isLocalBRouterInstalled() const
+{
+ const QDir dir(localDir);
+ return QFile(dir.absoluteFilePath("brouter.jar")).exists() && QDir(dir.absoluteFilePath(localProfileDir)).exists();
+}
+
+QString CRouterBRouterSetup::findJava() const
+{
+ return IAppSetup::getPlatformInstance()->findExecutable("java");
+}
+
+void CRouterBRouterSetup::onInvalidSetup()
+{
+ QMessageBox msgBox;
+ msgBox.setIcon(QMessageBox::Warning);
+ msgBox.setText("BRouter config is inconsistent!");
+ msgBox.setInformativeText("Resetting to default values");
+ msgBox.setStandardButtons(QMessageBox::Ok);
+ msgBox.exec();
+ resetAll();
+}
diff --git a/src/gis/rte/router/brouter/CRouterBRouterSetup.h b/src/gis/rte/router/brouter/CRouterBRouterSetup.h
new file mode 100644
index 0000000..8be5a9b
--- /dev/null
+++ b/src/gis/rte/router/brouter/CRouterBRouterSetup.h
@@ -0,0 +1,148 @@
+/**********************************************************************************************
+ Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#ifndef CROUTERBROUTERSETUP_H
+#define CROUTERBROUTERSETUP_H
+
+#include <QScriptValue>
+#include <QWebPage>
+#include <QtCore>
+
+class CRouterBRouterSetup : public QObject
+{
+ Q_OBJECT
+public:
+ CRouterBRouterSetup(QObject * parent);
+ ~CRouterBRouterSetup();
+
+ enum mode_e { eModeLocal, eModeOnline, eModeIllegal };
+ struct tile_t { QPoint tile; QDateTime date; qreal size; };
+
+ void load();
+ void save();
+
+ void resetAll();
+ void resetInstallMode() { installMode = defaultInstallMode; }
+ void resetOnlineWebUrl() { onlineWebUrl = defaultOnlineWebUrl; }
+ void resetOnlineServiceUrl() { onlineServiceUrl = defaultOnlineServiceUrl; }
+ void resetOnlineProfilesUrl() { onlineProfilesUrl = defaultOnlineProfilesUrl; }
+ void resetLocalProfileDir() { localProfileDir = defaultLocalProfileDir; }
+ void resetLocalCustomProfileDir() { localCustomProfileDir = defaultLocalCustomProfileDir; }
+ void resetLocalSegmentsDir() { localSegmentsDir = defaultLocalSegmentsDir; }
+ void resetLocalHost() { localHost = defaultLocalHost; }
+ void resetLocalPort() { localPort = defaultLocalPort; }
+ void resetLocalNumberThreads() { localNumberThreads = defaultLocalNumberThreads; }
+ void resetLocalMaxRunningTime() { localMaxRunningTime = defaultLocalMaxRunningTime; }
+ void resetLocalJavaOpts() { localJavaOpts = defaultLocalJavaOpts; }
+ void resetBinariesUrl() { binariesUrl = defaultBinariesUrl; }
+ void resetSegmentsUrl() { segmentsUrl = defaultSegmentsUrl; }
+
+ QStringList getProfiles() const;
+
+ void addProfile(const QString &profile);
+ void deleteProfile(const QString &profile);
+ void profileUp(const QString &profile);
+ void profileDown(const QString &profile);
+
+ void readLocalProfiles();
+
+ void loadOnlineConfig() const;
+ void loadLocalOnlineProfiles() const;
+ void displayProfileAsync(const QString &profile) const;
+ void displayOnlineProfileAsync(const QString &profile) const;
+
+ QString findJava() const;
+ bool isLocalBRouterInstalled() const;
+
+ void onInvalidSetup();
+
+signals:
+ void sigOnlineConfigLoaded() const;
+ void sigProfilesChanged() const;
+ void sigDisplayOnlineProfileFinished(const QString profile, const QString content) const;
+ void sigError(const QString error, const QString details) const;
+
+private slots:
+ void slotOnlineRequestFinished(QNetworkReply *reply);
+ void slotLoadOnlineProfilesRequestFinished(bool ok);
+
+private:
+ enum request_e { eTypeConfig, eTypeProfile };
+ enum profileRequest_e { eProfileInstall, eProfileDisplay };
+
+ QDir getProfileDir(const mode_e mode) const;
+ void loadOnlineProfileAsync(const QString &profile, const profileRequest_e mode) const;
+ void loadOnlineConfigFinished(QNetworkReply* reply);
+ void loadOnlineProfileFinished(QNetworkReply * reply);
+ void mergeOnlineProfiles(const QStringList &profilesLoaded);
+ void emitOnlineConfigScriptError(const QScriptValue &error) const;
+ void emitNetworkError(QString error) const;
+ mode_e modeFromString(const QString &mode) const;
+ QString stringFromMode(const mode_e mode) const;
+
+ QStringList onlineProfiles;
+ QStringList localProfiles;
+
+ QNetworkAccessManager * networkAccessManager;
+ QWebPage * profilesWebPage;
+
+ bool expertMode;
+ mode_e installMode;
+ QString onlineWebUrl;
+ QString onlineServiceUrl;
+ QString onlineProfilesUrl;
+ QStringList onlineProfilesAvailable;
+ QString localDir;
+ QString localJavaExecutable;
+ QString localProfileDir;
+ QString localCustomProfileDir;
+ QString localSegmentsDir;
+ QString localHost;
+ QString localPort;
+ QString localNumberThreads;
+ QString localMaxRunningTime;
+ QString localJavaOpts;
+ QString binariesUrl;
+ QString segmentsUrl;
+
+ const bool defaultExpertMode = false;
+ const mode_e defaultInstallMode = eModeOnline;
+ const QString defaultOnlineWebUrl = "http://brouter.de/brouter-web/";
+ const QString defaultOnlineServiceUrl = "http://h2096617.stratoserver.net:443";
+ const QString defaultOnlineProfilesUrl = "http://brouter.de/brouter/profiles2/";
+ const QString defaultLocalDir = ".";
+ const QString defaultLocalProfileDir = "profiles2";
+ const QString defaultLocalCustomProfileDir = "customprofiles";
+ const QString defaultLocalSegmentsDir = "segments4";
+ const QString defaultLocalHost = "127.0.0.1";
+ const QString defaultLocalPort = "17777";
+ const QString defaultLocalNumberThreads = "1";
+ const QString defaultLocalMaxRunningTime = "300";
+ const QString defaultLocalJavaOpts = "-Xmx128M -Xms128M -Xmn8M";
+ const QString defaultBinariesUrl = "http://brouter.de/brouter_bin/";
+ const QString defaultSegmentsUrl = "http://brouter.de/brouter/segments4/";
+
+ const QString onlineCacheDir = "BRouter";
+
+ friend class CRouterBRouter;
+ friend class CRouterBRouterSetupPage;
+ friend class CRouterBRouterSetupWizard;
+ friend class CRouterBRouterTilesSelect;
+};
+
+#endif
diff --git a/src/gis/rte/router/brouter/CRouterBRouterSetupPage.cpp b/src/gis/rte/router/brouter/CRouterBRouterSetupPage.cpp
new file mode 100644
index 0000000..0d6c353
--- /dev/null
+++ b/src/gis/rte/router/brouter/CRouterBRouterSetupPage.cpp
@@ -0,0 +1,86 @@
+/**********************************************************************************************
+ Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#include "gis/rte/router/brouter/CRouterBRouterSetup.h"
+#include "gis/rte/router/brouter/CRouterBRouterSetupPage.h"
+#include "gis/rte/router/brouter/CRouterBRouterSetupWizard.h"
+
+CRouterBRouterSetupPage::CRouterBRouterSetupPage()
+ : QWizardPage()
+{
+}
+
+CRouterBRouterSetupPage::~CRouterBRouterSetupPage()
+{
+}
+
+bool CRouterBRouterSetupPage::isComplete() const
+{
+ switch(wizard()->currentId())
+ {
+ case CRouterBRouterSetupWizard::ePageLocalDirectory:
+ {
+ return setup != nullptr
+ && setup->isLocalBRouterInstalled()
+ && QFile(setup->localJavaExecutable).exists()
+ && QFileInfo(setup->localJavaExecutable).baseName().startsWith("java");
+ }
+
+ case CRouterBRouterSetupWizard::ePageLocalInstallation:
+ {
+ return setup != nullptr
+ && setup->isLocalBRouterInstalled();
+ }
+
+ case CRouterBRouterSetupWizard::ePageProfiles:
+ {
+ const QListView *profilesListView = findChild<QListView*>("listProfiles");
+ Q_ASSERT(profilesListView != nullptr);
+ return profilesListView->model()->rowCount() > 0;
+ }
+
+ case CRouterBRouterSetupWizard::ePageOnlineUrl:
+ {
+ return complete;
+ }
+
+ case CRouterBRouterSetupWizard::ePageLocalDetails:
+ {
+ return complete;
+ }
+
+ default:
+ {
+ return false;
+ }
+ }
+}
+
+void CRouterBRouterSetupPage::setComplete(bool newComplete)
+{
+ if (newComplete != complete)
+ {
+ complete = newComplete;
+ emit completeChanged();
+ }
+}
+
+void CRouterBRouterSetupPage::emitCompleteChanged()
+{
+ emit completeChanged();
+}
diff --git a/src/gis/rte/router/CRouterRoutinoPathSetup.h b/src/gis/rte/router/brouter/CRouterBRouterSetupPage.h
similarity index 59%
copy from src/gis/rte/router/CRouterRoutinoPathSetup.h
copy to src/gis/rte/router/brouter/CRouterBRouterSetupPage.h
index 5f3c2e6..9618267 100644
--- a/src/gis/rte/router/CRouterRoutinoPathSetup.h
+++ b/src/gis/rte/router/brouter/CRouterBRouterSetupPage.h
@@ -1,5 +1,5 @@
/**********************************************************************************************
- Copyright (C) 2014-2015 Oliver Eichler oliver.eichler at gmx.de
+ Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,31 +16,31 @@
**********************************************************************************************/
-#ifndef CROUTERROUTINOPATHSETUP_H
-#define CROUTERROUTINOPATHSETUP_H
+#ifndef CROUTERBROUTERSETUPPAGE_H
+#define CROUTERBROUTERSETUPPAGE_H
-#include "ui_IRouterRoutinoPathSetup.h"
-#include <QDialog>
+#include <QWizardPage>
-class CRouterRoutinoPathSetup : public QDialog, private Ui::IRouterRoutinoPathSetup
+class CRouterBRouterSetup;
+
+class CRouterBRouterSetupPage : public QWizardPage
{
Q_OBJECT
public:
- CRouterRoutinoPathSetup(QStringList& paths);
- virtual ~CRouterRoutinoPathSetup();
+ CRouterBRouterSetupPage();
+ virtual ~CRouterBRouterSetupPage();
-public slots:
- void accept() override;
+ bool isComplete() const override;
-private slots:
- void slotAddPath();
- void slotDelPath();
- void slotItemSelectionChanged();
+ void setSetup(CRouterBRouterSetup * newSetup) { setup = newSetup; }
+ void setComplete(bool newComplete);
+ void emitCompleteChanged();
private:
- QStringList& paths;
+ CRouterBRouterSetup * setup { nullptr };
+ bool complete { false };
};
-#endif //CROUTERROUTINOPATHSETUP_H
+#endif //CROUTERBROUTERTILESPAGE_H
diff --git a/src/gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp b/src/gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp
new file mode 100644
index 0000000..d0013da
--- /dev/null
+++ b/src/gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp
@@ -0,0 +1,968 @@
+/**********************************************************************************************
+ Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#include "CMainWindow.h"
+#include "canvas/CCanvas.h"
+#include "gis/rte/router/brouter/CRouterBRouterSetup.h"
+#include "gis/rte/router/brouter/CRouterBRouterSetupWizard.h"
+#include "setup/IAppSetup.h"
+#include <JlCompress.h>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <proj_api.h>
+
+CRouterBRouterSetupWizard::CRouterBRouterSetupWizard()
+ : QWizard(CMainWindow::getBestWidgetForParent())
+{
+ setupUi(this);
+
+ setup = new CRouterBRouterSetup(this);
+
+ setButtonText(QWizard::CustomButton1, tr("Restore Default Values"));
+ connect(this, &CRouterBRouterSetupWizard::currentIdChanged, this, &CRouterBRouterSetupWizard::slotCurrentIdChanged);
+ connect(this, &CRouterBRouterSetupWizard::customButtonClicked, this, &CRouterBRouterSetupWizard::slotCustomButtonClicked);
+
+ connect(radioLocal, &QRadioButton::clicked, this, &CRouterBRouterSetupWizard::slotRadioLocalClicked);
+ connect(radioOnline, &QRadioButton::clicked, this, &CRouterBRouterSetupWizard::slotRadioOnlineClicked);
+ connect(checkExpert, &QCheckBox::clicked, this, &CRouterBRouterSetupWizard::slotCheckExpertClicked);
+
+ connect(lineLocalProfilesUrl, &QLineEdit::cursorPositionChanged, this, &CRouterBRouterSetupWizard::slotLocalProfilesUrlCursorPositionChanged);
+ connect(lineLocalProfilesUrl, &QLineEdit::editingFinished, this, &CRouterBRouterSetupWizard::slotLocalProfilesUrlEditingFinished);
+ connect(toolLocalDir, &QToolButton::clicked, this, &CRouterBRouterSetupWizard::slotLocalToolSelectDirectory);
+ connect(toolJavaExecutable, &QToolButton::clicked, this, &CRouterBRouterSetupWizard::slotLocalToolSelectJava);
+ connect(pushLocalFindJava, &QPushButton::clicked, this, &CRouterBRouterSetupWizard::slotLocalPushFindJava);
+ connect(lineLocalDir, &QLineEdit::cursorPositionChanged, this, &CRouterBRouterSetupWizard::slotLocalDirectoryCursonPositionChanged);
+ connect(lineJavaExecutable, &QLineEdit::cursorPositionChanged, this, &CRouterBRouterSetupWizard::slotLocalJavaExecutableCursorPositionChanged);
+
+ connect(pushCreateOrUpdateLocalInstall, &QPushButton::clicked, this, &CRouterBRouterSetupWizard::slotCreateOrUpdateLocalInstallClicked);
+
+ connect(pushLocalInstall, &QPushButton::clicked, this, &CRouterBRouterSetupWizard::slotLocalDownloadButtonClicked);
+
+ connect(listProfiles, &QListView::clicked, this, &CRouterBRouterSetupWizard::slotProfileClicked);
+ connect(listAvailableProfiles, &QListView::clicked, this, &CRouterBRouterSetupWizard::slotAvailableProfileClicked);
+ connect(toolAddProfile, &QToolButton::clicked, this, &CRouterBRouterSetupWizard::slotAddProfileClicked);
+ connect(toolDeleteProfile, &QToolButton::clicked, this, &CRouterBRouterSetupWizard::slotDelProfileClicked);
+ connect(toolProfileUp, &QToolButton::clicked, this, &CRouterBRouterSetupWizard::slotProfileUpClicked);
+ connect(toolProfileDown, &QToolButton::clicked, this, &CRouterBRouterSetupWizard::slotProfileDownClicked);
+
+ connect(lineOnlineUrl, &QLineEdit::cursorPositionChanged, this, &CRouterBRouterSetupWizard::slotOnlineUrlCursorPositionChanged);
+ connect(lineOnlineUrl, &QLineEdit::editingFinished, this, &CRouterBRouterSetupWizard::slotOnlineUrlEditingFinished);
+
+ connect(setup, &CRouterBRouterSetup::sigOnlineConfigLoaded, this, &CRouterBRouterSetupWizard::slotOnlineConfigLoaded);
+ connect(setup, &CRouterBRouterSetup::sigDisplayOnlineProfileFinished, this, &CRouterBRouterSetupWizard::slotDisplayProfile);
+ connect(setup, &CRouterBRouterSetup::sigProfilesChanged, this, &CRouterBRouterSetupWizard::slotOnlineProfilesLoaded);
+ connect(setup, &CRouterBRouterSetup::sigError, this, &CRouterBRouterSetupWizard::slotSetupError);
+
+ QStringListModel *profilesModel = new QStringListModel();
+ listProfiles->setModel(profilesModel);
+
+ QStringListModel *availableProfiles = new QStringListModel();
+ listAvailableProfiles->setModel(availableProfiles);
+
+ networkAccessManager = new QNetworkAccessManager(this);
+ connect(networkAccessManager, &QNetworkAccessManager::finished, this, &CRouterBRouterSetupWizard::slotLocalDownloadButtonFinished);
+
+ setup->load();
+}
+
+CRouterBRouterSetupWizard::~CRouterBRouterSetupWizard()
+{
+}
+
+int CRouterBRouterSetupWizard::nextId() const
+{
+ switch(currentId())
+ {
+ case ePageChooseMode:
+ {
+ if (setup->installMode == CRouterBRouterSetup::eModeLocal)
+ {
+ return ePageLocalDirectory;
+ }
+ if (setup->expertMode) //ModeOnline
+ {
+ return ePageOnlineUrl;
+ }
+ return ePageProfiles;
+ }
+
+ case ePageLocalDirectory:
+ {
+ if (setup->expertMode)
+ {
+ return ePageOnlineUrl;
+ }
+ if (doLocalInstall)
+ {
+ return ePageLocalInstallation;
+ }
+ return ePageProfiles;
+ }
+
+ case ePageLocalInstallation:
+ {
+ if (setup->expertMode)
+ {
+ return ePageLocalDetails;
+ }
+ return ePageProfiles;
+ }
+
+ case ePageProfiles:
+ {
+ if (setup->installMode == CRouterBRouterSetup::eModeLocal)
+ {
+ return ePageLocalTiles;
+ }
+ break;
+ }
+
+ case ePageLocalTiles:
+ {
+ break;
+ }
+
+ case ePageOnlineDetails:
+ {
+ return ePageProfiles;
+ }
+
+ case ePageOnlineUrl:
+ {
+ if (setup->installMode == CRouterBRouterSetup::eModeLocal)
+ {
+ if (doLocalInstall)
+ {
+ return ePageLocalInstallation;
+ }
+ if (setup->expertMode)
+ {
+ return ePageLocalDetails;
+ }
+ return ePageProfiles;
+ }
+ else if (setup->installMode == CRouterBRouterSetup::eModeOnline)
+ {
+ return ePageOnlineDetails;
+ }
+ break;
+ }
+
+ case ePageLocalDetails:
+ {
+ return ePageProfiles;
+ }
+ }
+
+ return -1;
+}
+
+void CRouterBRouterSetupWizard::initializePage(const int id)
+{
+ switch(id)
+ {
+ case ePageLocalDirectory:
+ {
+ initLocalDirectory();
+ break;
+ }
+
+ case ePageLocalInstallation:
+ {
+ initLocalInstall();
+ break;
+ }
+
+ case ePageLocalTiles:
+ {
+ initLocalTiles();
+ break;
+ }
+ }
+}
+
+bool CRouterBRouterSetupWizard::validateCurrentPage()
+{
+ switch(currentId())
+ {
+ case ePageOnlineDetails:
+ {
+ return validateOnlineDetails();
+ }
+
+ case ePageLocalDetails:
+ {
+ return validateLocalDetails();
+ }
+ }
+
+ return true;
+}
+
+void CRouterBRouterSetupWizard::slotCurrentIdChanged(const int id)
+{
+ switch(id)
+ {
+ case ePageChooseMode:
+ {
+ beginChooseMode();
+ break;
+ }
+
+ case ePageLocalDirectory:
+ {
+ beginLocalDirectory();
+ break;
+ }
+
+ case ePageLocalInstallation:
+ {
+ beginLocalInstall();
+ break;
+ }
+
+ case ePageProfiles:
+ {
+ beginProfiles();
+ break;
+ }
+
+ case ePageLocalTiles:
+ {
+ beginLocalTiles();
+ break;
+ }
+
+ case ePageOnlineDetails:
+ {
+ beginOnlineDetails();
+ break;
+ }
+
+ case ePageOnlineUrl:
+ {
+ beginOnlineUrl();
+ break;
+ }
+
+ case ePageLocalDetails:
+ {
+ beginLocalDetails();
+ break;
+ }
+ }
+}
+
+void CRouterBRouterSetupWizard::slotCustomButtonClicked(const int id)
+{
+ if (id == QWizard::CustomButton1)
+ {
+ const int page = currentId();
+ switch (page)
+ {
+ case ePageOnlineDetails:
+ {
+ resetOnlineDetails();
+ break;
+ }
+
+ case ePageOnlineUrl:
+ {
+ resetOnlineUrl();
+ break;
+ }
+
+ case ePageLocalDetails:
+ {
+ resetLocalDetails();
+ break;
+ }
+ }
+ }
+}
+
+void CRouterBRouterSetupWizard::accept()
+{
+ setup->save();
+ QDialog::accept();
+}
+
+void CRouterBRouterSetupWizard::reject()
+{
+ if (!pageLocalTiles->isComplete())
+ {
+ if (pageLocalTiles->raiseWarning())
+ {
+ return;
+ }
+ }
+ QDialog::reject();
+}
+
+void CRouterBRouterSetupWizard::beginChooseMode()
+{
+ switch(setup->installMode)
+ {
+ case CRouterBRouterSetup::eModeLocal:
+ {
+ radioLocal->setChecked(true);
+ radioOnline->setChecked(false);
+ break;
+ }
+
+ case CRouterBRouterSetup::eModeOnline:
+ {
+ radioLocal->setChecked(false);
+ radioOnline->setChecked(true);
+ break;
+ }
+ }
+
+ checkExpert->setChecked(setup->expertMode);
+ setOption(QWizard::HaveCustomButton1, false);
+}
+
+void CRouterBRouterSetupWizard::slotRadioLocalClicked() const
+{
+ setup->installMode = CRouterBRouterSetup::eModeLocal;
+}
+
+void CRouterBRouterSetupWizard::slotRadioOnlineClicked() const
+{
+ setup->installMode = CRouterBRouterSetup::eModeOnline;
+}
+
+void CRouterBRouterSetupWizard::slotCheckExpertClicked() const
+{
+ setup->expertMode = checkExpert->isChecked();
+}
+
+void CRouterBRouterSetupWizard::initLocalDirectory()
+{
+ pageLocalDirectory->setSetup(setup);
+}
+
+void CRouterBRouterSetupWizard::beginLocalDirectory()
+{
+ updateLocalDirectory();
+ doLocalInstall = false;
+ setOption(QWizard::HaveCustomButton1, false);
+}
+
+void CRouterBRouterSetupWizard::slotLocalToolSelectDirectory()
+{
+ setup->localDir = QFileDialog::getExistingDirectory(this, tr("Open Directory"),"", QFileDialog::ShowDirsOnly);
+ updateLocalDirectory();
+}
+
+void CRouterBRouterSetupWizard::slotLocalToolSelectJava()
+{
+ QFileDialog dialog(this,
+ tr("select Java Executable"),
+ QFileInfo(setup->localJavaExecutable).absolutePath(),
+ "Java Executable (java*)");
+ dialog.setFileMode(QFileDialog::ExistingFile);
+ if (dialog.exec())
+ {
+ setup->localJavaExecutable = dialog.selectedFiles().first();
+ updateLocalDirectory();
+ }
+}
+
+void CRouterBRouterSetupWizard::slotLocalPushFindJava() const
+{
+ setup->localJavaExecutable = setup->findJava();
+ updateLocalDirectory();
+}
+
+void CRouterBRouterSetupWizard::slotLocalDirectoryCursonPositionChanged() const
+{
+ setup->localDir = lineLocalDir->text();
+ updateLocalDirectory();
+}
+
+void CRouterBRouterSetupWizard::slotLocalJavaExecutableCursorPositionChanged() const
+{
+ setup->localJavaExecutable = lineJavaExecutable->text();
+ updateLocalDirectory();
+}
+
+void CRouterBRouterSetupWizard::updateLocalDirectory() const
+{
+ textLocalDirectory->setVisible(false);
+ lineLocalDir->setText(setup->localDir);
+ lineJavaExecutable->setText(setup->localJavaExecutable);
+ if (setup->localDir.isEmpty())
+ {
+ labelLocalDirResult->setText(tr("please select BRouter installation directory"));
+ pushCreateOrUpdateLocalInstall->setVisible(false);
+ }
+ else if(!QDir(setup->localDir).exists())
+ {
+ labelLocalDirResult->setText(tr("selected directory does not exist"));
+ pushCreateOrUpdateLocalInstall->setText(tr("create directory and install BRouter there"));
+ pushCreateOrUpdateLocalInstall->setVisible(true);
+ }
+ else
+ {
+ if (setup->isLocalBRouterInstalled())
+ {
+ labelLocalDirResult->setText(tr("existing BRouter installation"));
+ pushCreateOrUpdateLocalInstall->setText(tr("update existing BRouter installation"));
+ pushCreateOrUpdateLocalInstall->setVisible(true);
+ }
+ else
+ {
+ labelLocalDirResult->setText(tr("empty directory, create new BRouter installation here"));
+ pushCreateOrUpdateLocalInstall->setText(tr("create new BRouter installation"));
+ pushCreateOrUpdateLocalInstall->setVisible(true);
+ }
+ }
+ if (QFile(setup->localJavaExecutable).exists())
+ {
+ if (QFileInfo(setup->localJavaExecutable).baseName().startsWith("java"))
+ {
+ labelLocalJavaResult->setText(tr("seems to be a valid Java-executable"));
+ }
+ else
+ {
+ labelLocalJavaResult->setText(tr("doesn't seem to be a valid Java-executable"));
+ }
+ }
+ else
+ {
+ labelLocalJavaResult->setText(tr("Java Executable not found"));
+ labelLocalJavaResult->setVisible(true);
+ }
+ pageLocalDirectory->emitCompleteChanged();
+}
+
+void CRouterBRouterSetupWizard::slotCreateOrUpdateLocalInstallClicked()
+{
+ QDir outDir(setup->localDir);
+ try
+ {
+ if(!outDir.exists())
+ {
+ if (!outDir.mkpath(outDir.absolutePath()))
+ {
+ throw tr("Error creating directory %1").arg(outDir.absolutePath());
+ }
+ }
+ doLocalInstall = true;
+ next();
+ }
+ catch (const QString &msg)
+ {
+ textLocalDirectory->setVisible(true);
+ textLocalDirectory->setTextColor(Qt::red);
+ textLocalDirectory->append(msg);
+ }
+}
+
+void CRouterBRouterSetupWizard::initLocalInstall()
+{
+ pageLocalInstallation->setSetup(setup);
+ connect(webLocalBRouterVersions, &QWebView::loadFinished, this, &CRouterBRouterSetupWizard::slotWebLocalBRouterVersionsLoadFinished);
+ webLocalBRouterVersions->load(QUrl(setup->binariesUrl));
+ QWebPage *localVersionsPage = webLocalBRouterVersions->page();
+ localVersionsPage->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
+ connect(localVersionsPage, &QWebPage::linkClicked, this, &CRouterBRouterSetupWizard::slotLocalDownloadLinkClicked);
+}
+
+void CRouterBRouterSetupWizard::slotWebLocalBRouterVersionsLoadFinished(bool ok)
+{
+ if (!ok)
+ {
+ textLocalInstall->setVisible(true);
+ textLocalInstall->setTextColor(Qt::red);
+ textLocalInstall->append(tr("Error loading installation-page at %1").arg(setup->binariesUrl));
+ }
+}
+
+void CRouterBRouterSetupWizard::beginLocalInstall()
+{
+ doLocalInstall = false;
+ textLocalInstall->setVisible(false);
+ textLocalInstall->clear();
+ labelLocalInstallLink->setText(tr("no brouter-version to install selected"));
+ pushLocalInstall->setEnabled(false);
+ setOption(QWizard::HaveCustomButton1, false);
+}
+
+void CRouterBRouterSetupWizard::slotLocalDownloadLinkClicked(const QUrl &url)
+{
+ downloadUrl = url;
+ labelLocalInstallLink->setText(QString(tr("selected %1 for download and installation")).arg(url.fileName()));
+ pushLocalInstall->setEnabled(true);
+}
+
+void CRouterBRouterSetupWizard::slotLocalDownloadButtonClicked()
+{
+ const QString& strUrl = downloadUrl.toString();
+
+ if(!strUrl.startsWith("https"))
+ {
+ QMessageBox mbox;
+ mbox.setWindowTitle(tr("Warning..."));
+ mbox.setIcon(QMessageBox::Warning);
+ mbox.setStandardButtons(QMessageBox::Ok|QMessageBox::Abort);
+ mbox.setDefaultButton(QMessageBox::Abort);
+
+ QString msg = tr("Download: %1<br/>"
+ "<br/>"
+ "This will download and install a zip file from a download location that is not secured "
+ "by any standard at all, using plain HTTP. Usually this should be HTTPS. The risk is "
+ "someone redirecting the request and sending you a replacement zip with malware. There "
+ "is no way for QMapShack to detect this. <br/>"
+ "If you do not understand this or if you are in doubt, do not proceed and abort. "
+ "Use the Web version of BRouter instead."
+ ).arg(strUrl);
+
+ mbox.setText(msg);
+
+ QCheckBox * checkAgree = new QCheckBox(tr("I understand the risk and wish to proceed."), &mbox);
+ mbox.setCheckBox(checkAgree);
+ connect(checkAgree, &QCheckBox::clicked, mbox.button(QMessageBox::Ok), &QPushButton::setEnabled);
+ mbox.button(QMessageBox::Ok)->setDisabled(true);
+
+ if(mbox.exec() != QMessageBox::Ok)
+ {
+ return;
+ }
+ }
+ textLocalInstall->setVisible(true);
+ textLocalInstall->setTextColor(Qt::darkGreen);
+ textLocalInstall->append(tr("download %1 started").arg(downloadUrl.toString()));
+ QNetworkReply * reply = networkAccessManager->get(QNetworkRequest(downloadUrl));
+ reply->setProperty("fileName",downloadUrl.fileName());
+}
+
+void CRouterBRouterSetupWizard::slotLocalDownloadButtonFinished(QNetworkReply * reply)
+{
+ reply->deleteLater();
+ try
+ {
+ if (reply->error() != QNetworkReply::NoError)
+ {
+ throw tr("Network Error: %1").arg(reply->errorString());
+ }
+ const QString &fileName = reply->property("fileName").toString();
+ QDir outDir(setup->localDir);
+ if (!outDir.exists())
+ {
+ throw tr("Error directory %1 does not exist").arg(outDir.absolutePath());
+ }
+ QFile outfile(outDir.absoluteFilePath(fileName));
+ try
+ {
+ if (!outfile.open(QIODevice::WriteOnly))
+ {
+ throw tr("Error creating file %1").arg(outfile.fileName());
+ }
+ if (outfile.write(reply->readAll()) < 0)
+ {
+ throw tr("Error writing to file %1").arg(outfile.fileName());
+ }
+ outfile.close();
+ textLocalInstall->setTextColor(Qt::darkGreen);
+ textLocalInstall->append(tr("download %1 finished").arg(outfile.fileName()));
+ const QStringList &unzippedNames = JlCompress::extractDir(outfile.fileName(),setup->localDir);
+ textLocalInstall->append(tr("unzipping:"));
+ for (const QString unzipped : unzippedNames)
+ {
+ textLocalInstall->append(unzipped);
+ }
+ textLocalInstall->append(tr("ready."));
+ pageLocalInstallation->emitCompleteChanged();
+ setup->readLocalProfiles();
+ }
+ catch (const QString &msg)
+ {
+ if (outfile.isOpen())
+ {
+ outfile.close();
+ }
+ if (outfile.exists())
+ {
+ outfile.remove();
+ }
+ throw msg;
+ }
+ }
+ catch (const QString &msg)
+ {
+ textLocalInstall->setTextColor(Qt::red);
+ textLocalInstall->append(tr("download of brouter failed: %1").arg(msg));
+ }
+}
+
+void CRouterBRouterSetupWizard::beginProfiles()
+{
+ isError = false;
+ updateProfiles();
+ if (setup->installMode == CRouterBRouterSetup::eModeLocal)
+ {
+ textProfileContent->setText(tr("retrieving available profiles from %1").arg(setup->onlineProfilesUrl));
+ setup->loadLocalOnlineProfiles();
+ setup->readLocalProfiles();
+ }
+ else
+ {
+ Q_ASSERT(setup->installMode == CRouterBRouterSetup::eModeOnline);
+ textProfileContent->setText(tr("retrieving available profiles from %1").arg(setup->onlineWebUrl));
+ setup->loadOnlineConfig();
+ }
+ setOption(QWizard::HaveCustomButton1, false);
+}
+
+void CRouterBRouterSetupWizard::slotProfileClicked(const QModelIndex & index) const
+{
+ const QString &profile = listProfiles->model()->data(index).toString();
+ listAvailableProfiles->clearSelection();
+ updateProfiles();
+ setup->displayProfileAsync(profile);
+}
+
+void CRouterBRouterSetupWizard::slotAvailableProfileClicked(const QModelIndex & index) const
+{
+ const QString &profile = listAvailableProfiles->model()->data(index).toString();
+ listProfiles->clearSelection();
+ updateProfiles();
+ setup->displayOnlineProfileAsync(profile);
+}
+
+void CRouterBRouterSetupWizard::slotDisplayProfile(const QString &profile, const QString content)
+{
+ labelProfileContent->setText(tr("content of profile"));
+ textProfileContent->setText(content);
+}
+
+void CRouterBRouterSetupWizard::slotAddProfileClicked() const
+{
+ for (const QString &profile : selectedProfiles(listAvailableProfiles))
+ {
+ setup->addProfile(profile);
+ }
+}
+
+void CRouterBRouterSetupWizard::slotDelProfileClicked() const
+{
+ for (const QString &profile : selectedProfiles(listProfiles))
+ {
+ setup->deleteProfile(profile);
+ }
+}
+
+void CRouterBRouterSetupWizard::slotProfileUpClicked() const
+{
+ for (const QString &profile : selectedProfiles(listProfiles))
+ {
+ setup->profileUp(profile);
+ }
+}
+
+void CRouterBRouterSetupWizard::slotProfileDownClicked() const
+{
+ for (const QString &profile : selectedProfiles(listProfiles))
+ {
+ setup->profileDown(profile);
+ }
+}
+
+void CRouterBRouterSetupWizard::slotOnlineProfilesLoaded()
+{
+ isError = false;
+ switch(currentId())
+ {
+ case ePageProfiles:
+ {
+ updateProfiles();
+ break;
+ }
+
+ case ePageLocalDetails:
+ {
+ updateLocalDetails();
+ break;
+ }
+ }
+}
+
+void CRouterBRouterSetupWizard::updateProfiles() const
+{
+ const QStringList &profiles = setup->getProfiles();
+ QStringList available;
+ for(const QString &profile:setup->onlineProfilesAvailable)
+ {
+ if (!profiles.contains(profile))
+ {
+ available << profile;
+ }
+ }
+
+ QList<int> selected = updateProfileView(listProfiles, profiles);
+ qSort(selected.begin(),selected.end());
+ toolDeleteProfile->setEnabled(!selected.isEmpty());
+ toolProfileUp->setEnabled(!selected.isEmpty() && selected.first() > 0);
+ toolProfileDown->setEnabled(!selected.isEmpty() && selected.last() < profiles.size()-1);
+ if (isError)
+ {
+ toolAddProfile->setEnabled(false);
+ labelProfileContent->setText(tr("Error:"));
+ textProfileContent->setText(error + ": "+ errorDetails);
+ }
+ else
+ {
+ toolAddProfile->setEnabled(!updateProfileView(listAvailableProfiles, available).isEmpty());
+ listAvailableProfiles->setVisible(true);
+ labelProfileContent->setText(tr("content of profile"));
+ textProfileContent->clear();
+ }
+ pageProfiles->emitCompleteChanged();
+}
+
+QStringList CRouterBRouterSetupWizard::selectedProfiles(const QListView * listView) const
+{
+ const QItemSelectionModel * selectModel = listView->selectionModel();
+ const QModelIndexList &selected = selectModel->selectedIndexes();
+ const QAbstractItemModel * model = listView->model();
+ QStringList selectedList;
+ for (int i = 0; i < selected.size(); i++)
+ {
+ selectedList << model->data(selected.at(i)).toString();
+ }
+ return selectedList;
+}
+
+QList<int> CRouterBRouterSetupWizard::updateProfileView(QListView * listView, const QStringList &values) const
+{
+ QList<int> selected;
+ const QStringList &selectedValues = selectedProfiles(listView);
+ QStringListModel * listModel = (dynamic_cast<QStringListModel*>(listView->model()));
+ QItemSelectionModel * selectModel = listView->selectionModel();
+ listModel->setStringList(values);
+ for (const QString &value : selectedValues)
+ {
+ if (values.contains(value))
+ {
+ int index = values.indexOf(value);
+ selectModel->select(listModel->index(index), QItemSelectionModel::Select);
+ selected << index;
+ }
+ }
+ return selected;
+}
+
+void CRouterBRouterSetupWizard::initLocalTiles() const
+{
+ pageLocalTiles->setSetup(setup);
+}
+
+void CRouterBRouterSetupWizard::beginLocalTiles()
+{
+ pageLocalTiles->beginPage();
+ setOption(QWizard::HaveCustomButton1, false);
+}
+
+void CRouterBRouterSetupWizard::beginOnlineDetails()
+{
+ setOption(QWizard::HaveCustomButton1, true);
+ updateOnlineDetails();
+}
+
+void CRouterBRouterSetupWizard::updateOnlineDetails() const
+{
+ lineOnlineProfileUrl->setText(setup->onlineProfilesUrl);
+ lineOnlineService->setText(setup->onlineServiceUrl);
+}
+
+bool CRouterBRouterSetupWizard::validateOnlineDetails() const
+{
+ setup->onlineProfilesUrl = lineOnlineProfileUrl->text();
+ setup->onlineServiceUrl = lineOnlineService->text();
+ return true;
+}
+
+void CRouterBRouterSetupWizard::resetOnlineDetails() const
+{
+ setup->resetOnlineProfilesUrl();
+ setup->resetOnlineServiceUrl();
+
+ updateOnlineDetails();
+}
+
+void CRouterBRouterSetupWizard::beginOnlineUrl()
+{
+ setOption(QWizard::HaveCustomButton1, true);
+ isError = false;
+ pageOnlineUrl->setComplete(false);
+ setup->loadOnlineConfig();
+}
+
+void CRouterBRouterSetupWizard::slotOnlineUrlCursorPositionChanged()
+{
+ pageOnlineUrl->setComplete(false);
+}
+
+void CRouterBRouterSetupWizard::slotOnlineUrlEditingFinished()
+{
+ setup->onlineWebUrl = lineOnlineUrl->text();
+ isError = false;
+ setup->loadOnlineConfig();
+}
+
+void CRouterBRouterSetupWizard::updateOnlineUrl()
+{
+ lineOnlineUrl->setText(setup->onlineWebUrl);
+ textOnlineUrl->setVisible(isError);
+ if (isError)
+ {
+ textOnlineUrl->setText(error + ": "+ errorDetails);
+ }
+ else
+ {
+ pageOnlineUrl->setComplete(true);
+ }
+}
+
+void CRouterBRouterSetupWizard::resetOnlineUrl()
+{
+ setup->resetOnlineWebUrl();
+ beginOnlineUrl();
+}
+
+void CRouterBRouterSetupWizard::updateLocalDetails() const
+{
+ lineLocalProfilesUrl->setText(setup->onlineProfilesUrl);
+ lineLocalHost->setText(setup->localHost);
+ lineLocalPort->setText(setup->localPort);
+ lineLocalProfiles->setText(setup->localProfileDir);
+ lineLocalSegments->setText(setup->localSegmentsDir);
+ lineLocalCustomProfiles->setText(setup->localCustomProfileDir);
+ lineLocalMaxRuntime->setText(setup->localMaxRunningTime);
+ lineLocalNumberThreads->setText(setup->localNumberThreads);
+ lineLocalJavaOpts->setText(setup->localJavaOpts);
+ textLocalDetails->setVisible(isError);
+ pageLocalDetails->setComplete(!isError);
+ if (isError)
+ {
+ textLocalDetails->setText(error + ": " + errorDetails);
+ }
+}
+
+void CRouterBRouterSetupWizard::beginLocalDetails()
+{
+ setOption(QWizard::HaveCustomButton1, true);
+ isError = false;
+ setup->loadLocalOnlineProfiles();
+}
+
+void CRouterBRouterSetupWizard::slotLocalProfilesUrlCursorPositionChanged() const
+{
+ pageLocalDetails->setComplete(false);
+}
+
+void CRouterBRouterSetupWizard::slotLocalProfilesUrlEditingFinished()
+{
+ setup->onlineProfilesUrl = lineLocalProfilesUrl->text();
+ isError = false;
+ setup->loadLocalOnlineProfiles();
+}
+
+bool CRouterBRouterSetupWizard::validateLocalDetails() const
+{
+ setup->localHost = lineLocalHost->text();
+ setup->localPort = lineLocalPort->text();
+ setup->localProfileDir = lineLocalProfiles->text();
+ setup->localSegmentsDir = lineLocalSegments->text();
+ setup->localCustomProfileDir = lineLocalCustomProfiles->text();
+ setup->localMaxRunningTime = lineLocalMaxRuntime->text();
+ setup->localNumberThreads = lineLocalNumberThreads->text();
+ setup->localJavaOpts = lineLocalJavaOpts->text();
+ return true;
+}
+
+void CRouterBRouterSetupWizard::resetLocalDetails() const
+{
+ setup->resetOnlineProfilesUrl();
+ setup->resetLocalHost();
+ setup->resetLocalPort();
+ setup->resetLocalProfileDir();
+ setup->resetLocalSegmentsDir();
+ setup->resetLocalCustomProfileDir();
+ setup->resetLocalMaxRunningTime();
+ setup->resetLocalNumberThreads();
+ setup->resetLocalJavaOpts();
+ updateLocalDetails();
+}
+
+void CRouterBRouterSetupWizard::slotOnlineConfigLoaded()
+{
+ isError = false;
+ switch(currentId())
+ {
+ case ePageOnlineUrl:
+ {
+ updateOnlineUrl();
+ break;
+ }
+
+ case ePageOnlineDetails:
+ {
+ updateOnlineDetails();
+ break;
+ }
+
+ case ePageLocalDetails:
+ {
+ updateLocalDetails();
+ break;
+ }
+ }
+}
+
+void CRouterBRouterSetupWizard::slotSetupError(const QString &error, const QString &details)
+{
+ isError = true;
+ this->error = error;
+ this->errorDetails = details;
+
+ switch(currentId())
+ {
+ case ePageOnlineUrl:
+ {
+ updateOnlineUrl();
+ break;
+ }
+
+ case ePageLocalDetails:
+ {
+ updateLocalDetails();
+ break;
+ }
+
+ case ePageProfiles:
+ {
+ updateProfiles();
+ break;
+ }
+ }
+}
diff --git a/src/gis/rte/router/brouter/CRouterBRouterSetupWizard.h b/src/gis/rte/router/brouter/CRouterBRouterSetupWizard.h
new file mode 100644
index 0000000..b66a043
--- /dev/null
+++ b/src/gis/rte/router/brouter/CRouterBRouterSetupWizard.h
@@ -0,0 +1,122 @@
+/**********************************************************************************************
+ Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#ifndef CROUTERBROUTERSETUPWIZARD_H
+#define CROUTERBROUTERSETUPWIZARD_H
+
+#include "ui_IRouterBRouterSetupWizard.h"
+
+class CCanvas;
+class CRouterBRouterSetup;
+class CRouterBRouterTilesSelect;
+
+class CRouterBRouterSetupWizard : public QWizard, private Ui::IRouterBRouterSetupWizard
+{
+ Q_OBJECT
+public:
+ CRouterBRouterSetupWizard();
+ virtual ~CRouterBRouterSetupWizard();
+
+ int nextId() const override;
+ void initializePage(int id) override;
+ bool validateCurrentPage() override;
+
+ enum { ePageChooseMode, ePageLocalDirectory, ePageLocalInstallation, ePageProfiles,
+ ePageLocalTiles, ePageOnlineUrl, ePageOnlineDetails, ePageLocalDetails };
+
+public slots:
+ void accept() override;
+ void reject() override;
+
+private slots:
+ void slotCurrentIdChanged(const int id);
+ void slotCustomButtonClicked(int id);
+ void slotRadioLocalClicked() const;
+ void slotRadioOnlineClicked() const;
+ void slotCheckExpertClicked() const;
+ void slotLocalToolSelectDirectory();
+ void slotLocalToolSelectJava();
+ void slotLocalPushFindJava() const;
+ void slotCreateOrUpdateLocalInstallClicked();
+ void slotLocalDirectoryCursonPositionChanged() const;
+ void slotLocalJavaExecutableCursorPositionChanged() const;
+ void slotLocalProfilesUrlCursorPositionChanged() const;
+ void slotLocalProfilesUrlEditingFinished();
+ void slotOnlineUrlCursorPositionChanged();
+ void slotOnlineUrlEditingFinished();
+ void slotWebLocalBRouterVersionsLoadFinished(bool ok);
+ void slotLocalDownloadLinkClicked(const QUrl & url);
+ void slotLocalDownloadButtonClicked();
+ void slotLocalDownloadButtonFinished(QNetworkReply * reply);
+ void slotProfileClicked(const QModelIndex & index) const;
+ void slotAvailableProfileClicked(const QModelIndex & index) const;
+ void slotDisplayProfile(const QString &profile, const QString content);
+ void slotAddProfileClicked() const;
+ void slotDelProfileClicked() const;
+ void slotProfileUpClicked() const;
+ void slotProfileDownClicked() const;
+ void slotOnlineConfigLoaded();
+ void slotSetupError(const QString &error, const QString &details);
+ void slotOnlineProfilesLoaded();
+
+private:
+ void beginChooseMode();
+
+ void initLocalDirectory();
+ void beginLocalDirectory();
+ void updateLocalDirectory() const;
+
+ void initLocalInstall();
+ void beginLocalInstall();
+
+ void beginProfiles();
+ void updateProfiles() const;
+ QStringList selectedProfiles(const QListView * listView) const;
+ QList<int> updateProfileView(QListView * listView, const QStringList &values) const;
+
+ void initLocalTiles() const;
+ void beginLocalTiles();
+
+ void beginLocalDetails();
+ void updateLocalDetails() const;
+ bool validateLocalDetails() const;
+ void resetLocalDetails() const;
+
+ void beginOnlineDetails();
+ void updateOnlineDetails() const;
+ bool validateOnlineDetails() const;
+ void resetOnlineDetails() const;
+
+ void beginOnlineUrl();
+ void updateOnlineUrl();
+ void resetOnlineUrl();
+
+ CRouterBRouterSetup * setup;
+
+ bool doLocalInstall;
+ QUrl downloadUrl;
+
+ QNetworkAccessManager * networkAccessManager;
+
+ bool isError { false };
+ QString error;
+ QString errorDetails;
+};
+
+#endif //CROUTERBROUTERSETUPWIZARD_H
+
diff --git a/src/gis/rte/router/brouter/CRouterBRouterTilesPage.cpp b/src/gis/rte/router/brouter/CRouterBRouterTilesPage.cpp
new file mode 100644
index 0000000..f010a22
--- /dev/null
+++ b/src/gis/rte/router/brouter/CRouterBRouterTilesPage.cpp
@@ -0,0 +1,93 @@
+/**********************************************************************************************
+ Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#include "gis/rte/router/brouter/CRouterBRouterSetup.h"
+#include "gis/rte/router/brouter/CRouterBRouterTilesPage.h"
+#include "gis/rte/router/brouter/CRouterBRouterTilesSelect.h"
+#include <QMessageBox>
+#include <QVBoxLayout>
+
+CRouterBRouterTilesPage::CRouterBRouterTilesPage()
+ : QWizardPage()
+{
+ layout = new QVBoxLayout(this);
+ widgetLocalTilesSelect = new CRouterBRouterTilesSelect(this);
+ widgetLocalTilesSelect->setObjectName(QStringLiteral("widgetLocalTilesSelect"));
+ QSizePolicy sizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+ sizePolicy.setHorizontalStretch(0);
+ sizePolicy.setVerticalStretch(0);
+ sizePolicy.setHeightForWidth(widgetLocalTilesSelect->sizePolicy().hasHeightForWidth());
+ widgetLocalTilesSelect->setSizePolicy(sizePolicy);
+ layout->addWidget(widgetLocalTilesSelect);
+ connect(widgetLocalTilesSelect, &CRouterBRouterTilesSelect::sigCompleteChanged, this, &CRouterBRouterTilesPage::slotTileDownloadStatusChanged);
+}
+
+CRouterBRouterTilesPage::~CRouterBRouterTilesPage()
+{
+}
+
+bool CRouterBRouterTilesPage::isComplete() const
+{
+ return widgetLocalTilesSelect->isInitialized() && !(widgetLocalTilesSelect->isDownloading() || widgetLocalTilesSelect->isDownloadSelected());
+}
+
+void CRouterBRouterTilesPage::slotTileDownloadStatusChanged()
+{
+ emit completeChanged();
+}
+
+void CRouterBRouterTilesPage::beginPage() const
+{
+ widgetLocalTilesSelect->initialize();
+}
+
+void CRouterBRouterTilesPage::setSetup(CRouterBRouterSetup * setup) const
+{
+ widgetLocalTilesSelect->setSetup(setup);
+}
+
+bool CRouterBRouterTilesPage::raiseWarning() const
+{
+ QMessageBox msgBox;
+ msgBox.setIcon(QMessageBox::Warning);
+ if (widgetLocalTilesSelect->isDownloading())
+ {
+ msgBox.setText("Download of routing data is in progress.");
+ }
+ else if (widgetLocalTilesSelect->isDownloadSelected())
+ {
+ msgBox.setText("You did not yet download the selected routing data.");
+ }
+ else
+ {
+ return false;
+ }
+ msgBox.setInformativeText("Do you want to cancel or continue with setup");
+ msgBox.setStandardButtons(QMessageBox::Cancel);
+ QPushButton *continueButton = msgBox.addButton(tr("Continue with Setup"), QMessageBox::NoRole);
+ msgBox.exec();
+ if (msgBox.clickedButton() == continueButton)
+ {
+ return true;
+ }
+ else
+ {
+ widgetLocalTilesSelect->cancelDownload();
+ return false;
+ }
+}
diff --git a/src/gis/rte/router/CRouterRoutinoPathSetup.h b/src/gis/rte/router/brouter/CRouterBRouterTilesPage.h
similarity index 57%
copy from src/gis/rte/router/CRouterRoutinoPathSetup.h
copy to src/gis/rte/router/brouter/CRouterBRouterTilesPage.h
index 5f3c2e6..e185791 100644
--- a/src/gis/rte/router/CRouterRoutinoPathSetup.h
+++ b/src/gis/rte/router/brouter/CRouterBRouterTilesPage.h
@@ -1,5 +1,5 @@
/**********************************************************************************************
- Copyright (C) 2014-2015 Oliver Eichler oliver.eichler at gmx.de
+ Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,31 +16,35 @@
**********************************************************************************************/
-#ifndef CROUTERROUTINOPATHSETUP_H
-#define CROUTERROUTINOPATHSETUP_H
+#ifndef CROUTERBROUTERTILESPAGE_H
+#define CROUTERBROUTERTILESPAGE_H
-#include "ui_IRouterRoutinoPathSetup.h"
-#include <QDialog>
+#include <QVBoxLayout>
+#include <QWizardPage>
-class CRouterRoutinoPathSetup : public QDialog, private Ui::IRouterRoutinoPathSetup
+class CRouterBRouterTilesSelect;
+class CRouterBRouterSetup;
+
+class CRouterBRouterTilesPage : public QWizardPage
{
Q_OBJECT
public:
- CRouterRoutinoPathSetup(QStringList& paths);
- virtual ~CRouterRoutinoPathSetup();
+ CRouterBRouterTilesPage();
+ virtual ~CRouterBRouterTilesPage();
-public slots:
- void accept() override;
+ bool isComplete() const override;
-private slots:
- void slotAddPath();
- void slotDelPath();
- void slotItemSelectionChanged();
+ void setSetup(CRouterBRouterSetup * setup) const;
+ void beginPage() const;
+ bool raiseWarning() const;
+private slots:
+ void slotTileDownloadStatusChanged();
private:
- QStringList& paths;
+ QVBoxLayout * layout;
+ CRouterBRouterTilesSelect * widgetLocalTilesSelect;
};
-#endif //CROUTERROUTINOPATHSETUP_H
+#endif //CROUTERBROUTERTILESPAGE_H
diff --git a/src/gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp b/src/gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp
new file mode 100644
index 0000000..f8147ce
--- /dev/null
+++ b/src/gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp
@@ -0,0 +1,811 @@
+/**********************************************************************************************
+ Copyright (C) 2014-2015 Oliver Eichler oliver.eichler at gmx.de
+ Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#include "CMainWindow.h"
+#include "canvas/CCanvas.h"
+#include "gis/rte/router/brouter/CRouterBRouterSetup.h"
+#include "gis/rte/router/brouter/CRouterBRouterTilesSelect.h"
+#include "gis/rte/router/brouter/CRouterBRouterTilesSelectArea.h"
+#include "gis/rte/router/brouter/CRouterBRouterTilesSelectLayout.h"
+#include "gis/rte/router/brouter/CRouterBRouterTilesStatus.h"
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QWebElement>
+#include <QWebFrame>
+
+const QPoint CRouterBRouterTilesSelect::noTile = QPoint(INT_MIN, INT_MIN);
+const int CRouterBRouterTilesSelect::minTileLat = -180;
+const int CRouterBRouterTilesSelect::maxTileLat = 180;
+const int CRouterBRouterTilesSelect::minTileLon = -85;
+const int CRouterBRouterTilesSelect::maxTileLon = 85;
+const int CRouterBRouterTilesSelect::tileSize = 5;
+
+CRouterBRouterTilesSelect::CRouterBRouterTilesSelect(QWidget *parent)
+ : QWidget(parent)
+{
+ for (int x = minTileLat; x < maxTileLat; x += tileSize)
+ {
+ for (int y = minTileLon; y < maxTileLon; y += tileSize)
+ {
+ CRouterBRouterTilesStatus * status = new CRouterBRouterTilesStatus(this);
+ tilesDownloadStatus.insert(fileNameFromTile(QPoint(x,y)),status);
+ }
+ }
+
+ outerLayout = new QVBoxLayout(this);
+ outerLayout->setContentsMargins(0,0,0,0);
+ widgetSelect = new QWidget(this);
+ widgetSelect->setSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::MinimumExpanding);
+ outerLayout->addWidget(widgetSelect);
+ widgetSelect->show();
+
+ QTemporaryFile temp;
+ temp.open();
+ temp.close();
+
+ QSettings view(temp.fileName(), QSettings::IniFormat);
+ view.clear();
+
+ CCanvas * source = CMainWindow::self().getVisibleCanvas();
+ if(source)
+ {
+ source->saveConfig(view);
+ }
+ view.setValue("map/zoomIndex",16);
+ view.setValue("scales",1);
+ view.setValue("proj","+proj=merc");
+ view.setValue("grid/proj","+proj=longlat +datum=WGS84 +no_defs");
+
+ CCanvas * canvas = new CCanvas(widgetSelect,"BRouterTileDownload");
+ // clone canvas by a temporary configuration file
+
+ canvas->loadConfig(view);
+
+ selectArea = new CRouterBRouterTilesSelectArea(widgetSelect,canvas);
+
+ QLayout * selectLayout = new CRouterBRouterTilesSelectLayout(widgetSelect);
+ selectLayout->addWidget(canvas);
+ selectLayout->addWidget(selectArea);
+ canvas->lower();
+ canvas->show();
+ selectArea->show();
+
+ QHBoxLayout * statusLayout = new QHBoxLayout();
+ outerLayout->addLayout(statusLayout);
+
+ statusLabel = new QLabel(this);
+ statusProgress = new QProgressBar(this);
+
+ statusLayout->addWidget(statusLabel);
+ statusLayout->addWidget(statusProgress);
+
+ statusLabel->setText(tr("available routing-data is being determined."));
+ statusProgress->setVisible(false);
+
+ errorLabel = new QLabel(this);
+ outerLayout->addWidget(errorLabel);
+ errorLabel->setVisible(false);
+
+ QHBoxLayout * buttonsLayout = new QHBoxLayout();
+ outerLayout->addLayout(buttonsLayout);
+
+ pushSelectOutdated = new QPushButton(tr("Select outdated"), this);
+ pushClearSelection = new QPushButton(tr("Clear Selection"), this);
+ pushDeleteSelection = new QPushButton(tr("Delete selection"), this);
+ pushDownload = new QPushButton(tr("Download"), this);
+
+ buttonsLayout->addWidget(pushSelectOutdated);
+ buttonsLayout->addWidget(pushClearSelection);
+ buttonsLayout->addWidget(pushDeleteSelection);
+ buttonsLayout->addWidget(pushDownload);
+
+ tilesDownloadManager = new QNetworkAccessManager(this);
+
+ tilesWebPage = new QWebPage(this);
+
+ connect(pushClearSelection, &QPushButton::clicked, this, &CRouterBRouterTilesSelect::slotClearSelection);
+ connect(pushDeleteSelection, &QPushButton::clicked, this, &CRouterBRouterTilesSelect::slotDeleteSelected);
+ connect(pushSelectOutdated, &QPushButton::clicked, this, &CRouterBRouterTilesSelect::slotSelectOutdated);
+ connect(pushDownload, &QPushButton::clicked, this, &CRouterBRouterTilesSelect::slotDownload);
+ connect(selectArea, &CRouterBRouterTilesSelectArea::sigTileClicked, this, &CRouterBRouterTilesSelect::slotTileClicked);
+ connect(selectArea, &CRouterBRouterTilesSelectArea::sigTileToolTipChanged, this, &CRouterBRouterTilesSelect::slotTileToolTipChanged);
+ connect(tilesWebPage, &QWebPage::loadFinished, this, &CRouterBRouterTilesSelect::slotLoadOnlineTilesRequestFinished);
+ connect(tilesDownloadManager, &QNetworkAccessManager::finished, this, &CRouterBRouterTilesSelect::slotDownloadFinished);
+}
+
+CRouterBRouterTilesSelect::~CRouterBRouterTilesSelect()
+{
+}
+
+void CRouterBRouterTilesSelect::setSetup(CRouterBRouterSetup * setup)
+{
+ this->setup = setup;
+}
+
+void CRouterBRouterTilesSelect::slotTileClicked(const QPoint &tile)
+{
+ CRouterBRouterTilesStatus * status = getTileStatus(tile);
+ if (status->isLocal || status->isRemote)
+ {
+ status->isSelected = !status->isSelected;
+ update();
+ }
+}
+
+void CRouterBRouterTilesSelect::slotSelectOutdated()
+{
+ bool changed(false);
+
+ for (QHash<QString,CRouterBRouterTilesStatus * >::const_iterator it = tilesDownloadStatus.constBegin();
+ it != tilesDownloadStatus.constEnd();
+ ++it)
+ {
+ CRouterBRouterTilesStatus * status = it.value();
+ if (!status->isSelected && status->isOutdated)
+ {
+ changed = true;
+ status->isSelected = true;
+ }
+ }
+ if (changed)
+ {
+ update();
+ }
+}
+
+void CRouterBRouterTilesSelect::slotDeleteSelected()
+{
+ bool changed(false);
+
+ for (QHash<QString,CRouterBRouterTilesStatus * >::const_iterator it = tilesDownloadStatus.constBegin();
+ it != tilesDownloadStatus.constEnd();
+ ++it)
+ {
+ CRouterBRouterTilesStatus * status = it.value();
+ if (status->isSelected)
+ {
+ status->isSelected = false;
+ changed = true;
+ if (status->isLocal)
+ {
+ QFile segment(segmentsDir().absoluteFilePath(it.key()));
+ if (!segment.remove())
+ {
+ error(tr("Error removing %1: %2")
+ .arg(segment.fileName())
+ .arg(segment.errorString()));
+ break;
+ }
+ status->isLocal = false;
+ }
+ }
+ }
+ if (changed)
+ {
+ update();
+ }
+}
+
+void CRouterBRouterTilesSelect::slotClearSelection()
+{
+ bool changed(false);
+ for (QHash<QString,CRouterBRouterTilesStatus * >::const_iterator it = tilesDownloadStatus.constBegin();
+ it != tilesDownloadStatus.constEnd();
+ ++it)
+ {
+ CRouterBRouterTilesStatus * status = it.value();
+ if (status->isSelected)
+ {
+ changed = true;
+ status->isSelected = false;
+ }
+ }
+ if (changed)
+ {
+ update();
+ }
+}
+
+void CRouterBRouterTilesSelect::updateButtons() const
+{
+ bool hasSelected(false);
+ bool hasLocalSelected(false);
+ bool hasUnselectedOutdated(false);
+ bool hasSelectedForDownload(false);
+
+ for (QHash<QString,CRouterBRouterTilesStatus * >::const_iterator it = tilesDownloadStatus.constBegin();
+ it != tilesDownloadStatus.constEnd();
+ ++it)
+ {
+ CRouterBRouterTilesStatus * status = it.value();
+ if (status->isSelected)
+ {
+ hasSelected = true;
+
+ if (status->isLocal)
+ {
+ hasLocalSelected = true;
+ }
+ if (status->isOutdated || !status->isLocal)
+ {
+ hasSelectedForDownload = true;
+ }
+ }
+ else if (status->isOutdated)
+ {
+ hasUnselectedOutdated = true;
+ }
+ }
+
+ pushClearSelection->setEnabled(hasSelected);
+ pushDeleteSelection->setEnabled(hasLocalSelected);
+ pushSelectOutdated->setEnabled(hasUnselectedOutdated);
+ pushDownload->setEnabled(hasSelectedForDownload);
+}
+
+void CRouterBRouterTilesSelect::initialize()
+
+{
+ try
+ {
+ for (QHash<QString,CRouterBRouterTilesStatus * >::const_iterator it = tilesDownloadStatus.constBegin();
+ it != tilesDownloadStatus.constEnd();
+ ++it)
+ {
+ CRouterBRouterTilesStatus * status = it.value();
+ status->isLocal = false;
+ status->isRemote = false;
+ status->isOutdated = false;
+ }
+ const QDir &dir = segmentsDir();
+ if (!dir.exists())
+ {
+ if (!QDir(setup->localDir).mkpath(setup->localSegmentsDir))
+ {
+ throw tr("Error creating segments directory %1").arg(dir.path());
+ }
+ }
+
+ const QStringList &segments = dir.entryList();
+ const QRegExp rxTileName("([EW])(\\d{1,3})_([NS])(\\d{1,3})\\.rd5$");
+ for (const QString &segment : segments)
+ {
+ if (rxTileName.indexIn(segment) > -1)
+ {
+ const QPoint& tile = tileFromFileName(segment);
+ if (tile != noTile)
+ {
+ CRouterBRouterTilesStatus * status = getTileStatus(tile);
+
+ const QFileInfo &info = QFileInfo(dir,segment);
+ status->localDate = info.created();
+ status->localSize = info.size();
+ status->isLocal = true;
+ }
+ }
+ }
+ clearError();
+ initialized = true;
+ tilesWebPage->mainFrame()->load(QUrl(setup->segmentsUrl));
+ }
+ catch (const QString &msg)
+ {
+ error(msg);
+ }
+ update();
+ emit sigCompleteChanged();
+}
+
+void CRouterBRouterTilesSelect::slotLoadOnlineTilesRequestFinished(bool ok)
+{
+ try
+ {
+ if (!ok)
+ {
+ throw tr("Network Error");
+ }
+ else
+ {
+ const QWebElement &htmlElement = tilesWebPage->mainFrame()->documentElement();
+ const QWebElementCollection &anchorElements = htmlElement.findAll("table tr td a");
+
+ if (anchorElements.count() == 0)
+ {
+ throw tr("invalid result, no files found");
+ }
+
+ // 'E10_N20.rd5'
+ const QRegExp rxTileName("([EW])(\\d{1,3})_([NS])(\\d{1,3})\\.rd5");
+
+ // '16-Feb-2017 20:48 '
+ // const QString dateFormat = "d-MMM-yyyy H:mm";
+ // QDateFormat conversion depends on user-locale, doesn't work here
+ const QRegExp rxDate("(\\d{1,2})-(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)-(\\d{4}) (\\d{1,2}):(\\d{2})");
+
+ // 8.2M 271K 9.3K
+ const QRegExp rxSize(" {0,2}(\\d{1,3}|\\d\\.\\d)([KMG])");
+
+ for (const QWebElement &anchorElement : anchorElements)
+ {
+ const QString &tileName = anchorElement.toPlainText();
+ //only anchors matching the desired pattern
+ if (rxTileName.indexIn(tileName) > -1)
+ {
+ const QWebElement &dateElement = anchorElement.parent().nextSibling();
+ const QWebElement &sizeElement = dateElement.nextSibling();
+
+ const QPoint &tile = tileFromFileName(tileName);
+
+ if (tile != noTile)
+ {
+ CRouterBRouterTilesStatus * status = getTileStatus(tile);
+ if (status != nullptr)
+ {
+ status->isRemote = true;
+
+ const QString &date = dateElement.toPlainText();
+ if (rxDate.indexIn(date) < 0)
+ {
+ throw tr("cannot parse: %1 is not a date").arg(date);
+ }
+ int day = rxDate.cap(1).toInt();
+ const QString &monthStr = rxDate.cap(2);
+ int month = monthStr == "Jan" ? 1 :
+ monthStr == "Feb" ? 2 :
+ monthStr == "Mar" ? 3 :
+ monthStr == "Apr" ? 4 :
+ monthStr == "May" ? 5 :
+ monthStr == "Jun" ? 6 :
+ monthStr == "Jul" ? 7 :
+ monthStr == "Aug" ? 8 :
+ monthStr == "Sep" ? 9 :
+ monthStr == "Oct" ? 10 :
+ monthStr == "Nov" ? 11 :
+ 12;
+ int year = rxDate.cap(3).toInt();
+ int hour = rxDate.cap(4).toInt();
+ int min = rxDate.cap(5).toInt();
+
+ status->remoteDate = QDateTime(QDate(year,month,day),QTime(hour,min,0));
+
+ const QString &size = sizeElement.toPlainText();
+ if (rxSize.indexIn(size) < 0)
+ {
+ throw tr("cannot parse: %1 is not a valid size").arg(size);
+ }
+ status->remoteSize = rxSize.cap(1).toFloat() * (rxSize.cap(2) == "M" ? 1048576 :
+ rxSize.cap(2) == "G" ? 1073741824 :
+ rxSize.cap(2) == "K" ? 1024 :
+ 1);
+ if (status->isLocal && status->remoteDate > status->localDate)
+ {
+ status->isOutdated = true;
+ }
+ }
+ }
+ }
+ }
+ }
+ clearError();
+ }
+ catch (const QString &msg)
+ {
+ error(tr("Error retrieving available routing data from %1: %2").arg(setup->segmentsUrl).arg(msg));
+ }
+ update();
+}
+
+QString CRouterBRouterTilesSelect::formatSize(const qint64 size)
+{
+ if (size >= 2147483648)
+ {
+ return QString("%1G").arg(size/1073741824);
+ }
+ else if (size >= 1073741824)
+ {
+ return QString("%1G").arg(qreal(size/107374182)/10);
+ }
+ else if (size >= 2097152)
+ {
+ return QString("%1M").arg(size/1048576);
+ }
+ else if (size >= 1048576)
+ {
+ return QString("%1M").arg(qreal(size/104858)/10);
+ }
+ else if (size >= 2048)
+ {
+ return QString("%1K").arg(size/1024);
+ }
+ else if (size >= 1000)
+ {
+ return QString("%1K").arg(qreal(size/102)/10);
+ }
+ else
+ {
+ return QString("%1").arg(size);
+ }
+}
+
+QPoint CRouterBRouterTilesSelect::tileFromFileName(const QString &fileName)
+{
+ // 'E10_N20.rd5'
+ const QRegExp rxTileName("([EW])(\\d{1,3})_([NS])(\\d{1,3})\\.rd5");
+ if (rxTileName.indexIn(fileName) > -1)
+ {
+ return QPoint(rxTileName.cap(2).toInt() * (rxTileName.cap(1) == "E" ? 1 : -1)
+ ,rxTileName.cap(4).toInt() * (rxTileName.cap(3) == "N" ? 1 : -1));
+ }
+ else
+ {
+ return noTile;
+ }
+}
+
+QString CRouterBRouterTilesSelect::fileNameFromTile(const QPoint tile)
+{
+ return QString("%1%2_%3%4.rd5").arg(tile.x()<0 ? "W" : "E")
+ .arg(abs(tile.x()))
+ .arg(tile.y()<0 ? "S" : "N")
+ .arg(abs(tile.y()));
+}
+
+QDir CRouterBRouterTilesSelect::segmentsDir() const
+{
+ return QDir(QDir(setup->localDir).absoluteFilePath(setup->localSegmentsDir));
+}
+
+void CRouterBRouterTilesSelect::slotDownload()
+{
+ bool changed(false);
+
+ for (QHash<QString,CRouterBRouterTilesStatus*>::const_iterator it = tilesDownloadStatus.constBegin();
+ it != tilesDownloadStatus.constEnd();
+ ++it)
+ {
+ CRouterBRouterTilesStatus * status = it.value();
+ if (status->isSelected && (status->isOutdated || !status->isLocal) && status->file == nullptr)
+ {
+ const QString &fileName = it.key();
+
+ const QDir &dir = segmentsDir();
+ if (!dir.exists())
+ {
+ error(tr("segments directory does not exist: ").arg(dir.path()));
+ break;
+ }
+
+ status->isSelected = false;
+ changed = true;
+
+ status->file = new QFile(dir.absoluteFilePath(fileName+".tmp"));
+ if (!status->file->open(QIODevice::WriteOnly))
+ {
+ const QString tmpName = status->file->fileName();
+ const QString tmpError = status->file->errorString();
+ delete status->file;
+ status->file = nullptr;
+ error(tr("error creating file %1: %2").arg(tmpName).arg(tmpError));
+ break;
+ }
+
+ QNetworkReply* reply = tilesDownloadManager->get(QNetworkRequest(QUrl(setup->segmentsUrl + fileName)));
+ reply->setProperty("tile", fileName);
+
+ tilesDownloadManagerReplies << reply;
+
+ connect(reply, &QNetworkReply::downloadProgress, status, &CRouterBRouterTilesStatus::slotUpdateProgress);
+ connect(reply, &QNetworkReply::readyRead, this, &CRouterBRouterTilesSelect::slotDownloadReadReady);
+ }
+ }
+
+ if (changed)
+ {
+ update();
+ }
+}
+
+void CRouterBRouterTilesSelect::slotDownloadReadReady()
+{
+ for (QNetworkReply * reply : tilesDownloadManagerReplies)
+ {
+ if (reply->bytesAvailable() > 0)
+ {
+ try
+ {
+ const QString &fileName = reply->property("tile").toString();
+ QHash<QString,CRouterBRouterTilesStatus*>::const_iterator it = tilesDownloadStatus.constFind(fileName);
+ if (it == tilesDownloadStatus.constEnd())
+ {
+ throw tr("no valid request for filename %1").arg(fileName);
+ }
+ CRouterBRouterTilesStatus * status = it.value();
+ if (status->file == nullptr)
+ {
+ throw tr("no open file assigned to request for %1").arg(fileName);
+ }
+ if (status->file->write(reply->readAll()) < 0)
+ {
+ QString tmpName = status->file->fileName();
+ QString msg = status->file->errorString();
+ status->file->close();
+ status->file->remove();
+ delete status->file;
+ status->file = nullptr;
+ throw tr("error writing to file %1: %2").arg(tmpName).arg(msg);
+ }
+ }
+ catch (const QString &msg)
+ {
+ reply->abort();
+ error(msg);
+ }
+ }
+ }
+ updateStatus();
+}
+
+void CRouterBRouterTilesSelect::slotDownloadFinished(QNetworkReply* reply)
+{
+ if (tilesDownloadManagerReplies.contains(reply))
+ {
+ tilesDownloadManagerReplies.remove(tilesDownloadManagerReplies.indexOf(reply));
+ }
+ reply->deleteLater();
+
+ const QString &fileName = reply->property("tile").toString();
+ QHash<QString,CRouterBRouterTilesStatus*>::const_iterator it = tilesDownloadStatus.constFind(fileName);
+ if (it == tilesDownloadStatus.constEnd())
+ {
+ error(tr("no valid request for filename %1").arg(fileName));
+ }
+ else
+ {
+ CRouterBRouterTilesStatus * status = it.value();
+ status->isLocal = false;
+ if (status->file == nullptr)
+ {
+ error(tr("no open file assigned to request for %1").arg(fileName));
+ }
+ else
+ {
+ if(reply->error() != QNetworkReply::NoError)
+ {
+ error(fileName + ": "+reply->errorString());
+ }
+ else if (status->file->write(reply->readAll()) < 0)
+ {
+ error(tr("error writing to file %1: %2")
+ .arg(status->file->fileName())
+ .arg(status->file->errorString()));
+ status->file->close();
+ status->file->remove();
+ }
+ else if (!status->file->rename(segmentsDir().absoluteFilePath(it.key())))
+ {
+ error(tr("error renaming file %1 to %2: %3")
+ .arg(status->file->fileName())
+ .arg(segmentsDir().absoluteFilePath(it.key()))
+ .arg(status->file->errorString()));
+ status->file->close();
+ status->file->remove();
+ }
+ else
+ {
+ status->isLocal = true;
+ status->isOutdated = false;
+ status->file->close();
+ QFileInfo info(*status->file);
+ status->localDate = info.created();
+ status->localSize = info.size();
+ clearError();
+ }
+ delete status->file;
+ status->file = nullptr;
+ }
+ }
+ update();
+}
+
+void CRouterBRouterTilesSelect::cancelDownload() const
+{
+ for (QNetworkReply * reply : tilesDownloadManagerReplies)
+ {
+ reply->abort();
+ }
+}
+
+void CRouterBRouterTilesSelect::update()
+{
+ updateButtons();
+ updateStatus();
+ updateTiles();
+}
+
+void CRouterBRouterTilesSelect::updateStatus()
+{
+ int numCurrent(0);
+ int sizeCurrent(0);
+ int numOutdated(0);
+ int sizeOutdated(0);
+ int numOutstanding(0);
+ int sizeDownloadMax(0);
+ int sizeOutstanding(0);
+ int sizeDownloaded(0);
+
+ bool downloading(false);
+
+ for (QHash<QString,CRouterBRouterTilesStatus*>::const_iterator it = tilesDownloadStatus.constBegin();
+ it != tilesDownloadStatus.constEnd();
+ ++it)
+ {
+ const CRouterBRouterTilesStatus * status = it.value();
+
+ if (status->file != nullptr && status->progressMax > 0)
+ {
+ numOutstanding++;
+ sizeDownloadMax += status->progressMax;
+ sizeOutstanding += status->progressMax - status->progressVal;
+ sizeDownloaded += status->progressVal;
+ downloading = true;
+ }
+ else if (status->isSelected && status->isRemote && (!status->isLocal || status->isOutdated))
+ {
+ numOutstanding++;
+ sizeOutstanding += status->remoteSize;
+ }
+ if (status->isOutdated)
+ {
+ numOutdated++;
+ sizeOutdated += status->localSize;
+ }
+ else if (status->isLocal)
+ {
+ numCurrent++;
+ sizeCurrent += status->localSize;
+ }
+ }
+
+ statusLabel->setText(QString(tr("up-to-date: %1 (%2), outdated: %3 (%4), to be downloaded: %5 (%6)"))
+ .arg(numCurrent).arg(formatSize(sizeCurrent))
+ .arg(numOutdated).arg(formatSize(sizeOutdated))
+ .arg(numOutstanding).arg(formatSize(sizeOutstanding)));
+ statusProgress->setVisible(downloading);
+ statusProgress->setRange(0,sizeDownloadMax);
+ statusProgress->setValue(sizeDownloaded);
+
+ if (this->downloading != downloading || (numOutstanding > 0) != downloadSelected)
+ {
+ this->downloading = downloading;
+ downloadSelected = numOutstanding > 0;
+ emit sigCompleteChanged();
+ }
+}
+
+void CRouterBRouterTilesSelect::error(const QString &error) const
+{
+ errorLabel->setText(error);
+ errorLabel->setVisible(true);
+}
+
+void CRouterBRouterTilesSelect::clearError() const
+{
+ errorLabel->setVisible(false);
+}
+
+CRouterBRouterTilesStatus * CRouterBRouterTilesSelect::getTileStatus(QPoint tile) const
+{
+ QHash<QString,CRouterBRouterTilesStatus*>::const_iterator it = tilesDownloadStatus.constFind(fileNameFromTile(tile));
+ if (it != tilesDownloadStatus.constEnd())
+ {
+ return it.value();
+ }
+ return nullptr;
+}
+
+void CRouterBRouterTilesSelect::updateTiles() const
+{
+ QVector<QPoint> gridTiles;
+ QVector<QPoint> invalidTiles;
+ QVector<QPoint> outdatedTiles;
+ QVector<QPoint> currentTiles;
+ QVector<QPoint> outstandingTiles;
+ QVector<QPoint> selectedTiles;
+
+ for (QHash<QString,CRouterBRouterTilesStatus * >::const_iterator it = tilesDownloadStatus.constBegin();
+ it != tilesDownloadStatus.constEnd();
+ ++it)
+ {
+ const QPoint& tile = tileFromFileName(it.key());
+ Q_ASSERT(tile != noTile);
+ const CRouterBRouterTilesStatus * status = it.value();
+ if (status->file != nullptr)
+ {
+ outstandingTiles << tile;
+ }
+ else if (status->isSelected)
+ {
+ selectedTiles << tile;
+ }
+ else if (status->isLocal)
+ {
+ if (status->isOutdated)
+ {
+ outdatedTiles << tile;
+ }
+ else
+ {
+ currentTiles << tile;
+ }
+ }
+ else if (status->isRemote)
+ {
+ gridTiles << tile;
+ }
+ else
+ {
+ invalidTiles << tile;
+ }
+ }
+
+ selectArea->setGridTiles(gridTiles);
+ selectArea->setInvalidTiles(invalidTiles);
+ selectArea->setOutdatedTiles(outdatedTiles);
+ selectArea->setCurrentTiles(currentTiles);
+ selectArea->setOutstandingTiles(outstandingTiles);
+ selectArea->setSelectedTiles(selectedTiles);
+
+ selectArea->update();
+}
+
+void CRouterBRouterTilesSelect::slotTileToolTipChanged(const QPoint &tile) const
+{
+ const CRouterBRouterTilesStatus * status = getTileStatus(tile);
+
+ if (status->file != nullptr)
+ {
+ selectArea->setTileToolTip(QString(tr("being downloaded: %1 of %2"))
+ .arg(formatSize(status->progressVal))
+ .arg(formatSize(status->progressMax)));
+ }
+ else if (status->isOutdated)
+ {
+ selectArea->setTileToolTip(QString(tr("local data outdated (%1, %2 - remote %3, %4)"))
+ .arg(formatSize(status->localSize))
+ .arg(status->localDate.toString(Qt::DefaultLocaleShortDate))
+ .arg(formatSize(status->remoteSize))
+ .arg(status->remoteDate.toString(Qt::DefaultLocaleShortDate)));
+ }
+ else if (status->isLocal)
+ {
+ selectArea->setTileToolTip(QString(tr("local data up to date (%1, %2)"))
+ .arg(formatSize(status->localSize))
+ .arg(status->localDate.toString(Qt::DefaultLocaleShortDate)));
+ }
+ else if (status->isRemote)
+ {
+ selectArea->setTileToolTip(QString(tr("no local data, online available: %1 (%2)"))
+ .arg(formatSize(status->remoteSize))
+ .arg(status->remoteDate.toString(Qt::DefaultLocaleShortDate)));
+ }
+ else
+ {
+ selectArea->setTileToolTip(tr("no routing-data available"));
+ }
+}
diff --git a/src/gis/rte/router/brouter/CRouterBRouterTilesSelect.h b/src/gis/rte/router/brouter/CRouterBRouterTilesSelect.h
new file mode 100644
index 0000000..a5b7690
--- /dev/null
+++ b/src/gis/rte/router/brouter/CRouterBRouterTilesSelect.h
@@ -0,0 +1,114 @@
+/**********************************************************************************************
+ Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#ifndef CROUTERBROUTERTILESSELECT_H
+#define CROUTERBROUTERTILESSELECT_H
+
+#include <QDateTime>
+#include <QDir>
+#include <QLabel>
+#include <QNetworkAccessManager>
+#include <QProgressBar>
+#include <QPushButton>
+#include <QVBoxLayout>
+#include <QWebPage>
+
+class CRouterBRouterTilesSelectArea;
+class CRouterBRouterTilesStatus;
+class CRouterBRouterSetup;
+
+class CRouterBRouterTilesSelect : public QWidget
+{
+ Q_OBJECT
+public:
+ CRouterBRouterTilesSelect(QWidget * parent);
+ virtual ~CRouterBRouterTilesSelect();
+
+ void setSetup(CRouterBRouterSetup * setup);
+ void initialize();
+ void cancelDownload() const;
+
+ static QString formatSize(const qint64 size);
+ static QPoint tileFromFileName(const QString &fileName);
+ static QString fileNameFromTile(const QPoint tile);
+
+ bool isInitialized() const { return initialized; }
+ bool isDownloading() const { return downloading; }
+ bool isDownloadSelected() const { return downloadSelected; }
+
+ static const QPoint noTile;
+ static const int minTileLat;
+ static const int maxTileLat;
+ static const int minTileLon;
+ static const int maxTileLon;
+ static const int tileSize;
+
+signals:
+ void sigCompleteChanged() const;
+
+private slots:
+ void slotTileClicked(const QPoint & tile);
+ void slotTileToolTipChanged(const QPoint & tile) const;
+ void slotClearSelection();
+ void slotDeleteSelected();
+ void slotSelectOutdated();
+ void slotDownload();
+ void slotLoadOnlineTilesRequestFinished(bool ok);
+ void slotDownloadFinished(QNetworkReply* reply);
+ void slotDownloadReadReady();
+
+private:
+ QDir segmentsDir() const;
+ void update();
+ void updateStatus();
+ void updateButtons() const;
+ void updateTiles() const;
+ void error(const QString &error) const;
+ void clearError() const;
+
+ CRouterBRouterTilesStatus * getTileStatus(QPoint tile) const;
+
+ CRouterBRouterSetup * setup;
+
+ QVBoxLayout * outerLayout;
+ QWidget * widgetSelect;
+ QLabel * statusLabel;
+ QProgressBar * statusProgress;
+ QLabel * errorLabel;
+
+ QPushButton * pushSelectOutdated;
+ QPushButton * pushClearSelection;
+ QPushButton * pushDeleteSelection;
+ QPushButton * pushDownload;
+
+ CRouterBRouterTilesSelectArea * selectArea;
+
+ QWebPage * tilesWebPage;
+
+ QNetworkAccessManager * tilesDownloadManager;
+ QVector<QNetworkReply*> tilesDownloadManagerReplies;
+
+ QHash<QString,CRouterBRouterTilesStatus*> tilesDownloadStatus;
+
+ bool downloading { false };
+ bool downloadSelected { false };
+ bool initialized { false };
+};
+
+#endif //CROUTERBROUTERTILESSELECT_H
+
diff --git a/src/gis/rte/router/brouter/CRouterBRouterTilesSelectArea.cpp b/src/gis/rte/router/brouter/CRouterBRouterTilesSelectArea.cpp
new file mode 100644
index 0000000..b5f6837
--- /dev/null
+++ b/src/gis/rte/router/brouter/CRouterBRouterTilesSelectArea.cpp
@@ -0,0 +1,188 @@
+/**********************************************************************************************
+ Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#include "canvas/CCanvas.h"
+#include "gis/rte/router/brouter/CRouterBRouterTilesSelect.h"
+#include "gis/rte/router/brouter/CRouterBRouterTilesSelectArea.h"
+#include "gis/rte/router/brouter/CRouterBRouterTilesSelectLayout.h"
+#include "gis/rte/router/brouter/CRouterBRouterTilesStatus.h"
+#include <QToolTip>
+
+const QPen CRouterBRouterTilesSelectArea::gridPen = QPen(Qt::magenta);
+const QPen CRouterBRouterTilesSelectArea::outdatedTilesPen = QPen(Qt::gray);
+const QPen CRouterBRouterTilesSelectArea::currentTilesPen = QPen(Qt::darkGreen);
+const QPen CRouterBRouterTilesSelectArea::selectedTilesPen = QPen(Qt::blue);
+const QPen CRouterBRouterTilesSelectArea::outstandingTilesPen = QPen(Qt::yellow);
+const QPen CRouterBRouterTilesSelectArea::invalidTilesPen = QPen(Qt::gray);
+const QBrush CRouterBRouterTilesSelectArea::outdatedTilesBrush = QBrush(Qt::gray, Qt::Dense5Pattern);
+const QBrush CRouterBRouterTilesSelectArea::currentTilesBrush = QBrush(Qt::darkGreen,Qt::Dense3Pattern);
+const QBrush CRouterBRouterTilesSelectArea::selectedTilesBrush = QBrush(Qt::blue, Qt::Dense3Pattern);
+const QBrush CRouterBRouterTilesSelectArea::outstandingTilesBrush = QBrush(Qt::yellow, Qt::Dense3Pattern);
+const QBrush CRouterBRouterTilesSelectArea::invalidTilesBrush = QBrush(Qt::gray, Qt::DiagCrossPattern);
+
+CRouterBRouterTilesSelectArea::CRouterBRouterTilesSelectArea(QWidget * parent, CCanvas * canvas)
+ : QWidget(parent)
+{
+ this->canvas = canvas;
+
+ setMouseTracking(true);
+}
+
+CRouterBRouterTilesSelectArea::~CRouterBRouterTilesSelectArea()
+{
+}
+
+bool CRouterBRouterTilesSelectArea::event(QEvent * event)
+{
+ if (event->type() == QEvent::ToolTip)
+ {
+ QHelpEvent *helpEvent = static_cast<QHelpEvent *>(event);
+ const QPoint &tile = tileUnderMouse(helpEvent->pos());
+ if (currentTile != tile)
+ {
+ emit sigTileToolTipChanged(tile);
+ currentTile = tile;
+ }
+
+ QToolTip::showText(helpEvent->globalPos(), tileToolTip);
+ return true;
+ }
+ return QWidget::event(event);
+}
+
+void CRouterBRouterTilesSelectArea::paintEvent(QPaintEvent *event)
+{
+ drawGrid();
+ drawTiles(invalidTilesPen, invalidTilesBrush, invalidTiles);
+ drawTiles(outdatedTilesPen, outdatedTilesBrush, outdatedTiles);
+ drawTiles(currentTilesPen, currentTilesBrush, currentTiles);
+ drawTiles(selectedTilesPen, selectedTilesBrush, selectedTiles);
+ drawTiles(outstandingTilesPen, outstandingTilesBrush, outstandingTiles);
+}
+
+void CRouterBRouterTilesSelectArea::mouseMoveEvent(QMouseEvent * event)
+{
+ if (event->buttons() == Qt::LeftButton)
+ {
+ canvas->moveMap(QPointF(event->pos()-mousePos));
+ mousePos = event->pos();
+ }
+}
+
+void CRouterBRouterTilesSelectArea::mousePressEvent(QMouseEvent * event)
+{
+ if (event->buttons() == Qt::LeftButton)
+ {
+ startPos = mousePos = event->pos();
+ }
+ button = event->buttons();
+}
+
+void CRouterBRouterTilesSelectArea::mouseReleaseEvent(QMouseEvent * event)
+{
+ if (button == Qt::LeftButton)
+ {
+ const QPoint &pos = event->pos();
+ canvas->moveMap(QPointF(pos-mousePos));
+ if (pos == startPos)
+ {
+ emit sigTileClicked(tileUnderMouse(pos));
+ }
+ }
+}
+
+void CRouterBRouterTilesSelectArea::drawGrid()
+{
+ QPainter painter(this);
+ painter.setPen(gridPen);
+
+ for(const QPoint &tile : gridTiles)
+ {
+ painter.drawPolyline(gridPolygon(tile));
+ }
+}
+
+void CRouterBRouterTilesSelectArea::drawTiles(const QPen &pen, const QBrush & brush, const QVector<QPoint> & tiles)
+{
+ QPainter painter(this);
+ painter.setPen(pen);
+ painter.setBrush(brush);
+
+ for(const QPoint &tile : tiles)
+ {
+ painter.drawPolygon(tilePolygon(tile));
+ }
+}
+
+QPoint CRouterBRouterTilesSelectArea::tileUnderMouse(const QPointF & mousePos) const
+{
+ QPointF pos(mousePos);
+ canvas->convertPx2Rad(pos);
+ QPointF posDegF = pos * RAD_TO_DEG;
+ QPoint tile(posDegF.x() > 0 ? posDegF.x()/CRouterBRouterTilesSelect::tileSize : posDegF.x()/CRouterBRouterTilesSelect::tileSize - 1
+ ,posDegF.y() > 0 ? posDegF.y()/CRouterBRouterTilesSelect::tileSize : posDegF.y()/CRouterBRouterTilesSelect::tileSize - 1);
+ return tile * CRouterBRouterTilesSelect::tileSize;
+}
+
+QPolygonF CRouterBRouterTilesSelectArea::tilePolygon(const QPoint & tile) const
+{
+ QPointF p0(tile.x(),tile.y());
+ QPointF p1(tile.x()+CRouterBRouterTilesSelect::tileSize,tile.y());
+ QPointF p2(tile.x()+CRouterBRouterTilesSelect::tileSize,tile.y()+CRouterBRouterTilesSelect::tileSize);
+ QPointF p3(tile.x(),tile.y()+CRouterBRouterTilesSelect::tileSize);
+
+ p0 *= DEG_TO_RAD;
+ p1 *= DEG_TO_RAD;
+ p2 *= DEG_TO_RAD;
+ p3 *= DEG_TO_RAD;
+
+ canvas->convertRad2Px(p0);
+ canvas->convertRad2Px(p1);
+ canvas->convertRad2Px(p2);
+ canvas->convertRad2Px(p3);
+
+ QPolygonF polygon;
+ polygon << p0;
+ polygon << p1;
+ polygon << p2;
+ polygon << p3;
+
+ return polygon;
+}
+
+QPolygonF CRouterBRouterTilesSelectArea::gridPolygon(const QPoint & tile) const
+{
+ QPointF p0(tile.x(),tile.y());
+ QPointF p1(tile.x()+CRouterBRouterTilesSelect::tileSize,tile.y());
+ QPointF p2(tile.x()+CRouterBRouterTilesSelect::tileSize,tile.y()+CRouterBRouterTilesSelect::tileSize);
+
+ p0 *= DEG_TO_RAD;
+ p1 *= DEG_TO_RAD;
+ p2 *= DEG_TO_RAD;
+
+ canvas->convertRad2Px(p0);
+ canvas->convertRad2Px(p1);
+ canvas->convertRad2Px(p2);
+
+ QPolygonF polygon;
+ polygon << p0;
+ polygon << p1;
+ polygon << p2;
+
+ return polygon;
+}
diff --git a/src/gis/rte/router/brouter/CRouterBRouterTilesSelectArea.h b/src/gis/rte/router/brouter/CRouterBRouterTilesSelectArea.h
new file mode 100644
index 0000000..6ba0f84
--- /dev/null
+++ b/src/gis/rte/router/brouter/CRouterBRouterTilesSelectArea.h
@@ -0,0 +1,94 @@
+/**********************************************************************************************
+ Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#ifndef CROUTERBROUTERTILESSELECTAREA_H
+#define CROUTERBROUTERTILESSELECTAREA_H
+
+#include <QMouseEvent>
+#include <QPen>
+#include <QWidget>
+
+class CCanvas;
+class CRouterBRouterTilesSelect;
+
+class CRouterBRouterTilesSelectArea : public QWidget
+{
+ Q_OBJECT
+public:
+ CRouterBRouterTilesSelectArea(QWidget * parent, CCanvas * canvas);
+ virtual ~CRouterBRouterTilesSelectArea();
+
+ void paintEvent(QPaintEvent *event) override;
+
+ void setGridTiles(const QVector<QPoint> & tiles) { gridTiles = tiles; }
+ void setInvalidTiles(const QVector<QPoint> & tiles) { invalidTiles = tiles; }
+ void setOutdatedTiles(const QVector<QPoint> & tiles) { outdatedTiles = tiles; }
+ void setCurrentTiles(const QVector<QPoint> & tiles) { currentTiles = tiles; }
+ void setOutstandingTiles(const QVector<QPoint> & tiles) { outstandingTiles = tiles; }
+ void setSelectedTiles(const QVector<QPoint> & tiles) { selectedTiles = tiles; }
+
+ void setTileToolTip(const QString &toolTip) { tileToolTip = toolTip; }
+
+ static const QPen gridPen;
+ static const QPen currentTilesPen;
+ static const QPen outdatedTilesPen;
+ static const QPen selectedTilesPen;
+ static const QPen outstandingTilesPen;
+ static const QPen invalidTilesPen;
+ static const QBrush currentTilesBrush;
+ static const QBrush outdatedTilesBrush;
+ static const QBrush selectedTilesBrush;
+ static const QBrush outstandingTilesBrush;
+ static const QBrush invalidTilesBrush;
+
+signals:
+ void sigTileClicked(const QPoint & tile);
+ void sigTileToolTipChanged(const QPoint & tile);
+
+protected:
+ void mouseMoveEvent(QMouseEvent * event) override;
+ void mousePressEvent(QMouseEvent * event) override;
+ void mouseReleaseEvent(QMouseEvent * event) override;
+ bool event(QEvent * event) override;
+
+private slots:
+
+private:
+ void drawGrid();
+ void drawTiles(const QPen &pen, const QBrush &brush, const QVector<QPoint> & tiles);
+ QPoint tileUnderMouse(const QPointF & mousePos) const;
+ QPolygonF gridPolygon(const QPoint & tile) const;
+ QPolygonF tilePolygon(const QPoint & tile) const;
+
+ CCanvas * canvas;
+ QPoint mousePos;
+ QPoint startPos;
+ Qt::MouseButtons button;
+ QPoint currentTile;
+ QString tileToolTip;
+
+ QVector<QPoint> gridTiles;
+ QVector<QPoint> invalidTiles;
+ QVector<QPoint> outdatedTiles;
+ QVector<QPoint> currentTiles;
+ QVector<QPoint> outstandingTiles;
+ QVector<QPoint> selectedTiles;
+};
+
+#endif //CROUTERBROUTERTILESSELECTAREA_H
+
diff --git a/src/gis/rte/router/brouter/CRouterBRouterTilesSelectLayout.h b/src/gis/rte/router/brouter/CRouterBRouterTilesSelectLayout.h
new file mode 100644
index 0000000..6a310c7
--- /dev/null
+++ b/src/gis/rte/router/brouter/CRouterBRouterTilesSelectLayout.h
@@ -0,0 +1,54 @@
+/**********************************************************************************************
+ Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#ifndef CROUTERBROUTERTILESSELECTLAYOUT_H
+#define CROUTERBROUTERTILESSELECTLAYOUT_H
+
+#include <QLayout>
+#include <QList>
+/*
+ * This layout class seems trivial. What it does is, it enforces the exact
+ * same geometry on its contained QLayoutItems. It's been used to overlay
+ * multiple widgets so they appear as a single unit. Standard Layout-classes
+ * arrange the items in non-overlapping manner.
+ */
+class CRouterBRouterTilesSelectLayout : public QLayout
+{
+public:
+ CRouterBRouterTilesSelectLayout(QWidget * parent) : QLayout(parent) {}
+
+ virtual ~CRouterBRouterTilesSelectLayout() {}
+
+ void addItem(QLayoutItem * item) override { items.append(item); }
+
+ QSize sizeHint() const override { return QSize(200,200); }
+
+ void setGeometry(const QRect & r) override { for (QLayoutItem *item : items) { item->setGeometry(r); }}
+
+ QLayoutItem * itemAt(int index) const override { return items.at(index); }
+
+ QLayoutItem * takeAt(int index) override { return items.takeAt(index); }
+
+ int count() const override { return items.size(); }
+
+private:
+ QList<QLayoutItem *> items;
+};
+
+#endif //CROUTERBROUTERTILESSELECTLAYOUT_H
+
diff --git a/src/gis/trk/CCutTrk.h b/src/gis/rte/router/brouter/CRouterBRouterTilesStatus.h
similarity index 51%
copy from src/gis/trk/CCutTrk.h
copy to src/gis/rte/router/brouter/CRouterBRouterTilesStatus.h
index 6f6d0fe..89a8d4e 100644
--- a/src/gis/trk/CCutTrk.h
+++ b/src/gis/rte/router/brouter/CRouterBRouterTilesStatus.h
@@ -1,5 +1,5 @@
/**********************************************************************************************
- Copyright (C) 2014-2015 Oliver Eichler oliver.eichler at gmx.de
+ Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,46 +16,42 @@
**********************************************************************************************/
-#ifndef CCUTTRK_H
-#define CCUTTRK_H
+#ifndef CROUTERBROUTERTILESSTATUS_H
+#define CROUTERBROUTERTILESSTATUS_H
-#include "ui_ICutTrk.h"
-#include <QDialog>
+#include <QDateTime>
+#include <QFile>
+#include <QObject>
-class CCutTrk : public QDialog, private Ui::ICutTrk
+class CRouterBRouterTilesStatus : public QObject
{
Q_OBJECT
public:
- CCutTrk(QWidget * parent);
- virtual ~CCutTrk() = default;
+ CRouterBRouterTilesStatus(QObject *parent) : QObject(parent) {}
+ virtual ~CRouterBRouterTilesStatus() {}
- enum mode_e
- {
- eModeNone = 0
- , eModeKeepFirst = 1
- , eModeKeepBoth = 2
- , eModeKeepSecond = 4
- };
-
- mode_e getMode() const
- {
- return mode;
- }
-
- bool createClone()
+public slots:
+ void slotUpdateProgress(qint64 received, qint64 total)
{
- return checkCreateClone->isChecked();
+ progressMax = total;
+ progressVal = received;
}
-public slots:
- void accept() override;
-
-private slots:
- void slotClicked();
-
private:
- mode_e mode = eModeNone;
+ qint64 progressMax;
+ qint64 progressVal;
+ qint64 remoteSize;
+ qint64 localSize;
+ QDateTime remoteDate;
+ QDateTime localDate;
+ bool isLocal {false};
+ bool isRemote {false};
+ bool isSelected {false};
+ bool isOutdated {false};
+ QFile * file {nullptr};
+
+ friend class CRouterBRouterTilesSelect;
};
-#endif //CCUTTRK_H
+#endif //CROUTERBROUTERTILESSTATUS_H
diff --git a/src/gis/rte/router/brouter/CRouterBRouterToolShell.cpp b/src/gis/rte/router/brouter/CRouterBRouterToolShell.cpp
new file mode 100644
index 0000000..83ca087
--- /dev/null
+++ b/src/gis/rte/router/brouter/CRouterBRouterToolShell.cpp
@@ -0,0 +1,81 @@
+/**********************************************************************************************
+ Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#include "CMainWindow.h"
+#include "CRouterBRouterToolShell.h"
+
+#include <QtWidgets>
+
+CRouterBRouterToolShell::CRouterBRouterToolShell(QTextBrowser *textBrowser, QWidget * parent)
+ : IToolShell(parent)
+{
+ setTextBrowser(textBrowser);
+ connect(&cmd, &QProcess::stateChanged, this, &CRouterBRouterToolShell::slotStateChanged);
+ connect(&cmd, static_cast<void (QProcess::*)(QProcess::ProcessError)>(&QProcess::error), this, &CRouterBRouterToolShell::slotError);
+}
+
+CRouterBRouterToolShell::~CRouterBRouterToolShell()
+{
+}
+
+void CRouterBRouterToolShell::start(const QString &dir, const QString &command, const QStringList &args)
+{
+ stdOut("cd " + dir);
+ stdOut(command+" " + args.join(" ") + "\n");
+ cmd.setWorkingDirectory(dir);
+ cmd.start(command,args);
+ cmd.waitForStarted();
+}
+
+void CRouterBRouterToolShell::stop()
+{
+ if (cmd.state() != QProcess::NotRunning)
+ {
+#if defined(Q_OS_MAC) || defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(__FreeBSD_kernel__) || defined(__GNU__)
+ cmd.terminate();
+#elif defined (Q_OS_WIN32)
+ cmd.kill();
+#else
+ #error OS not supported
+#endif
+ }
+}
+
+void CRouterBRouterToolShell::slotStateChanged(const QProcess::ProcessState newState) const
+{
+ emit sigProcessStateChanged(newState);
+}
+
+void CRouterBRouterToolShell::slotError(const QProcess::ProcessError error) const
+{
+ emit sigProcessError(error, cmd.errorString());
+}
+
+void CRouterBRouterToolShell::finished(const int exitCode, const QProcess::ExitStatus status)
+{
+ if (status == QProcess::ExitStatus::NormalExit)
+ {
+ text->setTextColor(Qt::darkGreen);
+ text->append(tr("!!! done !!!\n"));
+ }
+ else
+ {
+ text->setTextColor(Qt::darkRed);
+ text->append(tr("!!! failed !!!\n"));
+ }
+}
diff --git a/src/gis/trk/CCutTrk.h b/src/gis/rte/router/brouter/CRouterBRouterToolShell.h
similarity index 51%
copy from src/gis/trk/CCutTrk.h
copy to src/gis/rte/router/brouter/CRouterBRouterToolShell.h
index 6f6d0fe..b4366c0 100644
--- a/src/gis/trk/CCutTrk.h
+++ b/src/gis/rte/router/brouter/CRouterBRouterToolShell.h
@@ -1,5 +1,5 @@
/**********************************************************************************************
- Copyright (C) 2014-2015 Oliver Eichler oliver.eichler at gmx.de
+ Copyright (C) 2017 Norbert Truchsessr norbert.truchsess at t-online.de
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,46 +16,32 @@
**********************************************************************************************/
-#ifndef CCUTTRK_H
-#define CCUTTRK_H
+#ifndef CROUTERBROUTERTOOLSHELL_H
+#define CROUTERBROUTERTOOLSHELL_H
-#include "ui_ICutTrk.h"
-#include <QDialog>
+#include "tool/IToolShell.h"
-class CCutTrk : public QDialog, private Ui::ICutTrk
+class CRouterBRouterToolShell : public IToolShell
{
Q_OBJECT
public:
- CCutTrk(QWidget * parent);
- virtual ~CCutTrk() = default;
-
- enum mode_e
- {
- eModeNone = 0
- , eModeKeepFirst = 1
- , eModeKeepBoth = 2
- , eModeKeepSecond = 4
- };
-
- mode_e getMode() const
- {
- return mode;
- }
-
- bool createClone()
- {
- return checkCreateClone->isChecked();
- }
-
-public slots:
- void accept() override;
+ CRouterBRouterToolShell(QTextBrowser *textBrowser, QWidget * parent);
+ virtual ~CRouterBRouterToolShell();
+
+ void start(const QString &dir, const QString &command, const QStringList &args);
+ void stop();
+
+signals:
+ void sigProcessStateChanged(const QProcess::ProcessState newState) const;
+ void sigProcessError(const QProcess::ProcessError error, const QString &errorString) const;
private slots:
- void slotClicked();
+ void slotStateChanged(const QProcess::ProcessState newState) const;
+ void slotError(const QProcess::ProcessError error) const;
private:
- mode_e mode = eModeNone;
+ void finished(int exitCode, QProcess::ExitStatus status) override;
};
-#endif //CCUTTRK_H
+#endif //CROUTERBROUTERTOOLSHELL_H
diff --git a/src/gis/rte/router/brouter/IRouterBRouterInfo.ui b/src/gis/rte/router/brouter/IRouterBRouterInfo.ui
new file mode 100644
index 0000000..be7d7a8
--- /dev/null
+++ b/src/gis/rte/router/brouter/IRouterBRouterInfo.ui
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>IRouterBRouterInfo</class>
+ <widget class="QDialog" name="IRouterBRouterInfo">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>615</width>
+ <height>300</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>BRouter Profile</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QTextBrowser" name="textBrowser"/>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Close</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>accepted()</signal>
+ <receiver>IRouterBRouterInfo</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>248</x>
+ <y>254</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>157</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
+ <receiver>IRouterBRouterInfo</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>316</x>
+ <y>260</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>286</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
diff --git a/src/gis/rte/router/brouter/IRouterBRouterSetupWizard.ui b/src/gis/rte/router/brouter/IRouterBRouterSetupWizard.ui
new file mode 100644
index 0000000..9dbe0c7
--- /dev/null
+++ b/src/gis/rte/router/brouter/IRouterBRouterSetupWizard.ui
@@ -0,0 +1,682 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>IRouterBRouterSetupWizard</class>
+ <widget class="QWizard" name="IRouterBRouterSetupWizard">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>700</width>
+ <height>500</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="windowTitle">
+ <string>BRouter Setup</string>
+ </property>
+ <property name="options">
+ <set>QWizard::CancelButtonOnLeft|QWizard::HaveCustomButton1</set>
+ </property>
+ <widget class="QWizardPage" name="pageChooseMode">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <attribute name="pageId">
+ <string notr="true">0</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_11">
+ <item>
+ <widget class="QGroupBox" name="groupRadioMode">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>choose which BRouter to use</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QRadioButton" name="radioOnline">
+ <property name="text">
+ <string>BRouter-Web (online)</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="radioLocal">
+ <property name="text">
+ <string>local Installation</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="checkExpert">
+ <property name="text">
+ <string>Expert Mode</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="CRouterBRouterSetupPage" name="pageLocalDirectory">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <attribute name="pageId">
+ <string notr="true">1</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <widget class="QLabel" name="labelLocalDir">
+ <property name="text">
+ <string>local BRouter Installation directory:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLineEdit" name="lineLocalDir"/>
+ </item>
+ <item>
+ <widget class="QToolButton" name="toolLocalDir">
+ <property name="toolTip">
+ <string>select installation directory</string>
+ </property>
+ <property name="text">
+ <string>...</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../../../resources.qrc">
+ <normaloff>:/icons/32x32/PathBlue.png</normaloff>:/icons/32x32/PathBlue.png</iconset>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="labelLocalDirResult">
+ <property name="text">
+ <string>labelLocalDirResult</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QPushButton" name="pushCreateOrUpdateLocalInstall">
+ <property name="text">
+ <string>create or update installation</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Java Executable</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lineJavaExecutable"/>
+ </item>
+ <item>
+ <widget class="QToolButton" name="toolJavaExecutable">
+ <property name="text">
+ <string>...</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../../../resources.qrc">
+ <normaloff>:/icons/32x32/PathBlue.png</normaloff>:/icons/32x32/PathBlue.png</iconset>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="labelLocalJavaResult">
+ <property name="text">
+ <string>labelLocalJavaResult</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <item>
+ <widget class="QPushButton" name="pushLocalFindJava">
+ <property name="text">
+ <string>search for installed java</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>269</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QTextBrowser" name="textLocalDirectory"/>
+ </item>
+ </layout>
+ </widget>
+ <widget class="CRouterBRouterSetupPage" name="pageLocalInstallation">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string/>
+ </property>
+ <property name="subTitle">
+ <string/>
+ </property>
+ <attribute name="pageId">
+ <string notr="true">2</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QLabel" name="labelLocalInstallTitle">
+ <property name="text">
+ <string>Download and install BRouter Version</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QWebView" name="webLocalBRouterVersions">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="url">
+ <url>
+ <string>about:blank</string>
+ </url>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="labelLocalInstallLink">
+ <property name="text">
+ <string>File to install</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QPushButton" name="pushLocalInstall">
+ <property name="text">
+ <string>Download and Install</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QTextBrowser" name="textLocalInstall">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="CRouterBRouterSetupPage" name="pageProfiles">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <attribute name="pageId">
+ <string notr="true">3</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_7">
+ <item>
+ <widget class="QLabel" name="labelAvailableProfiles">
+ <property name="text">
+ <string>available Profiles</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QListView" name="listAvailableProfiles">
+ <property name="editTriggers">
+ <set>QAbstractItemView::NoEditTriggers</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_5">
+ <item>
+ <widget class="QToolButton" name="toolAddProfile">
+ <property name="toolTip">
+ <string>install profile</string>
+ </property>
+ <property name="text">
+ <string>...</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../../../resources.qrc">
+ <normaloff>:/icons/32x32/Right.png</normaloff>:/icons/32x32/Right.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="toolDeleteProfile">
+ <property name="toolTip">
+ <string>remove profile</string>
+ </property>
+ <property name="text">
+ <string>...</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../../../resources.qrc">
+ <normaloff>:/icons/32x32/Left.png</normaloff>:/icons/32x32/Left.png</iconset>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_6">
+ <item>
+ <widget class="QLabel" name="labelProfiles">
+ <property name="text">
+ <string>installed Profiles</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QListView" name="listProfiles">
+ <property name="editTriggers">
+ <set>QAbstractItemView::NoEditTriggers</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_12">
+ <item>
+ <widget class="QToolButton" name="toolProfileUp">
+ <property name="text">
+ <string>...</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../../../resources.qrc">
+ <normaloff>:/icons/32x32/Up.png</normaloff>:/icons/32x32/Up.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="toolProfileDown">
+ <property name="text">
+ <string>...</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../../../resources.qrc">
+ <normaloff>:/icons/32x32/Down.png</normaloff>:/icons/32x32/Down.png</iconset>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="labelProfileContent">
+ <property name="text">
+ <string>content of profile</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QTextBrowser" name="textProfileContent"/>
+ </item>
+ </layout>
+ </widget>
+ <widget class="CRouterBRouterTilesPage" name="pageLocalTiles">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <attribute name="pageId">
+ <string notr="true">4</string>
+ </attribute>
+ </widget>
+ <widget class="CRouterBRouterSetupPage" name="pageOnlineUrl">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <attribute name="pageId">
+ <string notr="true">5</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_9">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_7">
+ <item>
+ <widget class="QLabel" name="labelOnlineUrl">
+ <property name="text">
+ <string>BRouter-Web URL:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lineOnlineUrl"/>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QTextBrowser" name="textOnlineUrl">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWizardPage" name="pageOnlineDetails">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>1</horstretch>
+ <verstretch>1</verstretch>
+ </sizepolicy>
+ </property>
+ <attribute name="pageId">
+ <string notr="true">6</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_8">
+ <item>
+ <layout class="QFormLayout" name="formLayout_2">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetNoConstraint</enum>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="labelOnlineService">
+ <property name="text">
+ <string>Service-URL</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="lineOnlineService"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="labelOnlineProfileUrl">
+ <property name="text">
+ <string>Profile-URL</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="lineOnlineProfileUrl"/>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ <widget class="CRouterBRouterSetupPage" name="pageLocalDetails">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <attribute name="pageId">
+ <string notr="true">7</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_13">
+ <item>
+ <layout class="QFormLayout" name="formLayout_3">
+ <item row="0" column="0">
+ <widget class="QLabel" name="labelLocalProfilesUrl">
+ <property name="text">
+ <string>Profiles Url</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="lineLocalProfilesUrl"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="labelLocalHost">
+ <property name="text">
+ <string>Hostname</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="lineLocalHost"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="labelLocalPort">
+ <property name="text">
+ <string>Port</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QLineEdit" name="lineLocalPort"/>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="labelLocalProfiles">
+ <property name="text">
+ <string>Profile directory</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QLineEdit" name="lineLocalProfiles"/>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="labelLocalSegments">
+ <property name="text">
+ <string>Segments directory</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QLineEdit" name="lineLocalSegments"/>
+ </item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="labelLocalCustomProfiles">
+ <property name="text">
+ <string>Custom Profiles dir</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="QLineEdit" name="lineLocalCustomProfiles"/>
+ </item>
+ <item row="6" column="0">
+ <widget class="QLabel" name="labelLocalMaxRuntime">
+ <property name="text">
+ <string>Max Runtime</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="1">
+ <widget class="QLineEdit" name="lineLocalMaxRuntime"/>
+ </item>
+ <item row="7" column="0">
+ <widget class="QLabel" name="labelLocalNumberThreads">
+ <property name="text">
+ <string>Number Threads</string>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="1">
+ <widget class="QLineEdit" name="lineLocalNumberThreads"/>
+ </item>
+ <item row="8" column="0">
+ <widget class="QLabel" name="labelLocalJavaOpts">
+ <property name="text">
+ <string>Java Options</string>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="1">
+ <widget class="QLineEdit" name="lineLocalJavaOpts"/>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_4">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QTextBrowser" name="textLocalDetails"/>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ <customwidgets>
+ <customwidget>
+ <class>QWebView</class>
+ <extends>QWidget</extends>
+ <header>QtWebKitWidgets/QWebView</header>
+ </customwidget>
+ <customwidget>
+ <class>CRouterBRouterTilesPage</class>
+ <extends>QWizardPage</extends>
+ <header>gis/rte/router/brouter/CRouterBRouterTilesPage.h</header>
+ <container>1</container>
+ </customwidget>
+ <customwidget>
+ <class>CRouterBRouterSetupPage</class>
+ <extends>QWizardPage</extends>
+ <header>gis/rte/router/brouter/CRouterBRouterSetupPage.h</header>
+ <container>1</container>
+ </customwidget>
+ </customwidgets>
+ <resources>
+ <include location="../../../../resources.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/src/gis/rte/router/CRouterRoutinoPathSetup.cpp b/src/gis/rte/router/routino/CRouterRoutinoPathSetup.cpp
similarity index 97%
rename from src/gis/rte/router/CRouterRoutinoPathSetup.cpp
rename to src/gis/rte/router/routino/CRouterRoutinoPathSetup.cpp
index f657f68..611ae5f 100644
--- a/src/gis/rte/router/CRouterRoutinoPathSetup.cpp
+++ b/src/gis/rte/router/routino/CRouterRoutinoPathSetup.cpp
@@ -17,7 +17,7 @@
**********************************************************************************************/
#include "CMainWindow.h"
-#include "gis/rte/router/CRouterRoutinoPathSetup.h"
+#include "gis/rte/router/routino/CRouterRoutinoPathSetup.h"
#include <QtWidgets>
diff --git a/src/gis/rte/router/CRouterRoutinoPathSetup.h b/src/gis/rte/router/routino/CRouterRoutinoPathSetup.h
similarity index 100%
rename from src/gis/rte/router/CRouterRoutinoPathSetup.h
rename to src/gis/rte/router/routino/CRouterRoutinoPathSetup.h
diff --git a/src/gis/rte/router/IRouterRoutinoPathSetup.ui b/src/gis/rte/router/routino/IRouterRoutinoPathSetup.ui
similarity index 98%
rename from src/gis/rte/router/IRouterRoutinoPathSetup.ui
rename to src/gis/rte/router/routino/IRouterRoutinoPathSetup.ui
index fc068f1..a28db31 100644
--- a/src/gis/rte/router/IRouterRoutinoPathSetup.ui
+++ b/src/gis/rte/router/routino/IRouterRoutinoPathSetup.ui
@@ -121,7 +121,7 @@
</layout>
</widget>
<resources>
- <include location="../../../resources.qrc"/>
+ <include location="../../../../resources.qrc"/>
</resources>
<connections>
<connection>
diff --git a/src/gis/tcx/CTcxProject.cpp b/src/gis/tcx/CTcxProject.cpp
new file mode 100644
index 0000000..299414c
--- /dev/null
+++ b/src/gis/tcx/CTcxProject.cpp
@@ -0,0 +1,495 @@
+/**********************************************************************************************
+ Copyright (C) 2016 Michel Durand zero at cms123.fr
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#include "CMainWindow.h"
+#include "gis/CGisListWks.h"
+#include "gis/tcx/CTcxProject.h"
+#include "gis/trk/CGisItemTrk.h"
+#include "gis/wpt/CGisItemWpt.h"
+#include "version.h"
+
+#include <QtWidgets>
+
+
+
+
+CTcxProject::CTcxProject(const QString &filename, CGisListWks * parent)
+ : IGisProject(eTypeTcx, filename, parent)
+{
+ setIcon(CGisListWks::eColumnIcon, QIcon("://icons/32x32/TcxProject.png"));
+ blockUpdateItems(true);
+ loadTcx(filename);
+ blockUpdateItems(false);
+ setupName(QFileInfo(filename).completeBaseName().replace("_", " "));
+}
+
+
+void CTcxProject::loadTcx(const QString& filename)
+{
+ try
+ {
+ loadTcx(filename, this);
+ }
+ catch(QString &errormsg)
+ {
+ QMessageBox::critical(CMainWindow::getBestWidgetForParent(),
+ tr("Failed to load file %1...").arg(filename), errormsg, QMessageBox::Abort);
+ valid = false;
+ }
+}
+
+
+void CTcxProject::loadTcx(const QString &filename, CTcxProject *project)
+{
+ QFile file(filename);
+
+ // if the file does not exist, the file name is assumed to be a name for a new project
+ if (!file.exists() || QFileInfo(filename).suffix().toLower() != "tcx")
+ {
+ project->filename.clear();
+ project->setupName(filename);
+ project->setToolTip(CGisListWks::eColumnName, project->getInfo());
+ project->valid = true;
+ return;
+ }
+
+ if (!file.open(QIODevice::ReadOnly))
+ {
+ throw tr("Failed to open %1").arg(filename);
+ }
+
+
+ QDomDocument xml;
+ QString msg;
+ int line;
+ int column;
+ if (!xml.setContent(&file, false, &msg, &line, &column))
+ {
+ file.close();
+ throw tr("Failed to read: %1\nline %2, column %3:\n %4").arg(filename).arg(line).arg(column).arg(msg);
+ }
+ file.close();
+
+ QDomElement xmlTcx = xml.documentElement();
+ if (xmlTcx.tagName() != "TrainingCenterDatabase")
+ {
+ throw tr("Not a TCX file: %1").arg(filename);
+ }
+
+ const QDomNodeList& tcxActivities = xmlTcx.elementsByTagName("Activity");
+ const QDomNodeList& tcxCourses = xmlTcx.elementsByTagName("Course");
+
+ if (!tcxActivities.item(0).isElement() && !tcxCourses.item(0).isElement())
+ {
+ if ( xmlTcx.elementsByTagName("Workout").item(0).isElement() )
+ {
+ throw tr("This TCX file contains at least 1 workout, but neither an activity nor a course. "
+ "As workouts do not contain position data, they can not be imported to QMapShack.");
+ }
+ else
+ {
+ throw tr("This TCX file does not contain any activity or course: %1").arg(filename);
+ }
+ }
+
+
+ for (int i = 0; i < tcxActivities.count(); i++)
+ {
+ project->loadActivity(tcxActivities.item(i));
+ }
+
+ for (int i = 0; i < tcxCourses.count(); i++)
+ {
+ project->loadCourse(tcxCourses.item(i));
+ }
+
+
+ project->sortItems();
+ project->setupName(QFileInfo(filename).completeBaseName().replace("_", " "));
+ project->setToolTip(CGisListWks::eColumnName, project->getInfo());
+ project->valid = true;
+}
+
+
+void CTcxProject::loadActivity(const QDomNode& activityRootNode)
+{
+ if (activityRootNode.isElement())
+ {
+ CTrackData trk;
+
+ trk.name = activityRootNode.toElement().elementsByTagName("Id").item(0).firstChild().nodeValue(); // activities do not have a "Name" but an "Id" instead (containing start date-time)
+
+ const QDomNodeList& tcxLaps = activityRootNode.toElement().elementsByTagName("Lap");
+
+ trk.segs.resize(tcxLaps.count());
+ for (int i = 0; i < tcxLaps.count(); i++) // browse laps
+ {
+ CTrackData::trkseg_t *seg = &(trk.segs[i]);
+
+ const QDomNodeList& tcxLapTrackpts = tcxLaps.item(i).toElement().elementsByTagName("Trackpoint");
+
+ for (int j = 0; j < tcxLapTrackpts.count(); j++) // browse trackpoints
+ {
+ const QDomElement &positionElement = tcxLapTrackpts.item(j).toElement().elementsByTagName("Position").item(0).toElement();
+
+ if (positionElement.isElement()) // if this trackpoint contains position, i.e. GPSr was able to capture position
+ {
+ CTrackData::trkpt_t trkpt;
+
+ IUnit::parseTimestamp(tcxLapTrackpts.item(j).toElement().elementsByTagName("Time").item(0).firstChild().nodeValue(), trkpt.time);
+
+ trkpt.lat = positionElement.elementsByTagName("LatitudeDegrees").item(0).firstChild().nodeValue().toDouble();
+ trkpt.lon = positionElement.elementsByTagName("LongitudeDegrees").item(0).firstChild().nodeValue().toDouble();
+ trkpt.ele = tcxLapTrackpts.item(j).toElement().elementsByTagName("AltitudeMeters").item(0).firstChild().nodeValue().toDouble();
+
+ const QDomElement &HRElement = tcxLapTrackpts.item(j).toElement().elementsByTagName("HeartRateBpm").item(0).toElement();
+ if (HRElement.isElement()) // if this trackpoint contains heartrate data, i.e. heartrate sensor data has been captured
+ {
+ trkpt.extensions["gpxtpx:TrackPointExtension|gpxtpx:hr"] = HRElement.elementsByTagName("Value").item(0).firstChild().nodeValue().toDouble();
+ }
+
+ const QDomElement &CADElement = tcxLapTrackpts.item(j).toElement().elementsByTagName("Cadence").item(0).toElement();
+ if (CADElement.isElement()) // if this trackpoint contains cadence data, i.e. cadence sensor data has been captured
+ {
+ trkpt.extensions["gpxtpx:TrackPointExtension|gpxtpx:cad"] = CADElement.firstChild().nodeValue().toDouble();
+ }
+
+ seg->pts.append(trkpt); // 1 TCX lap gives 1 GPX track segment
+ }
+ }
+ }
+
+ CGisItemTrk *trkItem = new CGisItemTrk(trk, this);
+ trackTypes.insert(trkItem->getKey().item, eActivity); // store the track type according to its key
+ }
+}
+
+
+void CTcxProject::loadCourse(const QDomNode& courseRootNode)
+{
+ if (courseRootNode.isElement())
+ {
+ CTrackData trk;
+
+ trk.name = courseRootNode.toElement().elementsByTagName("Name").item(0).firstChild().nodeValue();
+ trk.segs.resize(1);
+ CTrackData::trkseg_t *seg = &(trk.segs[0]);
+
+ const QDomNodeList& tcxTrackpts = courseRootNode.toElement().elementsByTagName("Trackpoint");
+
+ for (int i = 0; i < tcxTrackpts.count(); i++) // browse trackpoints
+ {
+ const QDomElement &positionElement = tcxTrackpts.item(i).toElement().elementsByTagName("Position").item(0).toElement();
+
+ if (positionElement.isElement()) // if this trackpoint contains position, i.e. GPSr was able to capture position
+ {
+ CTrackData::trkpt_t trkpt;
+
+ IUnit::parseTimestamp(tcxTrackpts.item(i).toElement().elementsByTagName("Time").item(0).firstChild().nodeValue(), trkpt.time);
+
+ trkpt.lat = positionElement.elementsByTagName("LatitudeDegrees").item(0).firstChild().nodeValue().toDouble();
+ trkpt.lon = positionElement.elementsByTagName("LongitudeDegrees").item(0).firstChild().nodeValue().toDouble();
+ trkpt.ele = tcxTrackpts.item(i).toElement().elementsByTagName("AltitudeMeters").item(0).firstChild().nodeValue().toDouble();
+
+ const QDomElement &HRElement = tcxTrackpts.item(i).toElement().elementsByTagName("HeartRateBpm").item(0).toElement();
+ if (HRElement.isElement()) // if this trackpoint contains heartrate data, i.e. heartrate sensor data has been captured
+ {
+ trkpt.extensions["gpxtpx:TrackPointExtension|gpxtpx:hr"] = HRElement.elementsByTagName("Value").item(0).firstChild().nodeValue().toDouble();
+ }
+
+ const QDomElement &CADElement = tcxTrackpts.item(i).toElement().elementsByTagName("Cadence").item(0).toElement();
+ if (CADElement.isElement()) // if this trackpoint contains cadence data, i.e. cadence sensor data has been captured
+ {
+ trkpt.extensions["gpxtpx:TrackPointExtension|gpxtpx:cad"] = CADElement.firstChild().nodeValue().toDouble();
+ }
+
+ seg->pts.append(trkpt);
+ }
+ }
+
+ CGisItemTrk *trkItem = new CGisItemTrk(trk, this);
+ trackTypes.insert(trkItem->getKey().item, eCourse); // store the track type according to its key
+
+ const QDomNodeList& tcxCoursePts = courseRootNode.toElement().elementsByTagName("CoursePoint");
+ for (int i = 0; i < tcxCoursePts.count(); i++) // browse course points
+ {
+ QString name = tcxCoursePts.item(i).toElement().elementsByTagName("Name").item(0).firstChild().nodeValue();
+ qreal lat = tcxCoursePts.item(i).toElement().elementsByTagName("Position").item(0).toElement().elementsByTagName("LatitudeDegrees").item(0).firstChild().nodeValue().toDouble();
+ qreal lon = tcxCoursePts.item(i).toElement().elementsByTagName("Position").item(0).toElement().elementsByTagName("LongitudeDegrees").item(0).firstChild().nodeValue().toDouble();
+ qreal ele = tcxCoursePts.item(i).toElement().elementsByTagName("AltitudeMeters").item(0).firstChild().nodeValue().toDouble();
+ QString icon = tcxCoursePts.item(i).toElement().elementsByTagName("PointType").item(0).firstChild().nodeValue(); // there is no "icon" in course points ; "PointType" is used instead (can be "turn left", "turn right", etc... See list in http://www8.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd)
+
+ new CGisItemWpt(QPointF(lon, lat), ele, QDateTime::currentDateTime().toUTC(), name, icon, this); // 1 TCX course point gives 1 GPX waypoint
+ }
+ }
+}
+
+
+bool CTcxProject::saveAs(const QString& fn, IGisProject& project)
+{
+ QString _fn_ = fn;
+ QFileInfo fi(_fn_);
+ if (fi.suffix().toLower() != "tcx")
+ {
+ _fn_ += ".tcx";
+ }
+
+ project.mount();
+
+ // safety check for existing files
+ QFile file(_fn_);
+ if (file.exists())
+ {
+ file.open(QIODevice::ReadOnly);
+ bool createdByQMS = false;
+
+ // load file content to xml document
+ QDomDocument xmlTcx;
+ if (xmlTcx.setContent(&file, false))
+ {
+ const QDomNodeList& tcxAuthor = xmlTcx.elementsByTagName("Author");
+ if (tcxAuthor.item(0).isElement())
+ {
+ const QDomNodeList& tcxAuthorName = tcxAuthor.item(0).toElement().elementsByTagName("Name");
+ createdByQMS = tcxAuthorName.item(0).firstChild().nodeValue() == "QMapShack";
+ }
+ }
+
+ if (!createdByQMS)
+ {
+ int res = QMessageBox::warning(CMainWindow::getBestWidgetForParent(), tr("File exists ...")
+ , tr("The file exists and it has not been created by QMapShack. "
+ "If you press 'yes' all data in this file will be lost. "
+ "Even if this file contains data and has been loaded by QMapShack, "
+ "QMapShack might not be able to load and store all elements of this file. "
+ "Those elements will be lost. I recommend to use another file. "
+ "<b>Do you really want to overwrite the file?</b>")
+ , QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
+ if (res == QMessageBox::No)
+ {
+ project.umount();
+ return false;
+ }
+ }
+ file.close();
+ }
+
+
+ // ---- start content of tcx
+ QDomDocument doc;
+ QDomElement tcx = doc.createElement("TrainingCenterDatabase");
+ doc.appendChild(tcx);
+
+ tcx.setAttribute("xmlns", "http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2");
+ tcx.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
+ tcx.setAttribute("xsi:schemaLocation", "http://www.garmin.com/xmlschemas/ProfileExtension/v1 http://www.garmin.com/xmlschemas/UserProfilePowerExtensionv1.xsd http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd http://www.garmin.com/xmlschemas/UserProfile/v2 http://www.garmin.com/xmlschemas/UserProfileExtensionv2.xsd");
+
+ QList<CGisItemTrk *> courseTrks, activityTrks;
+ for (int i = 0; i < project.childCount(); i++) // browse tracks in selected project
+ {
+ CGisItemTrk *trkItem = dynamic_cast<CGisItemTrk*>(project.child(i));
+ if (nullptr == trkItem)
+ {
+ continue; // not a track
+ }
+ else
+ {
+ if (!trkItem->isTrkTimeValid())
+ {
+ int res = QMessageBox::warning(CMainWindow::getBestWidgetForParent(), tr("Track with invalid timestamps...")
+ , tr("The track <b>%1</b> you have selected contains trackpoints with "
+ "invalid timestamps. "
+ "Device might not accept the generated TCX course file if left as is. "
+ "<b>Do you want to apply a filter with constant speed (10 m/s) and continue?</b>").arg(trkItem->getName())
+ , QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
+ if (res == QMessageBox::No)
+ {
+ project.blockUpdateItems(false);
+ return false;
+ }
+
+ if (res == QMessageBox::Yes)
+ {
+ project.blockUpdateItems(true); // block is necessary as changing the start date will also change the track position in project when project sorting order is "by date"
+ trkItem->filterSpeed(10);
+ }
+ }
+
+ QMessageBox courseOrActivityMsgBox;
+ courseOrActivityMsgBox.setWindowTitle(tr("Activity or course?"));
+ courseOrActivityMsgBox.setText(tr("QMapShack does not know how track <b>%1</b> should be saved. "
+ "<b>Do you want to save it as a course or as an activity? </b>"
+ "Remember that only waypoints close enough to the track will be saved when saving as a course. "
+ "Waypoints will not be saved when saving as an activity.").arg(trkItem->getName()));
+ QAbstractButton* pButtonCourse = courseOrActivityMsgBox.addButton(tr("Course"), QMessageBox::AcceptRole);
+ QAbstractButton* pButtonActivity = courseOrActivityMsgBox.addButton(tr("Activity"), QMessageBox::AcceptRole);
+ QAbstractButton* pButtonCancel = courseOrActivityMsgBox.addButton(tr("Cancel"), QMessageBox::RejectRole);
+
+ CTcxProject *CTcxProjectRef = dynamic_cast<CTcxProject*>(&project);
+ if (nullptr != CTcxProjectRef) // if a TCX project
+ {
+ if (!CTcxProjectRef->trackTypes.contains(trkItem->getKey().item)) // if this is an added track
+ {
+ courseOrActivityMsgBox.exec();
+
+ if (courseOrActivityMsgBox.clickedButton() == pButtonCourse)
+ {
+ courseTrks << trkItem;
+ }
+ if (courseOrActivityMsgBox.clickedButton() == pButtonActivity)
+ {
+ activityTrks << trkItem;
+ }
+ if (courseOrActivityMsgBox.clickedButton() == pButtonCancel)
+ {
+ project.blockUpdateItems(false);
+ return false;
+ }
+ }
+ else
+ {
+ if (CTcxProjectRef->trackTypes.value(trkItem->getKey().item) == eCourse) //if a course
+ {
+ courseTrks << trkItem;
+ }
+ if (CTcxProjectRef->trackTypes.value(trkItem->getKey().item) == eActivity) // if an activity
+ {
+ activityTrks << trkItem;
+ }
+ }
+ }
+ else // not a TCX project, then it is necessary to ask for each track
+ {
+ courseOrActivityMsgBox.exec();
+
+ if (courseOrActivityMsgBox.clickedButton() == pButtonCourse)
+ {
+ courseTrks << trkItem;
+ }
+ if (courseOrActivityMsgBox.clickedButton() == pButtonActivity)
+ {
+ activityTrks << trkItem;
+ }
+ if (courseOrActivityMsgBox.clickedButton() == pButtonCancel)
+ {
+ project.blockUpdateItems(false);
+ return false;
+ }
+ }
+ }
+ }
+ project.blockUpdateItems(false);
+
+
+ QDomNode activitiesNode = doc.createElement("Activities");
+ if (activityTrks.size() != 0)
+ {
+ tcx.appendChild(activitiesNode);
+ }
+ for (CGisItemTrk *trkToBeSaved : activityTrks)
+ {
+ trkToBeSaved->saveTCXactivity(activitiesNode);
+ }
+
+ QDomNode coursesNode = doc.createElement("Courses");
+ if (courseTrks.size() != 0)
+ {
+ tcx.appendChild(coursesNode);
+ }
+ for (CGisItemTrk *trkToBeSaved : courseTrks)
+ {
+ trkToBeSaved->saveTCXcourse(coursesNode);
+ }
+
+ saveAuthor(tcx);
+
+ bool res = true;
+ QString msg;
+
+ if (!file.open(QIODevice::WriteOnly))
+ {
+ // copied-pasted from CGpxProject::saveAs :
+ // "as saveAs() can be called from the thread that exports a database showing the
+ // message box will crash the app. Therefore we test if the current thread is the
+ // application's main thread. If not we forward the exception.
+ //
+ // Not sure if that is a good concept."
+ msg = tr("Failed to create file '%1'").arg(_fn_);
+ if (QThread::currentThread() == qApp->thread())
+ {
+ QMessageBox::warning(CMainWindow::getBestWidgetForParent(), tr("Saving GIS data failed..."), msg, QMessageBox::Abort);
+ }
+ else
+ {
+ throw msg;
+ }
+ res = false;
+ }
+ QTextStream out(&file);
+ out.setCodec("UTF-8");
+ out << "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\" ?>" << endl;
+
+ out << doc.toString();
+ file.close();
+ if (file.error() != QFile::NoError)
+ {
+ if (QThread::currentThread() == qApp->thread())
+ {
+ msg = tr("Failed to write file '%1'").arg(_fn_);
+ QMessageBox::warning(CMainWindow::getBestWidgetForParent(), tr("Saving GIS data failed..."), msg, QMessageBox::Abort);
+ }
+ else
+ {
+ throw msg;
+ }
+ res = false;
+ }
+ project.umount();
+ return res;
+}
+
+
+void CTcxProject::saveAuthor(QDomNode& nodeToAttachAuthor)
+{
+ QDomDocument doc = nodeToAttachAuthor.toElement().ownerDocument();
+
+ nodeToAttachAuthor.appendChild(doc.createElement("Author"));
+ nodeToAttachAuthor.lastChild().toElement().setAttribute("xsi:type", "Application_t");
+
+ nodeToAttachAuthor.lastChild().appendChild(doc.createElement("Name"));
+ nodeToAttachAuthor.lastChild().lastChild().appendChild(doc.createTextNode("QMapShack"));
+ nodeToAttachAuthor.lastChild().appendChild(doc.createElement("Build"));
+ nodeToAttachAuthor.lastChild().lastChild().appendChild(doc.createElement("Version"));
+ nodeToAttachAuthor.lastChild().lastChild().lastChild().appendChild(doc.createElement("VersionMajor"));
+ nodeToAttachAuthor.lastChild().lastChild().lastChild().lastChild().appendChild(doc.createTextNode(_MKSTR(VER_MAJOR)));
+ nodeToAttachAuthor.lastChild().lastChild().lastChild().appendChild(doc.createElement("VersionMinor"));
+ nodeToAttachAuthor.lastChild().lastChild().lastChild().lastChild().appendChild(doc.createTextNode(_MKSTR(VER_MINOR)));
+ nodeToAttachAuthor.lastChild().lastChild().lastChild().appendChild(doc.createElement("BuildMajor"));
+ nodeToAttachAuthor.lastChild().lastChild().lastChild().lastChild().appendChild(doc.createTextNode(_MKSTR(VER_STEP)));
+ nodeToAttachAuthor.lastChild().lastChild().lastChild().appendChild(doc.createElement("BuildMinor"));
+ nodeToAttachAuthor.lastChild().lastChild().lastChild().lastChild().appendChild(doc.createTextNode("0"));
+ nodeToAttachAuthor.lastChild().lastChild().appendChild(doc.createElement("Type"));
+ nodeToAttachAuthor.lastChild().lastChild().lastChild().appendChild(doc.createTextNode("Release"));
+ nodeToAttachAuthor.lastChild().appendChild(doc.createElement("LangID"));
+ nodeToAttachAuthor.lastChild().lastChild().appendChild(doc.createTextNode(QLocale().bcp47Name()));
+ nodeToAttachAuthor.lastChild().appendChild(doc.createElement("PartNumber"));
+ nodeToAttachAuthor.lastChild().lastChild().appendChild(doc.createTextNode("000-00000-00")); // dummy number
+}
+
+
+
diff --git a/src/gis/tcx/CTcxProject.h b/src/gis/tcx/CTcxProject.h
new file mode 100644
index 0000000..6034546
--- /dev/null
+++ b/src/gis/tcx/CTcxProject.h
@@ -0,0 +1,67 @@
+/**********************************************************************************************
+ 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 CTCXPROJECT_H
+#define CTCXPROJECT_H
+
+#include "gis/prj/IGisProject.h"
+
+
+class CTcxProject : public IGisProject
+{
+ Q_DECLARE_TR_FUNCTIONS(CTcxProject)
+public:
+ CTcxProject(const QString &filename, CGisListWks * parent);
+ virtual ~CTcxProject() = default;
+
+ const QString getFileDialogFilter() const override
+ {
+ return IGisProject::filedialogFilterTCX;
+ }
+
+ const QString getFileExtension() const override
+ {
+ return "tcx";
+ }
+
+ bool canSave() const override
+ {
+ return true;
+ }
+
+ static bool saveAs(const QString& fn, IGisProject& project);
+
+ static void loadTcx(const QString &filename, CTcxProject *project);
+
+private:
+ void loadTcx(const QString& filename);
+ void loadActivity(const QDomNode& activityRootNode);
+ void loadCourse(const QDomNode& courseRootNode);
+
+ static void saveAuthor(QDomNode& nodeToAttachAuthor);
+
+ enum trackType_e
+ {
+ eCourse
+ , eActivity
+ };
+
+ QMap<QString, qint8> trackTypes; //key = itemKey ; value = eCourse or eActivity
+};
+
+#endif //CTCXPROJECT_H
diff --git a/src/gis/tcx/serialization.cpp b/src/gis/tcx/serialization.cpp
new file mode 100644
index 0000000..571d4e7
--- /dev/null
+++ b/src/gis/tcx/serialization.cpp
@@ -0,0 +1,265 @@
+/**********************************************************************************************
+ Copyright (C) 2017 Michel Durand zero at cms123.fr
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#include "gis/trk/CGisItemTrk.h"
+#include "gis/wpt/CGisItemWpt.h"
+#include <QSet>
+#include <QString>
+#include <initializer_list>
+
+static std::initializer_list<QString> knownSymbols = { "1stCategory", "2ndCategory", "3rdCategory", "4thCategory", "Danger", "FirstAid", "Food",
+ "HorsCategory", "Left", "Right", "Sprint", "Straight", "Summit", "Valley", "Water" };
+
+void CGisItemWpt::saveTCX(QDomNode& courseNode, const QDateTime crsPtDateTimeToBeSaved)
+{
+ QDomDocument doc = courseNode.ownerDocument();
+
+ QDomElement xmlCrsPt = doc.createElement("CoursePoint");
+ courseNode.appendChild(xmlCrsPt);
+
+ xmlCrsPt.appendChild(doc.createElement("Name"));
+ QString str = wpt.name;
+ str.truncate(10); // course point name max size is 10 characters ; see http://www8.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd
+ xmlCrsPt.lastChild().appendChild(doc.createTextNode(str));
+
+ xmlCrsPt.appendChild(doc.createElement("Time"));
+ xmlCrsPt.lastChild().appendChild(doc.createTextNode(crsPtDateTimeToBeSaved.toString("yyyy-MM-dd'T'hh:mm:ss'Z'")));
+
+ xmlCrsPt.appendChild(doc.createElement("Position"));
+
+ xmlCrsPt.lastChild().appendChild(doc.createElement("LatitudeDegrees"));
+ str.sprintf("%1.8f", wpt.lat);
+ xmlCrsPt.lastChild().lastChild().appendChild(doc.createTextNode(str));
+
+ xmlCrsPt.lastChild().appendChild(doc.createElement("LongitudeDegrees"));
+ str.sprintf("%1.8f", wpt.lon);
+ xmlCrsPt.lastChild().lastChild().appendChild(doc.createTextNode(str));
+
+ if (wpt.ele != NOINT)
+ {
+ xmlCrsPt.appendChild(doc.createElement("AltitudeMeters"));
+ xmlCrsPt.lastChild().appendChild(doc.createTextNode(QString::number(wpt.ele)));
+ }
+
+ QString pointTypeToBeWritten;
+ if (!QSet<QString>(knownSymbols).contains(wpt.sym))
+ {
+ pointTypeToBeWritten = "Generic";
+ }
+ else
+ {
+ pointTypeToBeWritten = wpt.sym;
+ }
+
+ xmlCrsPt.appendChild(doc.createElement("PointType"));
+ xmlCrsPt.lastChild().appendChild(doc.createTextNode(pointTypeToBeWritten));
+}
+
+
+void CGisItemTrk::saveTCXcourse(QDomNode& coursesNode)
+{
+ IGisProject * project = getParentProject();
+ if (nullptr == project)
+ {
+ return;
+ }
+
+ QDomDocument doc = coursesNode.ownerDocument();
+
+ QDomElement courseNode = doc.createElement("Course");
+ coursesNode.appendChild(courseNode);
+
+ courseNode.appendChild(doc.createElement("Name"));
+ QString str = this->getName();
+ str.truncate(15); // course name max size is 15 characters ; see http://www8.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd
+ courseNode.lastChild().appendChild(doc.createTextNode(str));
+
+
+ QDomElement lapElmt = doc.createElement("Lap");
+ courseNode.appendChild(lapElmt);
+
+ lapElmt.appendChild(doc.createElement("TotalTimeSeconds"));
+ lapElmt.lastChild().appendChild(doc.createTextNode(QString::number(this->getTotalElapsedSeconds())));
+
+ lapElmt.appendChild(doc.createElement("DistanceMeters"));
+ lapElmt.lastChild().appendChild(doc.createTextNode(QString::number(this->getTotalDistance())));
+
+ lapElmt.appendChild(doc.createElement("Intensity"));
+ lapElmt.lastChild().appendChild(doc.createTextNode("Active"));
+
+ QDomElement xmlTrk = doc.createElement("Track");
+ courseNode.appendChild(xmlTrk);
+
+ QList<QDateTime> trkPtToOverwriteDateTimes;
+ QList<IGisItem::key_t> wptKeys;
+
+ for (const CTrackData::trkpt_t& trkpt : trk)
+ {
+ QDomElement xmlTrkpt = doc.createElement("Trackpoint");
+ xmlTrk.appendChild(xmlTrkpt);
+
+ xmlTrkpt.appendChild(doc.createElement("Time"));
+ xmlTrkpt.lastChild().appendChild(doc.createTextNode(trkpt.time.toString("yyyy-MM-dd'T'hh:mm:ss'Z'")));
+
+ xmlTrkpt.appendChild(doc.createElement("Position"));
+
+ xmlTrkpt.lastChild().appendChild(doc.createElement("LatitudeDegrees"));
+ QString str;
+ str.sprintf("%1.8f", trkpt.lat);
+ xmlTrkpt.lastChild().lastChild().appendChild(doc.createTextNode(str));
+
+ xmlTrkpt.lastChild().appendChild(doc.createElement("LongitudeDegrees"));
+ str.sprintf("%1.8f", trkpt.lon);
+ xmlTrkpt.lastChild().lastChild().appendChild(doc.createTextNode(str));
+
+ qint32 eleToBeWritten = NOINT;
+ if (NOINT != trkpt.ele) // if this trackpoint has elevation
+ {
+ eleToBeWritten = trkpt.ele; // take elevation on the trackpoint
+ }
+ CGisItemWpt * wpt = dynamic_cast<CGisItemWpt*>(project->getItemByKey(trkpt.keyWpt));
+ if (nullptr != wpt) // if trackpoint has an attached waypoint
+ {
+ wptKeys << trkpt.keyWpt; // store attached waypoint
+ trkPtToOverwriteDateTimes << trkpt.time; // store trackpoint dateTime
+
+ if (NOINT != wpt->getElevation()) // if waypoint has elevation
+ {
+ eleToBeWritten = wpt->getElevation(); // take elevation of the waypoint
+ }
+ }
+ if (eleToBeWritten != NOINT) // if valid elevation has been found
+ {
+ xmlTrkpt.appendChild(doc.createElement("AltitudeMeters"));
+ xmlTrkpt.lastChild().appendChild(doc.createTextNode(QString::number(eleToBeWritten)));
+ }
+
+ xmlTrkpt.appendChild(doc.createElement("DistanceMeters"));
+ xmlTrkpt.lastChild().appendChild(doc.createTextNode(QString::number(trkpt.distance)));
+
+
+ if (trkpt.extensions["gpxtpx:TrackPointExtension|gpxtpx:hr"].toString().size() != 0)
+ {
+ xmlTrkpt.appendChild(doc.createElement("HeartRateBpm"));
+ xmlTrkpt.lastChild().appendChild(doc.createElement("Value"));
+ xmlTrkpt.lastChild().lastChild().appendChild(doc.createTextNode(trkpt.extensions["gpxtpx:TrackPointExtension|gpxtpx:hr"].toString()));
+ }
+
+ if (trkpt.extensions["gpxtpx:TrackPointExtension|gpxtpx:cad"].toString().size() != 0)
+ {
+ xmlTrkpt.appendChild(doc.createElement("Cadence"));
+ xmlTrkpt.lastChild().appendChild(doc.createTextNode(trkpt.extensions["gpxtpx:TrackPointExtension|gpxtpx:cad"].toString()));
+ }
+ }
+
+ int i = 0;
+ for (const IGisItem::key_t& wptKey : wptKeys) // browse course points
+ {
+ CGisItemWpt *wptItem = dynamic_cast<CGisItemWpt*>(project->getItemByKey(wptKey));
+ wptItem->saveTCX(courseNode, trkPtToOverwriteDateTimes[i++]);
+ }
+}
+
+
+void CGisItemTrk::saveTCXactivity(QDomNode& activitiesNode)
+{
+ IGisProject * project = getParentProject();
+ if (nullptr == project)
+ {
+ return;
+ }
+
+ QDomDocument doc = activitiesNode.ownerDocument();
+
+ QDomElement activityNode = doc.createElement("Activity");
+ activitiesNode.appendChild(activityNode);
+
+ activityNode.setAttribute("Sport", "Other");
+
+ activityNode.appendChild(doc.createElement("Id"));
+ activityNode.lastChild().appendChild(doc.createTextNode(trk.segs[0].pts[0].time.toString("yyyy-MM-dd'T'hh:mm:ss'Z'")));
+
+ for (const CTrackData::trkseg_t &seg : trk.segs)
+ {
+ QDomElement lapElmt = doc.createElement("Lap");
+ activityNode.appendChild(lapElmt);
+ lapElmt.setAttribute("StartTime", seg.pts[0].time.toString("yyyy-MM-dd'T'hh:mm:ss'Z'"));
+
+ lapElmt.appendChild(doc.createElement("TotalTimeSeconds")); // "totalTime" means "time of this lap"
+ lapElmt.lastChild().appendChild(doc.createTextNode(QString::number(seg.pts.first().time.secsTo(seg.pts.last().time))));
+
+ lapElmt.appendChild(doc.createElement("DistanceMeters"));
+ lapElmt.lastChild().appendChild(doc.createTextNode(QString::number(seg.pts.last().distance - seg.pts.first().distance)));
+
+ lapElmt.appendChild(doc.createElement("Calories"));
+ lapElmt.lastChild().appendChild(doc.createTextNode("0")); // calories are unknown but a "calories" element is mandatory
+
+ lapElmt.appendChild(doc.createElement("Intensity"));
+ lapElmt.lastChild().appendChild(doc.createTextNode("Active"));
+
+ lapElmt.appendChild(doc.createElement("TriggerMethod"));
+ lapElmt.lastChild().appendChild(doc.createTextNode("Manual"));
+
+
+ QDomElement xmlTrk = doc.createElement("Track");
+ lapElmt.appendChild(xmlTrk);
+
+ for (const CTrackData::trkpt_t &trkpt : seg.pts)
+ {
+ QDomElement xmlTrkpt = doc.createElement("Trackpoint");
+ xmlTrk.appendChild(xmlTrkpt);
+
+ xmlTrkpt.appendChild(doc.createElement("Time"));
+ xmlTrkpt.lastChild().appendChild(doc.createTextNode(trkpt.time.toString("yyyy-MM-dd'T'hh:mm:ss'Z'")));
+
+ xmlTrkpt.appendChild(doc.createElement("Position"));
+
+ xmlTrkpt.lastChild().appendChild(doc.createElement("LatitudeDegrees"));
+ QString str;
+ str.sprintf("%1.8f", trkpt.lat);
+ xmlTrkpt.lastChild().lastChild().appendChild(doc.createTextNode(str));
+
+ xmlTrkpt.lastChild().appendChild(doc.createElement("LongitudeDegrees"));
+ str.sprintf("%1.8f", trkpt.lon);
+ xmlTrkpt.lastChild().lastChild().appendChild(doc.createTextNode(str));
+
+
+ if (NOINT != trkpt.ele) // if this trackpoint has elevation
+ {
+ xmlTrkpt.appendChild(doc.createElement("AltitudeMeters"));
+ xmlTrkpt.lastChild().appendChild(doc.createTextNode(QString::number(trkpt.ele)));
+ }
+
+ xmlTrkpt.appendChild(doc.createElement("DistanceMeters"));
+ xmlTrkpt.lastChild().appendChild(doc.createTextNode(QString::number(trkpt.distance)));
+
+ if (trkpt.extensions["gpxtpx:TrackPointExtension|gpxtpx:hr"].toString().size() != 0)
+ {
+ xmlTrkpt.appendChild(doc.createElement("HeartRateBpm"));
+ xmlTrkpt.lastChild().appendChild(doc.createElement("Value"));
+ xmlTrkpt.lastChild().lastChild().appendChild(doc.createTextNode(trkpt.extensions["gpxtpx:TrackPointExtension|gpxtpx:hr"].toString()));
+ }
+
+ if (trkpt.extensions["gpxtpx:TrackPointExtension|gpxtpx:cad"].toString().size() != 0)
+ {
+ xmlTrkpt.appendChild(doc.createElement("Cadence"));
+ xmlTrkpt.lastChild().appendChild(doc.createTextNode(trkpt.extensions["gpxtpx:TrackPointExtension|gpxtpx:cad"].toString()));
+ }
+ }
+ }
+}
diff --git a/src/gis/trk/CActivityTrk.cpp b/src/gis/trk/CActivityTrk.cpp
index e55b31c..0584899 100644
--- a/src/gis/trk/CActivityTrk.cpp
+++ b/src/gis/trk/CActivityTrk.cpp
@@ -172,7 +172,7 @@ void CActivityTrk::update()
continue;
}
lastTrkpt = &pt;
- if(pt.flags != lastFlag)
+ if((pt.flags & CTrackData::trkpt_t::eActMask) != lastFlag)
{
if(startTrkpt != nullptr)
{
@@ -200,7 +200,7 @@ void CActivityTrk::update()
}
startTrkpt = &pt;
- lastFlag = pt.flags;
+ lastFlag = pt.flags & CTrackData::trkpt_t::eActMask;
}
}
diff --git a/src/gis/trk/CCutTrk.cpp b/src/gis/trk/CCutTrk.cpp
index f061476..307044b 100644
--- a/src/gis/trk/CCutTrk.cpp
+++ b/src/gis/trk/CCutTrk.cpp
@@ -48,6 +48,17 @@ CCutTrk::CCutTrk(QWidget *parent)
break;
}
+ switch(cfg.value("cutMode", eCutMode2).toInt())
+ {
+ case eCutMode1:
+ radioCutMode1->setChecked(true);
+ break;
+
+ case eCutMode2:
+ radioCutMode2->setChecked(true);
+ break;
+ }
+
cfg.endGroup();
}
@@ -58,6 +69,7 @@ void CCutTrk::accept()
cfg.beginGroup("TrackCut");
cfg.setValue("checkCreateClone", checkCreateClone->isChecked());
cfg.setValue("mode", radioKeepFirst->isChecked() ? eModeKeepFirst : radioKeepBoth->isChecked() ? eModeKeepBoth : radioKeepSecond->isChecked() ? eModeKeepSecond : eModeNone);
+ cfg.setValue("cutMode", radioCutMode1->isChecked() ? eCutMode1 : eCutMode2);
cfg.endGroup();
if(radioKeepFirst->isChecked())
@@ -73,6 +85,15 @@ void CCutTrk::accept()
mode = eModeKeepSecond;
}
+ if(radioCutMode1->isChecked())
+ {
+ cutMode = eCutMode1;
+ }
+ else
+ {
+ cutMode = eCutMode2;
+ }
+
QDialog::accept();
}
diff --git a/src/gis/trk/CCutTrk.h b/src/gis/trk/CCutTrk.h
index 6f6d0fe..9da9ed4 100644
--- a/src/gis/trk/CCutTrk.h
+++ b/src/gis/trk/CCutTrk.h
@@ -37,11 +37,22 @@ public:
, eModeKeepSecond = 4
};
+ enum cutmode_e
+ {
+ eCutMode1
+ ,eCutMode2
+ };
+
mode_e getMode() const
{
return mode;
}
+ cutmode_e getCutMode() const
+ {
+ return cutMode;
+ }
+
bool createClone()
{
return checkCreateClone->isChecked();
@@ -55,6 +66,7 @@ private slots:
private:
mode_e mode = eModeNone;
+ cutmode_e cutMode = eCutMode2;
};
#endif //CCUTTRK_H
diff --git a/src/gis/trk/CGisItemTrk.cpp b/src/gis/trk/CGisItemTrk.cpp
index 08e6f59..c662914 100644
--- a/src/gis/trk/CGisItemTrk.cpp
+++ b/src/gis/trk/CGisItemTrk.cpp
@@ -677,6 +677,8 @@ QPointF CGisItemTrk::getPointCloseBy(const QPoint& screenPos)
}
+
+
bool CGisItemTrk::isRangeSelected() const
{
return mouseRange1 != mouseRange2;
@@ -1195,8 +1197,9 @@ bool CGisItemTrk::cut()
return false;
}
- qint32 idxMouse = mouseClickFocus->idxTotal;
- CCutTrk::mode_e mode = dlg.getMode();
+ qint32 idxMouse = mouseClickFocus->idxTotal;
+ CCutTrk::mode_e mode = dlg.getMode();
+ CCutTrk::cutmode_e cutMode = dlg.getCutMode();
// if the cut action results into cloning a track, the calling method should
// ask if the original track should be removed. As a track can't delete itself
@@ -1209,14 +1212,20 @@ bool CGisItemTrk::cut()
// clone first part?
if((mode & (CCutTrk::eModeKeepBoth|CCutTrk::eModeKeepFirst)) != 0)
{
- QString name = getName() + QString(" (%1 - %2)").arg(0).arg(idxMouse);
+ int idx = cutMode == CCutTrk::eCutMode1 ? idxMouse - 1 : idxMouse;
+ if(idx < 0)
+ {
+ idx = 0;
+ }
+
+ QString name = getName() + QString(" (%1 - %2)").arg(0).arg(idx);
IGisProject *project = nullptr;
if(!getNameAndProject(name, project, tr("track")))
{
return false;
}
- new CGisItemTrk(name, 0, idxMouse, trk, project);
+ new CGisItemTrk(name, 0, idx, trk, project);
}
// clone second part?
@@ -2426,7 +2435,7 @@ void CGisItemTrk::setupInterpolation(bool on, qint32 q)
}
catch(const alglib::ap_error& e)
{
- qDebug() << e.msg.c_str();
+ qWarning() << "Error from alglib: " << e.msg.c_str();
}
interp.valid = interp.info > 0;
@@ -2436,19 +2445,17 @@ void CGisItemTrk::setupInterpolation(bool on, qint32 q)
qreal CGisItemTrk::getElevationInterpolated(qreal d)
{
- qreal res = NOFLOAT;
-
try
{
- res = alglib::spline1dcalc(interp.p, d);
+ return alglib::spline1dcalc(interp.p, d);
}
catch(const alglib::ap_error& e)
{
- qDebug() << e.msg.c_str();
+ qWarning() << "Error from alglib: " << e.msg.c_str();
interp.valid = false;
}
- return res;
+ return NOFLOAT;
}
diff --git a/src/gis/trk/CGisItemTrk.h b/src/gis/trk/CGisItemTrk.h
index 4704abb..e903d15 100644
--- a/src/gis/trk/CGisItemTrk.h
+++ b/src/gis/trk/CGisItemTrk.h
@@ -32,6 +32,7 @@
#include <functional>
#include <interpolation.h>
+
class QDomNode;
class IGisProject;
class INotifyTrk;
@@ -139,11 +140,27 @@ public:
@param gpx The <gpx> node to append by the track
*/
void save(QDomNode& gpx, bool strictGpx11) override;
+
/**
@brief Save track to TwoNav track file
@param dir the path to store the file
*/
bool saveTwoNav(const QString& filename);
+
+ /**
+ @brief Save track as TCX course (including correlated course points)
+ @param coursesNode The node to append by the course
+ */
+ void saveTCXcourse(QDomNode& coursesNode);
+
+
+ /**
+ @brief Save track as TCX activity
+ @param activitiesNode The node to append by the activity
+ */
+ void saveTCXactivity(QDomNode& activitiesNode);
+
+
/**
@brief Read serialized track from a binary data stream
@param stream the data stream to read from
@@ -163,6 +180,9 @@ public:
return trk.name.isEmpty() ? noName : trk.name;
}
+ /// returns "true" when trk has no time-related invalid points
+ bool isTrkTimeValid() { return (allValidFlags & CTrackData::trkpt_t::eInvalidTime) == 0; }
+
QDateTime getTimestamp() const override { return getTimeStart(); }
/// get the track color as index into the Garmin color table
diff --git a/src/gis/trk/ICombineTrk.ui b/src/gis/trk/ICombineTrk.ui
index 447f9a9..ae1e38e 100644
--- a/src/gis/trk/ICombineTrk.ui
+++ b/src/gis/trk/ICombineTrk.ui
@@ -6,18 +6,29 @@
<rect>
<x>0</x>
<y>0</y>
- <width>473</width>
- <height>369</height>
+ <width>571</width>
+ <height>374</height>
</rect>
</property>
<property name="windowTitle">
<string>Combine Tracks...</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_3">
+ <layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <widget class="QListWidget" name="listAvailable"/>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Available Tracks</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QListWidget" name="listAvailable"/>
+ </item>
+ </layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout">
@@ -91,7 +102,18 @@
</layout>
</item>
<item>
- <widget class="QListWidget" name="listSelected"/>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <item>
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Combined Tracks</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QListWidget" name="listSelected"/>
+ </item>
+ </layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
diff --git a/src/gis/trk/ICutTrk.ui b/src/gis/trk/ICutTrk.ui
index 2388988..86ac31f 100644
--- a/src/gis/trk/ICutTrk.ui
+++ b/src/gis/trk/ICutTrk.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>400</width>
- <height>164</height>
+ <height>215</height>
</rect>
</property>
<property name="windowTitle">
@@ -19,6 +19,9 @@
<property name="text">
<string>Delete first part of the track and keep second one</string>
</property>
+ <attribute name="buttonGroup">
+ <string notr="true">buttonGroup_2</string>
+ </attribute>
</widget>
</item>
<item>
@@ -29,6 +32,9 @@
<property name="checked">
<bool>true</bool>
</property>
+ <attribute name="buttonGroup">
+ <string notr="true">buttonGroup_2</string>
+ </attribute>
</widget>
</item>
<item>
@@ -36,9 +42,79 @@
<property name="text">
<string>Keep first part of the track and delete second one</string>
</property>
+ <attribute name="buttonGroup">
+ <string notr="true">buttonGroup_2</string>
+ </attribute>
</widget>
</item>
<item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Cut Mode:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="radioCutMode1">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="../../resources.qrc">
+ <normaloff>:/icons/32x32/CutMode1.png</normaloff>:/icons/32x32/CutMode1.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>32</width>
+ <height>32</height>
+ </size>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">buttonGroup</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="radioCutMode2">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="../../resources.qrc">
+ <normaloff>:/icons/32x32/CutMode2.png</normaloff>:/icons/32x32/CutMode2.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>32</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">buttonGroup</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -83,7 +159,9 @@ If you want to keep just one half you can simply remove the points, or check thi
</item>
</layout>
</widget>
- <resources/>
+ <resources>
+ <include location="../../resources.qrc"/>
+ </resources>
<connections>
<connection>
<sender>buttonBox</sender>
@@ -118,4 +196,8 @@ If you want to keep just one half you can simply remove the points, or check thi
</hints>
</connection>
</connections>
+ <buttongroups>
+ <buttongroup name="buttonGroup"/>
+ <buttongroup name="buttonGroup_2"/>
+ </buttongroups>
</ui>
diff --git a/src/gis/trk/IDetailsTrk.ui b/src/gis/trk/IDetailsTrk.ui
index b497682..087fb14 100644
--- a/src/gis/trk/IDetailsTrk.ui
+++ b/src/gis/trk/IDetailsTrk.ui
@@ -262,7 +262,7 @@
</size>
</property>
<property name="toolTip">
- <string><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></string>
+ <string>The track was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </string>
</property>
<property name="text">
<string/>
@@ -1644,10 +1644,10 @@
</resources>
<connections/>
<buttongroups>
- <buttongroup name="buttonGroupLineWidth"/>
<buttongroup name="buttonGroupGraph3"/>
- <buttongroup name="buttonGroupGraph2"/>
- <buttongroup name="buttonGroupGraph1"/>
<buttongroup name="buttonGroupArrow"/>
+ <buttongroup name="buttonGroupGraph1"/>
+ <buttongroup name="buttonGroupLineWidth"/>
+ <buttongroup name="buttonGroupGraph2"/>
</buttongroups>
</ui>
diff --git a/src/gis/wpt/CGisItemWpt.cpp b/src/gis/wpt/CGisItemWpt.cpp
index 72805b7..696e3ac 100644
--- a/src/gis/wpt/CGisItemWpt.cpp
+++ b/src/gis/wpt/CGisItemWpt.cpp
@@ -222,7 +222,10 @@ bool CGisItemWpt::getNewWptData(QPointF& pt, QString& icon, QString& name)
}
}
- name = lastName;
+ if(name.isEmpty())
+ {
+ name = lastName;
+ }
icon = lastIcon;
CSetupNewWpt dlg(pt, icon, name, CMainWindow::getBestWidgetForParent());
@@ -569,7 +572,7 @@ void CGisItemWpt::drawHighlight(QPainter& p)
return;
}
- p.drawImage(posScreen - QPointF(31,31), QImage("://cursors/wptHighlight.png"));
+ p.drawImage(posScreen - QPointF(31,31), QImage("://cursors/wptHighlightRed.png"));
}
void CGisItemWpt::drawBubble(QPainter& p)
diff --git a/src/gis/wpt/CGisItemWpt.h b/src/gis/wpt/CGisItemWpt.h
index 0a9f22e..f466bb0 100644
--- a/src/gis/wpt/CGisItemWpt.h
+++ b/src/gis/wpt/CGisItemWpt.h
@@ -157,6 +157,12 @@ public:
*/
void saveTwoNav(QTextStream &out, const QDir &dir);
/**
+ @brief Save waypoint to TCX file
+ @param courseNode The course node to append by the waypoint
+ @param crsPtDateTimeToBeSaved course point dateTime to be saved (NOT the waypoint date and time !)
+ */
+ void saveTCX(QDomNode& courseNode, const QDateTime crsPtDateTimeToBeSaved);
+ /**
@brief Read serialized waypoint from a binary data stream
@param stream the data stream to read from
@return A reference to the stream
diff --git a/src/gis/wpt/IDetailsWpt.ui b/src/gis/wpt/IDetailsWpt.ui
index 9174d9a..b1feda2 100644
--- a/src/gis/wpt/IDetailsWpt.ui
+++ b/src/gis/wpt/IDetailsWpt.ui
@@ -265,7 +265,7 @@
</size>
</property>
<property name="toolTip">
- <string><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></string>
+ <string>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </string>
</property>
<property name="text">
<string/>
diff --git a/src/helpers/CProgressDialog.cpp b/src/helpers/CProgressDialog.cpp
index fe121a8..ce9ec62 100644
--- a/src/helpers/CProgressDialog.cpp
+++ b/src/helpers/CProgressDialog.cpp
@@ -42,8 +42,11 @@ CProgressDialog::CProgressDialog(const QString text, int min, int max, QWidget *
if(max == NOINT)
{
progressBar->hide();
+ // add a timer to update the elapsed time
+ QTimer * timer = new QTimer(this);
+ timer->start(1000);
+ connect(timer, &QTimer::timeout, this, [this]{setValue(0);});
}
-
hide();
QTimer::singleShot(1000, this, SLOT(show()));
}
@@ -70,6 +73,7 @@ void CProgressDialog::enableCancel(bool yes)
void CProgressDialog::reject()
{
setResult(QMessageBox::Abort);
+ emit rejected();
}
void CProgressDialog::setValue(int val)
diff --git a/src/helpers/CSelectProjectDialog.cpp b/src/helpers/CSelectProjectDialog.cpp
index 5dd7036..8f1501c 100644
--- a/src/helpers/CSelectProjectDialog.cpp
+++ b/src/helpers/CSelectProjectDialog.cpp
@@ -98,6 +98,7 @@ CSelectProjectDialog::CSelectProjectDialog(QString &key, QString &name, IGisProj
connect(radioGpx, &QRadioButton::clicked, this, &CSelectProjectDialog::slotTypeChanged);
connect(radioDatabase, &QRadioButton::toggled, this, &CSelectProjectDialog::slotTypeChanged);
+ lineEdit->setFocus();
adjustSize();
CCanvas::setOverrideCursor(Qt::ArrowCursor, "CSelectProjectDialog");
diff --git a/src/icons/32x32/CutMode1.png b/src/icons/32x32/CutMode1.png
new file mode 100644
index 0000000..b9637cd
Binary files /dev/null and b/src/icons/32x32/CutMode1.png differ
diff --git a/src/icons/32x32/CutMode2.png b/src/icons/32x32/CutMode2.png
new file mode 100644
index 0000000..a4304ef
Binary files /dev/null and b/src/icons/32x32/CutMode2.png differ
diff --git a/src/icons/32x32/QMapShack.png b/src/icons/32x32/QMapShack.png
index f0234b7..faa6b61 100644
Binary files a/src/icons/32x32/QMapShack.png and b/src/icons/32x32/QMapShack.png differ
diff --git a/src/icons/32x32/TcxProject.png b/src/icons/32x32/TcxProject.png
new file mode 100644
index 0000000..3707d7a
Binary files /dev/null and b/src/icons/32x32/TcxProject.png differ
diff --git a/src/icons/48x48/CutMode1.png b/src/icons/48x48/CutMode1.png
new file mode 100644
index 0000000..82da7b2
Binary files /dev/null and b/src/icons/48x48/CutMode1.png differ
diff --git a/src/icons/48x48/CutMode2.png b/src/icons/48x48/CutMode2.png
new file mode 100644
index 0000000..67495ee
Binary files /dev/null and b/src/icons/48x48/CutMode2.png differ
diff --git a/src/icons/48x48/QMapShack.png b/src/icons/48x48/QMapShack.png
index ff8b396..28ee5ef 100644
Binary files a/src/icons/48x48/QMapShack.png and b/src/icons/48x48/QMapShack.png differ
diff --git a/src/icons/48x48/TcxProject.png b/src/icons/48x48/TcxProject.png
new file mode 100644
index 0000000..ab575c5
Binary files /dev/null and b/src/icons/48x48/TcxProject.png differ
diff --git a/src/icons/CutMode1.svg b/src/icons/CutMode1.svg
new file mode 100644
index 0000000..94debf9
--- /dev/null
+++ b/src/icons/CutMode1.svg
@@ -0,0 +1,123 @@
+<?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="CutMode1.svg">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="7.919596"
+ inkscape:cx="21.705272"
+ inkscape:cy="31.160294"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="989"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2985"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-988.36218)">
+ <rect
+ style="fill:none;stroke:none"
+ id="rect3781"
+ width="55"
+ height="55"
+ x="4.8910232"
+ y="992.55994" />
+ <g
+ id="g4191"
+ transform="translate(-14.849374,-5.9340755)"
+ inkscape:transform-center-x="1.7677669"
+ inkscape:transform-center-y="-2.0203051"
+ style="fill:#000080">
+ <rect
+ y="1023.494"
+ x="19.748098"
+ height="5"
+ width="10.024744"
+ id="rect2987"
+ style="fill:#000080;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+ <path
+ sodipodi:open="true"
+ sodipodi:end="3.1371459"
+ sodipodi:start="3.1402285"
+ d="m 27.862134,1026.0008 a 5,5 0 0 1 4.989321,-5.0068 5,5 0 0 1 5.010653,4.9855 5,5 0 0 1 -4.981598,5.0145 5,5 0 0 1 -5.018331,-4.9777"
+ sodipodi:ry="5"
+ sodipodi:rx="5"
+ sodipodi:cy="1025.994"
+ sodipodi:cx="32.862129"
+ id="path2989"
+ style="fill:#000080;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ sodipodi:type="arc" />
+ </g>
+ <g
+ id="g4191-7"
+ transform="matrix(-1,0,0,-1,79.631418,2046.054)"
+ inkscape:transform-center-x="-1.7677665"
+ inkscape:transform-center-y="2.0202734"
+ style="fill:#ff0000">
+ <rect
+ y="1023.494"
+ x="19.748098"
+ height="5"
+ width="10.024744"
+ id="rect2987-5"
+ style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+ <path
+ sodipodi:open="true"
+ sodipodi:end="3.1371459"
+ sodipodi:start="3.1402285"
+ d="m 27.862134,1026.0008 a 5,5 0 0 1 4.989321,-5.0068 5,5 0 0 1 5.010653,4.9855 5,5 0 0 1 -4.981598,5.0145 5,5 0 0 1 -5.018331,-4.9777"
+ sodipodi:ry="5"
+ sodipodi:rx="5"
+ sodipodi:cy="1025.994"
+ sodipodi:cx="32.862129"
+ id="path2989-3"
+ style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ sodipodi:type="arc" />
+ </g>
+ </g>
+</svg>
diff --git a/src/icons/CutMode2.svg b/src/icons/CutMode2.svg
new file mode 100644
index 0000000..8b95f5e
--- /dev/null
+++ b/src/icons/CutMode2.svg
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="64"
+ height="64"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="CutMode2.svg">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="7.919596"
+ inkscape:cx="7.500002"
+ inkscape:cy="31.160294"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="989"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2985"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-988.36218)">
+ <rect
+ style="fill:none;stroke:none"
+ id="rect3781"
+ width="55"
+ height="55"
+ x="4.8910232"
+ y="992.55994" />
+ <rect
+ style="fill:#000080;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ id="rect2987"
+ width="25.808378"
+ height="5"
+ x="4.8987246"
+ y="1017.5599" />
+ <rect
+ style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ id="rect2987-5"
+ width="24.419418"
+ height="5"
+ x="-59.88332"
+ y="-1022.56"
+ transform="scale(-1,-1)" />
+ <path
+ sodipodi:type="arc"
+ style="fill:#000080;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ id="path2989-3"
+ sodipodi:cx="-32.769287"
+ sodipodi:cy="-1020.06"
+ sodipodi:rx="5"
+ sodipodi:ry="5"
+ d="m -37.769282,-1020.0532 a 5,5 0 0 1 4.989321,-5.0068 5,5 0 0 1 5.010653,4.9855 5,5 0 0 1 -4.981599,5.0145 5,5 0 0 1 -5.018331,-4.9778"
+ sodipodi:start="3.1402285"
+ sodipodi:end="3.1371459"
+ sodipodi:open="true"
+ transform="scale(-1,-1)" />
+ </g>
+</svg>
diff --git a/src/icons/TcxProject.svg b/src/icons/TcxProject.svg
new file mode 100644
index 0000000..f8a5e6f
--- /dev/null
+++ b/src/icons/TcxProject.svg
@@ -0,0 +1,114 @@
+<?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="TcxProject.svg">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.2"
+ inkscape:cx="-8.397082"
+ inkscape:cy="35.807015"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="989"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2985"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-988.36218)">
+ <g
+ id="g4185">
+ <path
+ sodipodi:nodetypes="csssc"
+ inkscape:connector-curvature="0"
+ id="path3078"
+ d="m 54,1014.3622 c 0,0 -15,1 -23,6 -6.836781,4.273 14.72678,4.2732 11,8 -3.72678,3.7268 -28.376052,2.4145 -32.8593751,5.1854 -2.0050036,1.2391 -5.0000004,5 -5.0000004,5"
+ style="fill:none;stroke:#000080;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3763"
+ d="m 27.270471,992.71371 25.339695,10.78739 -28.507157,10.7873 3.167462,-21.57469"
+ style="fill:#00ffff;stroke:#00ffff;stroke-width:1.34993112;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="cccc"
+ inkscape:connector-curvature="0"
+ id="path3761"
+ d="m 20.720056,1031.245 3.609174,-39.39147 3.609174,0 z"
+ style="fill:#000000;stroke:#000000;stroke-width:0.71901649px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+ <rect
+ y="991.49402"
+ x="2.640624"
+ height="40"
+ width="40"
+ id="rect3769"
+ style="fill:none;stroke:none" />
+ <text
+ transform="matrix(0,-1,1,0,0,0)"
+ sodipodi:linespacing="125%"
+ id="text3848"
+ y="15.999999"
+ x="-1032.9608"
+ style="font-style:normal;font-weight:bold;font-size:14px;line-height:125%;font-family:Sans;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+ xml:space="preserve"><tspan
+ style="font-size:18px"
+ y="15.999999"
+ x="-1032.9608"
+ id="tspan3850"
+ sodipodi:role="line">TCX</tspan></text>
+ <flowRoot
+ 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"
+ id="flowRoot3859"
+ xml:space="preserve"><flowRegion
+ id="flowRegion3861"><rect
+ y="2.2142856"
+ x="-9.4642859"
+ height="62.142857"
+ width="75.35714"
+ id="rect3863" /></flowRegion><flowPara
+ id="flowPara3865" /></flowRoot> </g>
+ </g>
+</svg>
diff --git a/src/icons/hicolor/128x128/apps/QMapShack.png b/src/icons/hicolor/128x128/apps/QMapShack.png
index 59f9416..905c890 100644
Binary files a/src/icons/hicolor/128x128/apps/QMapShack.png 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
index a8ef599..4e8f11b 100644
Binary files a/src/icons/hicolor/16x16/apps/QMapShack.png 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
index b8119e3..21de05a 100644
Binary files a/src/icons/hicolor/192x192/apps/QMapShack.png 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
index 8ef5988..4d377b9 100644
Binary files a/src/icons/hicolor/22x22/apps/QMapShack.png 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
index 2bfe85f..5182343 100644
Binary files a/src/icons/hicolor/24x24/apps/QMapShack.png 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
index e42064b..a6128bd 100644
Binary files a/src/icons/hicolor/256x256/apps/QMapShack.png 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
index 420965c..faa6b61 100644
Binary files a/src/icons/hicolor/32x32/apps/QMapShack.png 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
index 41df7c9..b85e460 100644
Binary files a/src/icons/hicolor/36x36/apps/QMapShack.png 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
index 37cb7ea..841f185 100644
Binary files a/src/icons/hicolor/40x40/apps/QMapShack.png 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
index cd85a7d..abed752 100644
Binary files a/src/icons/hicolor/42x42/apps/QMapShack.png 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
index cdf3b77..28ee5ef 100644
Binary files a/src/icons/hicolor/48x48/apps/QMapShack.png 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
index 06f70cc..2bbd086 100644
Binary files a/src/icons/hicolor/512x512/apps/QMapShack.png 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
index 013e1d2..486898a 100644
Binary files a/src/icons/hicolor/64x64/apps/QMapShack.png 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
index 37fa8df..557d00e 100644
Binary files a/src/icons/hicolor/72x72/apps/QMapShack.png 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
index 77b612c..a78cf63 100644
Binary files a/src/icons/hicolor/80x80/apps/QMapShack.png 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
index 77fabeb..61132af 100644
Binary files a/src/icons/hicolor/8x8/apps/QMapShack.png 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
index 426d660..6b88a4a 100644
Binary files a/src/icons/hicolor/96x96/apps/QMapShack.png and b/src/icons/hicolor/96x96/apps/QMapShack.png differ
diff --git a/src/icons/makeicons b/src/icons/makeicons
index 44405ad..1f3bfca 100755
--- a/src/icons/makeicons
+++ b/src/icons/makeicons
@@ -4,8 +4,13 @@ function call_inkscape {
# $1: width = height
# $2: source file (*.svg)
# $3: target file (*.png)
- echo -n "$1x$1 "
- inkscape -D -w $1 -h $1 $2 --export-png=$1x$1/$3 >/dev/null 2>&1
+ echo -n "$1x$1 "
+
+ if [ "$4" == "hicolor" ]; then
+ inkscape -D -w $1 -h $1 $2 --export-png=./hicolor/$1x$1/apps/$3 >/dev/null 2>&1
+ else
+ inkscape -D -w $1 -h $1 $2 --export-png=$1x$1/$3 >/dev/null 2>&1
+ fi
if [ ! $? -eq 0 ]; then
echo -n "ERROR "
fi
@@ -22,6 +27,25 @@ function convert {
if [[ $1 =~ EditDetails\.svg ]]; then
call_inkscape 16 $1 $NAME
fi
+ if [[ $1 =~ QMapShack\.svg ]]; then
+ call_inkscape 8 $1 $NAME hicolor
+ call_inkscape 16 $1 $NAME hicolor
+ call_inkscape 22 $1 $NAME hicolor
+ call_inkscape 24 $1 $NAME hicolor
+ call_inkscape 32 $1 $NAME hicolor
+ call_inkscape 36 $1 $NAME hicolor
+ call_inkscape 40 $1 $NAME hicolor
+ call_inkscape 42 $1 $NAME hicolor
+ call_inkscape 48 $1 $NAME hicolor
+ call_inkscape 64 $1 $NAME hicolor
+ call_inkscape 72 $1 $NAME hicolor
+ call_inkscape 80 $1 $NAME hicolor
+ call_inkscape 96 $1 $NAME hicolor
+ call_inkscape 128 $1 $NAME hicolor
+ call_inkscape 192 $1 $NAME hicolor
+ call_inkscape 256 $1 $NAME hicolor
+ call_inkscape 512 $1 $NAME hicolor
+ fi
call_inkscape 32 $1 $NAME
call_inkscape 48 $1 $NAME
diff --git a/src/icons/waypoints/1stCategory.svg b/src/icons/waypoints/1stCategory.svg
new file mode 100644
index 0000000..82a3072
--- /dev/null
+++ b/src/icons/waypoints/1stCategory.svg
@@ -0,0 +1,117 @@
+<?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="12.607673mm"
+ height="12.593531mm"
+ viewBox="0 0 12.607673 12.593531"
+ version="1.1"
+ id="svg6327"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="1stCategory.svg">
+ <defs
+ id="defs6321" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#767676"
+ bordercolor="#457e66"
+ borderopacity="1"
+ inkscape:pageopacity="0.34901961"
+ inkscape:pageshadow="2"
+ inkscape:zoom="7.919596"
+ inkscape:cx="24.478426"
+ inkscape:cy="36.50038"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1855"
+ inkscape:window-height="1056"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ showguides="true"
+ units="mm">
+ <inkscape:grid
+ type="xygrid"
+ id="grid6329"
+ originx="-163.03157"
+ originy="-131.28158"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ <sodipodi:guide
+ position="0,0"
+ orientation="0,44.672855"
+ id="guide2987" />
+ <sodipodi:guide
+ position="44.672855,0"
+ orientation="-44.622746,0"
+ id="guide2989" />
+ <sodipodi:guide
+ position="44.672855,44.622746"
+ orientation="0,-44.672855"
+ id="guide2991" />
+ <sodipodi:guide
+ position="0,44.622746"
+ orientation="44.622746,0"
+ id="guide2993" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata6324">
+ <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="Calque 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-163.03157,-153.1249)"
+ style="opacity:1">
+ <rect
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.42991042;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2995"
+ width="10.16278"
+ height="10.191433"
+ x="164.2216"
+ y="154.33534" />
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 164.04167,164.70833 174.625,154.125 v 3.96875"
+ id="path3789-1-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 174.625,154.125 h -3.96875"
+ id="path3789-1-2-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.36416434999999936px;line-height:1.25000000000000000;font-family:Aharoni;-inkscape-font-specification:Aharoni;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.30910410999999999"
+ x="178.10426"
+ y="150.33669"
+ id="text6333"
+ transform="scale(0.91222156,1.0962249)"><tspan
+ sodipodi:role="line"
+ x="178.10426"
+ y="150.33669"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Swis721 BlkEx BT;-inkscape-font-specification:Swis721 BlkEx BT;fill:#000080;fill-opacity:1;stroke-width:0.30910410999999999"
+ id="tspan6335">1</tspan></text>
+ </g>
+</svg>
diff --git a/src/icons/waypoints/2ndCategory.svg b/src/icons/waypoints/2ndCategory.svg
new file mode 100644
index 0000000..aa3747f
--- /dev/null
+++ b/src/icons/waypoints/2ndCategory.svg
@@ -0,0 +1,98 @@
+<?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="12.607673mm"
+ height="12.593531mm"
+ viewBox="0 0 12.607673 12.593531"
+ version="1.1"
+ id="svg6327"
+ sodipodi:docname="2ndCategory.svg"
+ inkscape:version="0.48.4 r9939">
+ <defs
+ id="defs6321" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#a6a6a6"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="5.6"
+ inkscape:cx="-37.750768"
+ inkscape:cy="16.434909"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1855"
+ inkscape:window-height="1056"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ units="mm">
+ <inkscape:grid
+ type="xygrid"
+ id="grid6329"
+ originx="-163.03157"
+ originy="-131.28158"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata6324">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Calque 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-163.03157,-153.1249)">
+ <rect
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.42991042;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2995"
+ width="10.16278"
+ height="10.191433"
+ x="164.272"
+ y="154.33534" />
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 164.04167,164.70833 174.625,154.125 v 3.96875"
+ id="path3789-1-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 174.625,154.125 h -3.96875"
+ id="path3789-1-2-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.41636658px;line-height:1.25;font-family:Aharoni;-inkscape-font-specification:Aharoni;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.26040918"
+ x="196.60353"
+ y="137.21951"
+ id="text6333"
+ transform="scale(0.83406315,1.19895)"><tspan
+ sodipodi:role="line"
+ x="196.60353"
+ y="137.21951"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Swis721 BlkEx BT';-inkscape-font-specification:'Swis721 BlkEx BT';fill:#000080;fill-opacity:1;stroke-width:0.26040918"
+ id="tspan6335">2</tspan></text>
+ </g>
+</svg>
diff --git a/src/icons/waypoints/32x32/1stCategory.png b/src/icons/waypoints/32x32/1stCategory.png
new file mode 100644
index 0000000..2f6b974
Binary files /dev/null and b/src/icons/waypoints/32x32/1stCategory.png differ
diff --git a/src/icons/waypoints/32x32/2ndCategory.png b/src/icons/waypoints/32x32/2ndCategory.png
new file mode 100644
index 0000000..9330ebc
Binary files /dev/null and b/src/icons/waypoints/32x32/2ndCategory.png differ
diff --git a/src/icons/waypoints/32x32/3rdCategory.png b/src/icons/waypoints/32x32/3rdCategory.png
new file mode 100644
index 0000000..5e91fb3
Binary files /dev/null and b/src/icons/waypoints/32x32/3rdCategory.png differ
diff --git a/src/icons/waypoints/32x32/4thCategory.png b/src/icons/waypoints/32x32/4thCategory.png
new file mode 100644
index 0000000..125253c
Binary files /dev/null and b/src/icons/waypoints/32x32/4thCategory.png differ
diff --git a/src/icons/waypoints/32x32/Danger.png b/src/icons/waypoints/32x32/Danger.png
new file mode 100644
index 0000000..1355239
Binary files /dev/null and b/src/icons/waypoints/32x32/Danger.png differ
diff --git a/src/icons/waypoints/32x32/FirstAid.png b/src/icons/waypoints/32x32/FirstAid.png
new file mode 100644
index 0000000..0732650
Binary files /dev/null and b/src/icons/waypoints/32x32/FirstAid.png differ
diff --git a/src/icons/waypoints/32x32/Food.png b/src/icons/waypoints/32x32/Food.png
new file mode 100644
index 0000000..b9a64c4
Binary files /dev/null and b/src/icons/waypoints/32x32/Food.png differ
diff --git a/src/icons/waypoints/32x32/Generic.png b/src/icons/waypoints/32x32/Generic.png
new file mode 100644
index 0000000..b11dae6
Binary files /dev/null and b/src/icons/waypoints/32x32/Generic.png differ
diff --git a/src/icons/waypoints/32x32/HorsCategory.png b/src/icons/waypoints/32x32/HorsCategory.png
new file mode 100644
index 0000000..92d0bf7
Binary files /dev/null and b/src/icons/waypoints/32x32/HorsCategory.png differ
diff --git a/src/icons/waypoints/32x32/Left.png b/src/icons/waypoints/32x32/Left.png
new file mode 100644
index 0000000..d5d51af
Binary files /dev/null and b/src/icons/waypoints/32x32/Left.png differ
diff --git a/src/icons/waypoints/32x32/Right.png b/src/icons/waypoints/32x32/Right.png
new file mode 100644
index 0000000..f66062a
Binary files /dev/null and b/src/icons/waypoints/32x32/Right.png differ
diff --git a/src/icons/waypoints/32x32/Sprint.png b/src/icons/waypoints/32x32/Sprint.png
new file mode 100644
index 0000000..f15179a
Binary files /dev/null and b/src/icons/waypoints/32x32/Sprint.png differ
diff --git a/src/icons/waypoints/32x32/Straight.png b/src/icons/waypoints/32x32/Straight.png
new file mode 100644
index 0000000..56fc47a
Binary files /dev/null and b/src/icons/waypoints/32x32/Straight.png differ
diff --git a/src/icons/waypoints/32x32/Summit.png b/src/icons/waypoints/32x32/Summit.png
new file mode 100644
index 0000000..e9707b7
Binary files /dev/null and b/src/icons/waypoints/32x32/Summit.png differ
diff --git a/src/icons/waypoints/32x32/Valley.png b/src/icons/waypoints/32x32/Valley.png
new file mode 100644
index 0000000..e824f03
Binary files /dev/null and b/src/icons/waypoints/32x32/Valley.png differ
diff --git a/src/icons/waypoints/32x32/Water.png b/src/icons/waypoints/32x32/Water.png
new file mode 100644
index 0000000..615e49e
Binary files /dev/null and b/src/icons/waypoints/32x32/Water.png differ
diff --git a/src/icons/waypoints/3rdCategory.svg b/src/icons/waypoints/3rdCategory.svg
new file mode 100644
index 0000000..0fa957f
--- /dev/null
+++ b/src/icons/waypoints/3rdCategory.svg
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="12.607673mm"
+ height="12.593531mm"
+ viewBox="0 0 12.607673 12.593531"
+ version="1.1"
+ id="svg6327"
+ sodipodi:docname="3rdCategory.svg"
+ inkscape:version="0.48.4 r9939">
+ <defs
+ id="defs6321" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#8d8598"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="5.6"
+ inkscape:cx="-37.750768"
+ inkscape:cy="16.434909"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1855"
+ inkscape:window-height="1056"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ units="mm">
+ <inkscape:grid
+ type="xygrid"
+ id="grid6329"
+ originx="-163.03157"
+ originy="-131.28158"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata6324">
+ <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="Calque 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-163.03157,-153.1249)">
+ <rect
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.42991042;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2995"
+ width="10.16278"
+ height="10.191433"
+ x="164.3224"
+ y="154.38574" />
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 164.04167,164.70833 174.625,154.125 v 3.96875"
+ id="path3789-1-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 174.625,154.125 h -3.96875"
+ id="path3789-1-2-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.41636658px;line-height:1.25;font-family:Aharoni;-inkscape-font-specification:Aharoni;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.26040918"
+ x="196.60353"
+ y="137.21951"
+ id="text6333"
+ transform="scale(0.83406315,1.19895)"><tspan
+ sodipodi:role="line"
+ x="196.60353"
+ y="137.21951"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Swis721 BlkEx BT';-inkscape-font-specification:'Swis721 BlkEx BT';fill:#000080;fill-opacity:1;stroke-width:0.26040918"
+ id="tspan6335">3</tspan></text>
+ </g>
+</svg>
diff --git a/src/icons/waypoints/4thCategory.svg b/src/icons/waypoints/4thCategory.svg
new file mode 100644
index 0000000..4c8ef3c
--- /dev/null
+++ b/src/icons/waypoints/4thCategory.svg
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="12.607673mm"
+ height="12.593531mm"
+ viewBox="0 0 12.607673 12.593531"
+ version="1.1"
+ id="svg6327"
+ sodipodi:docname="4thCategory.svg"
+ inkscape:version="0.48.4 r9939">
+ <defs
+ id="defs6321" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#989698"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="5.6"
+ inkscape:cx="-37.750768"
+ inkscape:cy="16.434909"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1855"
+ inkscape:window-height="1056"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ units="mm">
+ <inkscape:grid
+ type="xygrid"
+ id="grid6329"
+ originx="-163.03157"
+ originy="-131.28158"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata6324">
+ <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="Calque 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-163.03157,-153.1249)">
+ <rect
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.42991042;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2995"
+ width="10.16278"
+ height="10.191433"
+ x="164.2216"
+ y="154.33536" />
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 164.04167,164.70833 174.625,154.125 v 3.96875"
+ id="path3789-1-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 174.625,154.125 h -3.96875"
+ id="path3789-1-2-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.41636658px;line-height:1.25;font-family:Aharoni;-inkscape-font-specification:Aharoni;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.26040918"
+ x="196.60353"
+ y="137.21951"
+ id="text6333"
+ transform="scale(0.83406315,1.19895)"><tspan
+ sodipodi:role="line"
+ x="196.60353"
+ y="137.21951"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Swis721 BlkEx BT';-inkscape-font-specification:'Swis721 BlkEx BT';fill:#000080;fill-opacity:1;stroke-width:0.26040918"
+ id="tspan6335">4</tspan></text>
+ </g>
+</svg>
diff --git a/src/icons/waypoints/Danger.svg b/src/icons/waypoints/Danger.svg
new file mode 100644
index 0000000..a3de1e4
--- /dev/null
+++ b/src/icons/waypoints/Danger.svg
@@ -0,0 +1,93 @@
+<?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="25.826677mm"
+ height="24.502075mm"
+ viewBox="0 0 25.826677 24.502075"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="Danger.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#a99ca4"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="4.9730288"
+ inkscape:cx="-6.4189586"
+ inkscape:cy="30.46713"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1855"
+ inkscape:window-height="1056"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ units="mm">
+ <inkscape:grid
+ type="xygrid"
+ id="grid5701"
+ originx="-12.229232"
+ originy="-249.01864"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-12.229232,-23.479277)">
+ <rect
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.80736685;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2995"
+ width="20.724453"
+ height="19.561344"
+ x="14.834409"
+ y="25.995001" />
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 37.041667,46.968752 H 13.229166 l 11.906251,-22.489589 11.90625,22.489589"
+ id="path3789-1-2-1-8"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ <text
+ xml:space="preserve"
+ style="font-size:17.15745735px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Aharoni;-inkscape-font-specification:Aharoni"
+ x="26.766005"
+ y="37.905346"
+ id="text6333"
+ transform="scale(0.83406314,1.19895)"><tspan
+ sodipodi:role="line"
+ x="26.766005"
+ y="37.905346"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000080;fill-opacity:1;font-family:Swis721 BlkEx BT;-inkscape-font-specification:Swis721 BlkEx BT"
+ id="tspan6335">!</tspan></text>
+ </g>
+</svg>
diff --git a/src/icons/waypoints/FirstAid.svg b/src/icons/waypoints/FirstAid.svg
new file mode 100644
index 0000000..76e1d20
--- /dev/null
+++ b/src/icons/waypoints/FirstAid.svg
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="23.18091mm"
+ height="23.18091mm"
+ viewBox="0 0 23.18091 23.18091"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="FirstAid.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#616e74"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="3.5164624"
+ inkscape:cx="49.682348"
+ inkscape:cy="66.210354"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="927"
+ inkscape:window-height="1028"
+ inkscape:window-x="992"
+ inkscape:window-y="24"
+ inkscape:window-maximized="0"
+ units="mm">
+ <inkscape:grid
+ type="xygrid"
+ id="grid5701"
+ originx="-12.229165"
+ originy="-249.017"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-12.229166,-24.802083)">
+ <rect
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.45635605;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2995"
+ width="18.650059"
+ height="18.678711"
+ x="14.493352"
+ y="27.094275" />
+ <path
+ style="fill:none;stroke:#000080;stroke-width:2.01052737;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 34.446626,47.232776 -21.118168,3e-6 1e-6,-21.439203 h 21.118167 v 21.4392"
+ id="path3789-1-2-1-8"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.15745735px;line-height:1.25;font-family:Aharoni;-inkscape-font-specification:Aharoni;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.42893645"
+ x="26.201498"
+ y="38.143116"
+ id="text6333"
+ transform="scale(0.83406314,1.19895)"><tspan
+ sodipodi:role="line"
+ x="26.201498"
+ y="52.896183"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Swis721 BlkEx BT';-inkscape-font-specification:'Swis721 BlkEx BT';fill:#000080;fill-opacity:1;stroke-width:0.42893645"
+ id="tspan6335" /></text>
+ <g
+ id="g4502"
+ transform="matrix(0.82480478,0,0,0.88484152,0.81925351,6.8668015)"
+ style="fill:#ff0000;fill-opacity:1">
+ <text
+ id="text4498"
+ y="43.602146"
+ x="13.755057"
+ style="font-size:33.01326752px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;font-family:Aharoni;-inkscape-font-specification:Aharoni"
+ xml:space="preserve"><tspan
+ style="fill:#ff0000;fill-opacity:1"
+ y="43.602146"
+ x="13.755057"
+ id="tspan4496"
+ sodipodi:role="line">+</tspan></text>
+ </g>
+ </g>
+</svg>
diff --git a/src/icons/waypoints/Food.svg b/src/icons/waypoints/Food.svg
new file mode 100644
index 0000000..312b952
--- /dev/null
+++ b/src/icons/waypoints/Food.svg
@@ -0,0 +1,94 @@
+<?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="21.969721mm"
+ height="25.910057mm"
+ viewBox="0 0 21.969721 25.910057"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="Food.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ababab"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="3.5164624"
+ inkscape:cx="-41.283552"
+ inkscape:cy="72.721249"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1855"
+ inkscape:window-height="1056"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ showguides="true"
+ units="mm">
+ <inkscape:grid
+ type="xygrid"
+ id="grid6273"
+ originx="-26.718265"
+ originy="-260.88874"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-26.718265,-10.201211)">
+ <rect
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.60452271;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2995"
+ width="17.298029"
+ height="21.500067"
+ x="29.137777"
+ y="12.400268" />
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:2.09761786;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 47.625,21.833333 27.78125,28.447917"
+ id="path3789-1-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000080;stroke-width:2.09761786;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 47.625,28.447917 27.78125,35.0625 V 21.833333 L 47.625,15.21875 v 13.229167"
+ id="path3789-1-2-8"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:none;stroke:#000080;stroke-width:2.09761786;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 47.625,15.21875 38.364583,11.25 27.78125,21.833333"
+ id="path3789-1-2-7"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
+ </g>
+</svg>
diff --git a/src/icons/waypoints/Generic.svg b/src/icons/waypoints/Generic.svg
new file mode 100644
index 0000000..4e798e5
--- /dev/null
+++ b/src/icons/waypoints/Generic.svg
@@ -0,0 +1,91 @@
+<?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="89.579231"
+ height="92.23671"
+ viewBox="0 0 25.281251 26.03125"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="Generic.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#afb5af"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="3.959798"
+ inkscape:cx="-12.378159"
+ inkscape:cy="38.658055"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1855"
+ inkscape:window-height="1056"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ units="mm"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4485"
+ originx="-76.040281px"
+ originy="-171.93232px"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Calque 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-85.3125,-98.78125)">
+ <rect
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.94317007;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2995"
+ width="20.335915"
+ height="21.077286"
+ x="87.785439"
+ y="101.25858" />
+ <path
+ style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="M 89.958333,123.69792 V 99.885417"
+ id="path3789-1-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="M 92.60417,111.79166 104.51042,106.5 92.60417,99.88541"
+ id="path3789-1-2-6"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
+ </g>
+</svg>
diff --git a/src/icons/waypoints/HorsCategory.svg b/src/icons/waypoints/HorsCategory.svg
new file mode 100644
index 0000000..c0674bf
--- /dev/null
+++ b/src/icons/waypoints/HorsCategory.svg
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="12.607673mm"
+ height="12.593531mm"
+ viewBox="0 0 12.607673 12.593531"
+ version="1.1"
+ id="svg6327"
+ sodipodi:docname="HorsCategory.svg"
+ inkscape:version="0.48.4 r9939">
+ <defs
+ id="defs6321" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#c2c2cc"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="5.6"
+ inkscape:cx="-37.750768"
+ inkscape:cy="16.434909"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1855"
+ inkscape:window-height="1056"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ units="mm">
+ <inkscape:grid
+ type="xygrid"
+ id="grid6329"
+ originx="-163.03157"
+ originy="-131.28158"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata6324">
+ <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="Calque 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-163.03157,-153.1249)">
+ <rect
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.42991042;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2995"
+ width="10.16278"
+ height="10.191433"
+ x="164.2216"
+ y="154.38573" />
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 164.04167,164.70833 174.625,154.125 v 3.96875"
+ id="path3789-1-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 174.625,154.125 h -3.96875"
+ id="path3789-1-2-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.41636658px;line-height:1.25;font-family:Aharoni;-inkscape-font-specification:Aharoni;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.26040918"
+ x="196.60353"
+ y="137.21951"
+ id="text6333"
+ transform="scale(0.83406315,1.19895)"><tspan
+ sodipodi:role="line"
+ x="196.60353"
+ y="137.21951"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Swis721 BlkEx BT';-inkscape-font-specification:'Swis721 BlkEx BT';fill:#000080;fill-opacity:1;stroke-width:0.26040918"
+ id="tspan6335">H</tspan></text>
+ </g>
+</svg>
diff --git a/src/icons/waypoints/Left.svg b/src/icons/waypoints/Left.svg
new file mode 100644
index 0000000..59bfc01
--- /dev/null
+++ b/src/icons/waypoints/Left.svg
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="95.780045"
+ height="95.347755"
+ viewBox="0 0 27.031258 26.909256"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="Left.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#504a52"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="3.5164624"
+ inkscape:cx="-111.41316"
+ inkscape:cy="22.589572"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1855"
+ inkscape:window-height="1056"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ units="mm"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid5059"
+ originx="-33.204752px"
+ originy="-247.77444px"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-34.281241,-5.2782433)">
+ <rect
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:5.19885206;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2995"
+ width="21.840176"
+ height="21.708315"
+ x="36.886787"
+ y="7.8784599" />
+ <g
+ id="g5661"
+ transform="matrix(-1,0,0,1,95.235702,0)">
+ <path
+ sodipodi:nodetypes="ccc"
+ inkscape:connector-curvature="0"
+ id="path3789-1-2"
+ d="m 51.593752,24.479166 7.9375,-6.614583 -7.9375,-6.614584"
+ style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path3789-1-2-7"
+ d="m 35.718749,17.864586 18.520836,-3e-6"
+ style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ </g>
+ </g>
+</svg>
diff --git a/src/icons/waypoints/Right.svg b/src/icons/waypoints/Right.svg
new file mode 100644
index 0000000..15d8fc4
--- /dev/null
+++ b/src/icons/waypoints/Right.svg
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="95.780891"
+ height="95.350586"
+ viewBox="0 0 27.031497 26.910055"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="Right.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#c2c4c6"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.7582312"
+ inkscape:cx="8.7965656"
+ inkscape:cy="87.166175"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1855"
+ inkscape:window-height="1056"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ units="mm"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid5059"
+ originx="-61.496503px"
+ originy="-222.18249px"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-63.156127,-34.339944)">
+ <rect
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:5.19885206;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2995"
+ width="21.840176"
+ height="21.708317"
+ x="65.740608"
+ y="36.931747" />
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 80.697917,54.90625 7.9375,-6.614583 -7.9375,-6.614584"
+ id="path3789-1-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
+ <path
+ style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 64.822915,48.29167 18.520835,-3e-6"
+ id="path3789-1-2-7"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ </g>
+</svg>
diff --git a/src/icons/waypoints/Sprint.svg b/src/icons/waypoints/Sprint.svg
new file mode 100644
index 0000000..96b6be8
--- /dev/null
+++ b/src/icons/waypoints/Sprint.svg
@@ -0,0 +1,103 @@
+<?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="48.278023"
+ height="47.621578"
+ viewBox="0 0 13.625131 13.439868"
+ version="1.1"
+ id="svg6327"
+ sodipodi:docname="Sprint.svg"
+ inkscape:version="0.48.4 r9939">
+ <defs
+ id="defs6321" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#c8d3d5"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="5.6"
+ inkscape:cx="-69.222315"
+ inkscape:cy="23.861359"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1855"
+ inkscape:window-height="1056"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ units="mm"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid6329"
+ originx="-161.35106px"
+ originy="-125.23349px"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata6324">
+ <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="Calque 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-163.62489,-154.34141)">
+ <rect
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.60846496;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2995"
+ width="11.025005"
+ height="10.825762"
+ x="164.92215"
+ y="155.64532" />
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:1.6733197;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 170.65626,156.10937 5.29166,4.63021 -5.29166,4.63021"
+ id="path3789-1-2-8"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:1.6733197;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 165.36459,156.10937 5.29166,4.63021 -5.29166,4.63021"
+ id="path3789-1-2-8-7"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
+ <text
+ xml:space="preserve"
+ style="font-size:10.41636658px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:1.25;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Aharoni;-inkscape-font-specification:Aharoni"
+ x="198.7561"
+ y="137.85002"
+ id="text6333"
+ transform="scale(0.83406314,1.19895)"><tspan
+ sodipodi:role="line"
+ x="198.7561"
+ y="137.85002"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000080;fill-opacity:1;font-family:Swis721 BlkEx BT;-inkscape-font-specification:Swis721 BlkEx BT"
+ id="tspan6335">S</tspan></text>
+ </g>
+</svg>
diff --git a/src/icons/waypoints/Straight.svg b/src/icons/waypoints/Straight.svg
new file mode 100644
index 0000000..8ebebae
--- /dev/null
+++ b/src/icons/waypoints/Straight.svg
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="95.780891"
+ height="95.337105"
+ viewBox="0 0 27.031496 26.906251"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="Straight.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#cac8c4"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="2.4865145"
+ inkscape:cx="-146.4151"
+ inkscape:cy="66.363325"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1855"
+ inkscape:window-height="1056"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ units="mm"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid5059"
+ originx="0.77504622px"
+ originy="-256.63005px"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-14.249877,-12.28125)">
+ <rect
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:5.19885206;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2995"
+ width="21.840176"
+ height="21.708317"
+ x="16.841925"
+ y="14.894976" />
+ <g
+ id="g6224"
+ transform="matrix(0,-1,1,0,1.979163,53.583333)">
+ <path
+ sodipodi:nodetypes="ccc"
+ inkscape:connector-curvature="0"
+ id="path3789-1-2-9"
+ d="m 31.749998,32.416668 7.9375,-6.614583 -7.9375,-6.614584"
+ style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path3789-1-2-7"
+ d="m 15.874998,25.802086 18.520835,-3e-6"
+ style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ </g>
+ </g>
+</svg>
diff --git a/src/icons/waypoints/Summit.svg b/src/icons/waypoints/Summit.svg
new file mode 100644
index 0000000..1441f2f
--- /dev/null
+++ b/src/icons/waypoints/Summit.svg
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="95.891624"
+ height="95.351036"
+ viewBox="0 0 27.062747 26.910182"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="Summit.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#d1cad1"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="2.4865144"
+ inkscape:cx="-116.30113"
+ inkscape:cy="20.473107"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1855"
+ inkscape:window-height="1056"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ units="mm"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid5701"
+ originx="-9.644901px"
+ originy="-244.08007px"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-11.499876,-22.464944)">
+ <rect
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:5.19885206;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2995"
+ width="21.840174"
+ height="21.708315"
+ x="14.113624"
+ y="25.052813" />
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 17.558711,38.790719 6.494319,-2.044508 2.164773,-4.089016 8.659091,10.22254"
+ id="path3789-1-2-1"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ <path
+ style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="M 37.041667,46.968752 H 13.229166 l 11.906251,-22.489589 11.90625,22.489589"
+ id="path3789-1-2-1-8"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ </g>
+</svg>
diff --git a/src/icons/waypoints/Valley.svg b/src/icons/waypoints/Valley.svg
new file mode 100644
index 0000000..1c93ec5
--- /dev/null
+++ b/src/icons/waypoints/Valley.svg
@@ -0,0 +1,91 @@
+<?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="112.87018"
+ height="109.27481"
+ viewBox="0 0 31.854472 30.839781"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="Valley.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#c8cfd1"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="3.5164624"
+ inkscape:cx="14.284807"
+ inkscape:cy="83.336142"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1855"
+ inkscape:window-height="1056"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ units="mm"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid6273"
+ originx="-12.61791px"
+ originy="-244.68572px"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-13.245801,-10.793897)">
+ <rect
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:6.04095364;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2995"
+ width="25.81352"
+ height="24.798828"
+ x="16.266277"
+ y="13.814374" />
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:2.09761786;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 37.041667,28.447917 c -2.645834,1.322916 -5.291667,1.322916 -7.9375,0 -2.638071,-1.160309 -3.96875,-1.322917 -6.614584,0"
+ id="path3789-1-2-8"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
+ <path
+ style="fill:none;stroke:#000080;stroke-width:2.09761786;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="M 43.65625,21.833333 29.104167,36.385417 14.552083,21.833333"
+ id="path3789-1-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
+ </g>
+</svg>
diff --git a/src/icons/waypoints/Water.svg b/src/icons/waypoints/Water.svg
new file mode 100644
index 0000000..5ec2179
--- /dev/null
+++ b/src/icons/waypoints/Water.svg
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="88.914925"
+ height="88.261986"
+ viewBox="0 0 25.093768 24.909493"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="Water.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ced5cf"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="3.5164624"
+ inkscape:cx="0.80404639"
+ inkscape:cy="45.316663"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1855"
+ inkscape:window-height="1056"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ showguides="true"
+ units="mm"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid6273"
+ originx="-3.0181966px"
+ originy="-266.23091px"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-15.281231,-3.9967571)">
+ <rect
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.81982613;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2995"
+ width="20.293024"
+ height="20.080908"
+ x="17.685165"
+ y="6.4049935" />
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:2.09761786;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="M 33.072917,16.541667 30.427083,11.25 h -9.260416"
+ id="path3789-1-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:2.09761786;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="M 27.78125,5.9583333 H 22.489583"
+ id="path3789-1-2-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:2.09761786;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="M 25.135417,5.9583334 V 8.6041667"
+ id="path3789-1-2-2-7"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000080;stroke-width:2.09761786;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 33.072917,19.1875 c 1.322916,2.645833 5.291666,7.9375 0,7.9375 -5.291667,0 -1.322917,-5.291667 0,-7.9375"
+ id="path3789-1-2-8"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
+ </g>
+</svg>
diff --git a/src/locale/qmapshack.ts b/src/locale/qmapshack.ts
index c446bb4..db82d98 100644
--- a/src/locale/qmapshack.ts
+++ b/src/locale/qmapshack.ts
@@ -13,6 +13,11 @@
<source>%1 (API V%2)</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../CAbout.cpp" line="49"/>
+ <source>(no DBUS: device detection and handling disabled)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CActivityTrk</name>
@@ -112,12 +117,12 @@
<context>
<name>CCanvas</name>
<message>
- <location filename="../canvas/CCanvas.cpp" line="60"/>
+ <location filename="../canvas/CCanvas.cpp" line="61"/>
<source>View %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../canvas/CCanvas.cpp" line="685"/>
+ <location filename="../canvas/CCanvas.cpp" line="693"/>
<source>Setup Map Background</source>
<translation type="unfinished"></translation>
</message>
@@ -262,66 +267,86 @@
<context>
<name>CDBProject</name>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="223"/>
+ <location filename="../gis/db/CDBProject.cpp" line="112"/>
+ <source>Failed to load...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="113"/>
+ <source>Can't load file "%1" . It will be skipped.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="126"/>
+ <source>Project already in database...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="127"/>
+ <source>The project "%1" has already been imported into the database. It will be skipped.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="278"/>
<source>The item %1 has been changed by %2 (%3).
To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="229"/>
+ <location filename="../gis/db/CDBProject.cpp" line="284"/>
<source>Conflict with database...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="230"/>
+ <location filename="../gis/db/CDBProject.cpp" line="285"/>
<source>Clone && Save</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="231"/>
+ <location filename="../gis/db/CDBProject.cpp" line="286"/>
<source>Force Save</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="232"/>
+ <location filename="../gis/db/CDBProject.cpp" line="287"/>
<source>Take remote</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="514"/>
+ <location filename="../gis/db/CDBProject.cpp" line="569"/>
<source>Missing folder...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="515"/>
+ <location filename="../gis/db/CDBProject.cpp" line="570"/>
<source>Failed to save project. The folder has been deleted in the database.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="522"/>
+ <location filename="../gis/db/CDBProject.cpp" line="577"/>
<source>Save ...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="585"/>
+ <location filename="../gis/db/CDBProject.cpp" line="640"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="585"/>
+ <location filename="../gis/db/CDBProject.cpp" line="640"/>
<source>There was an unexpected database error:
%1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="700"/>
+ <location filename="../gis/db/CDBProject.cpp" line="755"/>
<source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="701"/>
+ <location filename="../gis/db/CDBProject.cpp" line="756"/>
<source>Save changes?</source>
<translation type="unfinished"></translation>
</message>
@@ -851,78 +876,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="65"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="66"/>
<source>_Clone</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="283"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="284"/>
<source>track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="310"/>
+ <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="316"/>
+ <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="322"/>
+ <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="328"/>
+ <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="346"/>
+ <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="350"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
<source>Length: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="357"/>
- <location filename="../gis/rte/CGisItemRte.cpp" line="599"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="600"/>
<source>Time: %1 %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="361"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
<source>Time: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="371"/>
+ <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="377"/>
+ <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="379"/>
+ <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="601"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="602"/>
<source>Distance: %1 %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="716"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="717"/>
<source>Changed route points.</source>
<translation type="unfinished"></translation>
</message>
@@ -1081,21 +1106,21 @@ 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="1214"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1227"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1283"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1327"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1466"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1223"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1236"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1292"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1336"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1475"/>
<source>track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1418"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1427"/>
<source>Hide point %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1422"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1431"/>
<source>Hide points %1..%2.</source>
<translation type="unfinished"></translation>
</message>
@@ -1176,47 +1201,47 @@ 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="1273"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1282"/>
<source>Permanently removed points %1..%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1451"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1460"/>
<source>Show points.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1985"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
<source>Changed name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1991"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
<source>Changed comment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1997"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
<source>Changed description</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2003"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2012"/>
<source>Changed links</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2014"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2023"/>
<source>Changed elevation of point %1 to %2 %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2038"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2047"/>
<source>Changed activity to '%1' for complete track.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2077"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2086"/>
<source>Changed activity to '%1' for range(%2..%3).</source>
<translation type="unfinished"></translation>
</message>
@@ -1324,62 +1349,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/wpt/CGisItemWpt.cpp" line="272"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="275"/>
<source>Elevation: %1 %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="283"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="286"/>
<source>Proximity: %1 %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="355"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="358"/>
<source>Changed name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="365"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="368"/>
<source>Changed position</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="371"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="374"/>
<source>Changed elevation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="377"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="380"/>
<source>Changed proximity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="391"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
<source>Changed icon</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="397"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
<source>Changed comment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="403"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="406"/>
<source>Changed description</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="409"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="412"/>
<source>Changed links</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="415"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="418"/>
<source>Changed images</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="421"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="424"/>
<source>Add image</source>
<translation type="unfinished"></translation>
</message>
@@ -1387,341 +1412,356 @@ To solve this conflict you can create and save a clone, force your version or dr
<context>
<name>CGisListDB</name>
<message>
- <location filename="../gis/CGisListDB.cpp" line="83"/>
+ <location filename="../gis/CGisListDB.cpp" line="84"/>
<source>Due to changes in the database system QMapShack forgot about the filename of your database '%1'. You have to select it again in the next step.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="84"/>
+ <location filename="../gis/CGisListDB.cpp" line="85"/>
<source>Select database file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="117"/>
+ <location filename="../gis/CGisListDB.cpp" line="118"/>
<source>Add Database</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="120"/>
+ <location filename="../gis/CGisListDB.cpp" line="121"/>
<source>Add Folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="121"/>
+ <location filename="../gis/CGisListDB.cpp" line="122"/>
<source>Rename Folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="122"/>
+ <location filename="../gis/CGisListDB.cpp" line="123"/>
<source>Copy Folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="123"/>
+ <location filename="../gis/CGisListDB.cpp" line="124"/>
<source>Move Folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="124"/>
+ <location filename="../gis/CGisListDB.cpp" line="125"/>
<source>Delete Folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="125"/>
- <source>Export to GPX...</source>
+ <location filename="../gis/CGisListDB.cpp" line="127"/>
+ <source>Import from Files...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gis/CGisListDB.cpp" line="128"/>
- <location filename="../gis/CGisListDB.cpp" line="141"/>
+ <source>Export to GPX...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListDB.cpp" line="131"/>
+ <location filename="../gis/CGisListDB.cpp" line="147"/>
<source>Delete Item</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="132"/>
+ <location filename="../gis/CGisListDB.cpp" line="135"/>
<source>Search Database</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="133"/>
+ <location filename="../gis/CGisListDB.cpp" line="136"/>
<source>Sync. with Database</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="134"/>
+ <location filename="../gis/CGisListDB.cpp" line="137"/>
<source>Remove Database</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="138"/>
+ <location filename="../gis/CGisListDB.cpp" line="144"/>
<source>Empty</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="437"/>
+ <location filename="../gis/CGisListDB.cpp" line="444"/>
<source>Remove database...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="437"/>
+ <location filename="../gis/CGisListDB.cpp" line="444"/>
<source>Do you really want to remove '%1' from the list?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="501"/>
+ <location filename="../gis/CGisListDB.cpp" line="508"/>
<source>Delete database folder...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="501"/>
+ <location filename="../gis/CGisListDB.cpp" line="508"/>
<source>Are you sure you want to delete selected folders and all subfolders from the database?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="669"/>
+ <location filename="../gis/CGisListDB.cpp" line="676"/>
<source>Bad operation....</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="669"/>
+ <location filename="../gis/CGisListDB.cpp" line="676"/>
<source>The target folder is a subfolder of the one to move. This will not work.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="728"/>
+ <location filename="../gis/CGisListDB.cpp" line="735"/>
<source>Folder name...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="728"/>
+ <location filename="../gis/CGisListDB.cpp" line="735"/>
<source>Rename folder:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="749"/>
- <location filename="../gis/CGisListDB.cpp" line="770"/>
+ <location filename="../gis/CGisListDB.cpp" line="756"/>
+ <location filename="../gis/CGisListDB.cpp" line="777"/>
<source>Remove items...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="749"/>
+ <location filename="../gis/CGisListDB.cpp" line="756"/>
<source>Are you sure you want to delete all items from Lost&Found? This will remove them permanently.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="770"/>
+ <location filename="../gis/CGisListDB.cpp" line="777"/>
<source>Are you sure you want to delete all selected items from Lost&Found? This will remove them permanently.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="857"/>
+ <location filename="../gis/CGisListDB.cpp" line="864"/>
<source>Are you sure you want to delete '%1' from folder '%2'?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="858"/>
+ <location filename="../gis/CGisListDB.cpp" line="865"/>
<source>Delete...</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gis/CGisListDB.cpp" line="1055"/>
+ <source>Import GIS Data...</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CGisListWks</name>
<message>
- <location filename="../gis/CGisListWks.cpp" line="99"/>
+ <location filename="../gis/CGisListWks.cpp" line="101"/>
<source>Edit..</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="101"/>
+ <location filename="../gis/CGisListWks.cpp" line="103"/>
<source>Show on Map</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="102"/>
+ <location filename="../gis/CGisListWks.cpp" line="104"/>
<source>Hide from Map</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="108"/>
+ <location filename="../gis/CGisListWks.cpp" line="110"/>
<source>Sort by Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="109"/>
+ <location filename="../gis/CGisListWks.cpp" line="111"/>
<source>Sort by Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="112"/>
+ <location filename="../gis/CGisListWks.cpp" line="114"/>
<source>Save</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="114"/>
+ <location filename="../gis/CGisListWks.cpp" line="116"/>
<source>Save as GPX 1.1 w/o ext...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="117"/>
+ <location filename="../gis/CGisListWks.cpp" line="119"/>
<source>Send to Devices</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="118"/>
+ <location filename="../gis/CGisListWks.cpp" line="120"/>
<source>Sync. with Database</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="121"/>
+ <location filename="../gis/CGisListWks.cpp" line="123"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="130"/>
+ <location filename="../gis/CGisListWks.cpp" line="132"/>
<source>Update Project on Device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="132"/>
- <location filename="../gis/CGisListWks.cpp" line="155"/>
+ <location filename="../gis/CGisListWks.cpp" line="134"/>
+ <location filename="../gis/CGisListWks.cpp" line="157"/>
<source>Delete</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="144"/>
+ <location filename="../gis/CGisListWks.cpp" line="146"/>
<source>Edit...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="100"/>
- <location filename="../gis/CGisListWks.cpp" line="145"/>
+ <location filename="../gis/CGisListWks.cpp" line="102"/>
+ <location filename="../gis/CGisListWks.cpp" line="147"/>
<source>Copy to...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="113"/>
+ <location filename="../gis/CGisListWks.cpp" line="115"/>
<source>Save as...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="147"/>
+ <location filename="../gis/CGisListWks.cpp" line="149"/>
<source>Track Profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="149"/>
+ <location filename="../gis/CGisListWks.cpp" line="151"/>
<source>Select Range</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="150"/>
+ <location filename="../gis/CGisListWks.cpp" line="152"/>
<source>Edit Track Points</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="151"/>
+ <location filename="../gis/CGisListWks.cpp" line="153"/>
<source>Reverse Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="152"/>
+ <location filename="../gis/CGisListWks.cpp" line="154"/>
<source>Combine Tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="153"/>
+ <location filename="../gis/CGisListWks.cpp" line="155"/>
<source>Copy Track with Waypoints</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="161"/>
+ <location filename="../gis/CGisListWks.cpp" line="163"/>
<source>Show Bubble</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="163"/>
+ <location filename="../gis/CGisListWks.cpp" line="165"/>
<source>Move Waypoint</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="164"/>
+ <location filename="../gis/CGisListWks.cpp" line="166"/>
<source>Proj. Waypoint...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="172"/>
+ <location filename="../gis/CGisListWks.cpp" line="174"/>
<source>Route Instructions</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="174"/>
+ <location filename="../gis/CGisListWks.cpp" line="176"/>
<source>Calculate Route</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="175"/>
+ <location filename="../gis/CGisListWks.cpp" line="177"/>
<source>Reset Route</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="176"/>
+ <location filename="../gis/CGisListWks.cpp" line="178"/>
<source>Edit Route</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="177"/>
+ <location filename="../gis/CGisListWks.cpp" line="179"/>
<source>Convert to Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="186"/>
+ <location filename="../gis/CGisListWks.cpp" line="188"/>
<source>Edit Area Points</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="193"/>
+ <location filename="../gis/CGisListWks.cpp" line="195"/>
<source>Create Route</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="622"/>
+ <location filename="../gis/CGisListWks.cpp" line="196"/>
+ <source>Change Icon (sel. waypt. only)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="627"/>
<source>Drop items...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="647"/>
- <location filename="../gis/CGisListWks.cpp" line="1631"/>
- <location filename="../gis/CGisListWks.cpp" line="1669"/>
+ <location filename="../gis/CGisListWks.cpp" line="652"/>
+ <location filename="../gis/CGisListWks.cpp" line="1650"/>
+ <location filename="../gis/CGisListWks.cpp" line="1688"/>
<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="773"/>
+ <location filename="../gis/CGisListWks.cpp" line="778"/>
<source>Saving workspace. Please wait.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="819"/>
+ <location filename="../gis/CGisListWks.cpp" line="824"/>
<source>Loading workspace. Please wait.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1155"/>
+ <location filename="../gis/CGisListWks.cpp" line="1174"/>
<source>Close all projects...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1155"/>
+ <location filename="../gis/CGisListWks.cpp" line="1174"/>
<source>This will remove all projects from the workspace.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1178"/>
+ <location filename="../gis/CGisListWks.cpp" line="1197"/>
<source>Delete project...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1178"/>
+ <location filename="../gis/CGisListWks.cpp" line="1197"/>
<source>Do you really want to delete %1?</source>
<translation type="unfinished"></translation>
</message>
@@ -1729,27 +1769,27 @@ To solve this conflict you can create and save a clone, force your version or dr
<context>
<name>CGisWidget</name>
<message>
- <location filename="../gis/CGisWidget.cpp" line="139"/>
+ <location filename="../gis/CGisWidget.cpp" line="110"/>
<source>Load project...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="139"/>
+ <location filename="../gis/CGisWidget.cpp" line="110"/>
<source>The project "%1" is already in the workspace.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="544"/>
+ <location filename="../gis/CGisWidget.cpp" line="515"/>
<source>Copy items...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="672"/>
+ <location filename="../gis/CGisWidget.cpp" line="664"/>
<source>Cut Track...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="672"/>
+ <location filename="../gis/CGisWidget.cpp" line="664"/>
<source>Do you want to delete the original track?</source>
<translation type="unfinished"></translation>
</message>
@@ -1934,48 +1974,48 @@ line %2, column %3:
<context>
<name>CMainWindow</name>
<message>
- <location filename="../CMainWindow.cpp" line="562"/>
+ <location filename="../CMainWindow.cpp" line="588"/>
<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="690"/>
+ <location filename="../CMainWindow.cpp" line="716"/>
<source>Ele: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="706"/>
+ <location filename="../CMainWindow.cpp" line="732"/>
<source>[Grid: %1]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="841"/>
+ <location filename="../CMainWindow.cpp" line="867"/>
<source>Load GIS Data...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="875"/>
+ <location filename="../CMainWindow.cpp" line="901"/>
<source>Select output file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="875"/>
<location filename="../CMainWindow.cpp" line="901"/>
+ <location filename="../CMainWindow.cpp" line="927"/>
<source>QMapShack View (*.view)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="901"/>
+ <location filename="../CMainWindow.cpp" line="927"/>
<source>Select file to load</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1080"/>
+ <location filename="../CMainWindow.cpp" line="1106"/>
<source>Fatal...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1081"/>
+ <location filename="../CMainWindow.cpp" line="1107"/>
<source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your distribution to fix it.</source>
<translation type="unfinished"></translation>
</message>
@@ -1983,7 +2023,7 @@ line %2, column %3:
<context>
<name>CMapDraw</name>
<message>
- <location filename="../map/CMapDraw.cpp" line="420"/>
+ <location filename="../map/CMapDraw.cpp" line="457"/>
<source>There are no maps right now. QMapShack is no fun without maps. You can install maps by pressing the 'Help! I want maps!' button in the 'Maps' dock window. Or you can press the F1 key to open the online documentation that tells you how to use QMapShack.
If it's no fun, why don't you provide maps? Well to host maps ready for download and installation requires a good server. And this is not a free service. The project lacks the money. Additionally map and DEM data has a copyright. Therefore the copyright holder has to be asked prior to package the data. This is not that easy as it might sound and for some data you have to pay royalties. The project simply lacks resources to do this. And we think installing the stuff yourself is [...]
@@ -1993,625 +2033,625 @@ If it's no fun, why don't you provide maps? Well to host maps ready fo
<context>
<name>CMapIMG</name>
<message>
- <location filename="../map/CMapIMG.cpp" line="145"/>
+ <location filename="../map/CMapIMG.cpp" line="146"/>
<source>Failed ...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="156"/>
+ <location filename="../map/CMapIMG.cpp" line="157"/>
<source>Unspecified</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="157"/>
+ <location filename="../map/CMapIMG.cpp" line="158"/>
<source>French</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="158"/>
+ <location filename="../map/CMapIMG.cpp" line="159"/>
<source>German</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="159"/>
+ <location filename="../map/CMapIMG.cpp" line="160"/>
<source>Dutch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="160"/>
+ <location filename="../map/CMapIMG.cpp" line="161"/>
<source>English</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="161"/>
+ <location filename="../map/CMapIMG.cpp" line="162"/>
<source>Italian</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="162"/>
+ <location filename="../map/CMapIMG.cpp" line="163"/>
<source>Finnish</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="163"/>
+ <location filename="../map/CMapIMG.cpp" line="164"/>
<source>Swedish</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="164"/>
+ <location filename="../map/CMapIMG.cpp" line="165"/>
<source>Spanish</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="165"/>
+ <location filename="../map/CMapIMG.cpp" line="166"/>
<source>Basque</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="166"/>
+ <location filename="../map/CMapIMG.cpp" line="167"/>
<source>Catalan</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="167"/>
+ <location filename="../map/CMapIMG.cpp" line="168"/>
<source>Galician</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="168"/>
+ <location filename="../map/CMapIMG.cpp" line="169"/>
<source>Welsh</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="169"/>
+ <location filename="../map/CMapIMG.cpp" line="170"/>
<source>Gaelic</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="170"/>
+ <location filename="../map/CMapIMG.cpp" line="171"/>
<source>Danish</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="171"/>
+ <location filename="../map/CMapIMG.cpp" line="172"/>
<source>Norwegian</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="172"/>
+ <location filename="../map/CMapIMG.cpp" line="173"/>
<source>Portuguese</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="173"/>
+ <location filename="../map/CMapIMG.cpp" line="174"/>
<source>Slovak</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="174"/>
+ <location filename="../map/CMapIMG.cpp" line="175"/>
<source>Czech</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="175"/>
+ <location filename="../map/CMapIMG.cpp" line="176"/>
<source>Croatian</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="176"/>
+ <location filename="../map/CMapIMG.cpp" line="177"/>
<source>Hungarian</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="177"/>
+ <location filename="../map/CMapIMG.cpp" line="178"/>
<source>Polish</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="178"/>
+ <location filename="../map/CMapIMG.cpp" line="179"/>
<source>Turkish</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="179"/>
+ <location filename="../map/CMapIMG.cpp" line="180"/>
<source>Greek</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="180"/>
+ <location filename="../map/CMapIMG.cpp" line="181"/>
<source>Slovenian</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="181"/>
+ <location filename="../map/CMapIMG.cpp" line="182"/>
<source>Russian</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="182"/>
+ <location filename="../map/CMapIMG.cpp" line="183"/>
<source>Estonian</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="183"/>
+ <location filename="../map/CMapIMG.cpp" line="184"/>
<source>Latvian</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="184"/>
+ <location filename="../map/CMapIMG.cpp" line="185"/>
<source>Romanian</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="185"/>
+ <location filename="../map/CMapIMG.cpp" line="186"/>
<source>Albanian</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="186"/>
+ <location filename="../map/CMapIMG.cpp" line="187"/>
<source>Bosnian</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="187"/>
+ <location filename="../map/CMapIMG.cpp" line="188"/>
<source>Lithuanian</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="188"/>
+ <location filename="../map/CMapIMG.cpp" line="189"/>
<source>Serbian</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="189"/>
+ <location filename="../map/CMapIMG.cpp" line="190"/>
<source>Macedonian</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="190"/>
+ <location filename="../map/CMapIMG.cpp" line="191"/>
<source>Bulgarian</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="247"/>
+ <location filename="../map/CMapIMG.cpp" line="248"/>
<source>Major highway</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="248"/>
+ <location filename="../map/CMapIMG.cpp" line="249"/>
<source>Principal highway</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="249"/>
+ <location filename="../map/CMapIMG.cpp" line="250"/>
<source>Other highway</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="250"/>
+ <location filename="../map/CMapIMG.cpp" line="251"/>
<source>Arterial road</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="251"/>
+ <location filename="../map/CMapIMG.cpp" line="252"/>
<source>Collector road</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="252"/>
+ <location filename="../map/CMapIMG.cpp" line="253"/>
<source>Residential street</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="253"/>
+ <location filename="../map/CMapIMG.cpp" line="254"/>
<source>Alley/Private road</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="254"/>
+ <location filename="../map/CMapIMG.cpp" line="255"/>
<source>Highway ramp, low speed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="255"/>
+ <location filename="../map/CMapIMG.cpp" line="256"/>
<source>Highway ramp, high speed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="256"/>
+ <location filename="../map/CMapIMG.cpp" line="257"/>
<source>Unpaved road</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="257"/>
+ <location filename="../map/CMapIMG.cpp" line="258"/>
<source>Major highway connector</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="258"/>
+ <location filename="../map/CMapIMG.cpp" line="259"/>
<source>Roundabout</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="259"/>
+ <location filename="../map/CMapIMG.cpp" line="260"/>
<source>Railroad</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="260"/>
+ <location filename="../map/CMapIMG.cpp" line="261"/>
<source>Shoreline</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="261"/>
+ <location filename="../map/CMapIMG.cpp" line="262"/>
<source>Trail</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="262"/>
+ <location filename="../map/CMapIMG.cpp" line="263"/>
<source>Stream</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="263"/>
+ <location filename="../map/CMapIMG.cpp" line="264"/>
<source>Time zone</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="264"/>
<location filename="../map/CMapIMG.cpp" line="265"/>
+ <location filename="../map/CMapIMG.cpp" line="266"/>
<source>Ferry</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="266"/>
+ <location filename="../map/CMapIMG.cpp" line="267"/>
<source>State/province border</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="267"/>
+ <location filename="../map/CMapIMG.cpp" line="268"/>
<source>County/parish border</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="268"/>
+ <location filename="../map/CMapIMG.cpp" line="269"/>
<source>International border</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="269"/>
+ <location filename="../map/CMapIMG.cpp" line="270"/>
<source>River</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="270"/>
+ <location filename="../map/CMapIMG.cpp" line="271"/>
<source>Minor land contour</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="271"/>
+ <location filename="../map/CMapIMG.cpp" line="272"/>
<source>Intermediate land contour</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="272"/>
+ <location filename="../map/CMapIMG.cpp" line="273"/>
<source>Major land contour</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="273"/>
+ <location filename="../map/CMapIMG.cpp" line="274"/>
<source>Minor depth contour</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="274"/>
+ <location filename="../map/CMapIMG.cpp" line="275"/>
<source>Intermediate depth contour</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="275"/>
+ <location filename="../map/CMapIMG.cpp" line="276"/>
<source>Major depth contour</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="276"/>
+ <location filename="../map/CMapIMG.cpp" line="277"/>
<source>Intermittent stream</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="277"/>
- <location filename="../map/CMapIMG.cpp" line="359"/>
+ <location filename="../map/CMapIMG.cpp" line="278"/>
+ <location filename="../map/CMapIMG.cpp" line="360"/>
<source>Airport runway</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="278"/>
+ <location filename="../map/CMapIMG.cpp" line="279"/>
<source>Pipeline</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="279"/>
+ <location filename="../map/CMapIMG.cpp" line="280"/>
<source>Powerline</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="280"/>
+ <location filename="../map/CMapIMG.cpp" line="281"/>
<source>Marine boundary</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="281"/>
+ <location filename="../map/CMapIMG.cpp" line="282"/>
<source>Hazard boundary</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="346"/>
+ <location filename="../map/CMapIMG.cpp" line="347"/>
<source>Large urban area (>200K)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="347"/>
+ <location filename="../map/CMapIMG.cpp" line="348"/>
<source>Small urban area (<200K)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="348"/>
+ <location filename="../map/CMapIMG.cpp" line="349"/>
<source>Rural housing area</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="349"/>
+ <location filename="../map/CMapIMG.cpp" line="350"/>
<source>Military base</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="350"/>
+ <location filename="../map/CMapIMG.cpp" line="351"/>
<source>Parking lot</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="351"/>
+ <location filename="../map/CMapIMG.cpp" line="352"/>
<source>Parking garage</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="352"/>
+ <location filename="../map/CMapIMG.cpp" line="353"/>
<source>Airport</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="353"/>
+ <location filename="../map/CMapIMG.cpp" line="354"/>
<source>Shopping center</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="354"/>
+ <location filename="../map/CMapIMG.cpp" line="355"/>
<source>Marina</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="355"/>
+ <location filename="../map/CMapIMG.cpp" line="356"/>
<source>University/College</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="356"/>
+ <location filename="../map/CMapIMG.cpp" line="357"/>
<source>Hospital</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="357"/>
+ <location filename="../map/CMapIMG.cpp" line="358"/>
<source>Industrial complex</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="358"/>
+ <location filename="../map/CMapIMG.cpp" line="359"/>
<source>Reservation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="360"/>
+ <location filename="../map/CMapIMG.cpp" line="361"/>
<source>Man-made area</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="361"/>
+ <location filename="../map/CMapIMG.cpp" line="362"/>
<source>Sports complex</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="362"/>
+ <location filename="../map/CMapIMG.cpp" line="363"/>
<source>Golf course</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="363"/>
+ <location filename="../map/CMapIMG.cpp" line="364"/>
<source>Cemetery</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="364"/>
<location filename="../map/CMapIMG.cpp" line="365"/>
<location filename="../map/CMapIMG.cpp" line="366"/>
+ <location filename="../map/CMapIMG.cpp" line="367"/>
<source>National park</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="367"/>
+ <location filename="../map/CMapIMG.cpp" line="368"/>
<source>City park</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="368"/>
<location filename="../map/CMapIMG.cpp" line="369"/>
<location filename="../map/CMapIMG.cpp" line="370"/>
+ <location filename="../map/CMapIMG.cpp" line="371"/>
<source>State park</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="371"/>
+ <location filename="../map/CMapIMG.cpp" line="372"/>
<source>Forest</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="372"/>
+ <location filename="../map/CMapIMG.cpp" line="373"/>
<source>Ocean</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="373"/>
- <location filename="../map/CMapIMG.cpp" line="375"/>
- <location filename="../map/CMapIMG.cpp" line="385"/>
+ <location filename="../map/CMapIMG.cpp" line="374"/>
+ <location filename="../map/CMapIMG.cpp" line="376"/>
+ <location filename="../map/CMapIMG.cpp" line="386"/>
<source>Blue (unknown)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="374"/>
+ <location filename="../map/CMapIMG.cpp" line="375"/>
<source>Sea</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="376"/>
<location filename="../map/CMapIMG.cpp" line="377"/>
- <location filename="../map/CMapIMG.cpp" line="384"/>
+ <location filename="../map/CMapIMG.cpp" line="378"/>
+ <location filename="../map/CMapIMG.cpp" line="385"/>
<source>Large lake</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="378"/>
<location filename="../map/CMapIMG.cpp" line="379"/>
+ <location filename="../map/CMapIMG.cpp" line="380"/>
<source>Medium lake</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="380"/>
<location filename="../map/CMapIMG.cpp" line="381"/>
+ <location filename="../map/CMapIMG.cpp" line="382"/>
<source>Small lake</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="382"/>
<location filename="../map/CMapIMG.cpp" line="383"/>
+ <location filename="../map/CMapIMG.cpp" line="384"/>
<source>Major lake</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="386"/>
+ <location filename="../map/CMapIMG.cpp" line="387"/>
<source>Major River</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="387"/>
+ <location filename="../map/CMapIMG.cpp" line="388"/>
<source>Large River</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="388"/>
+ <location filename="../map/CMapIMG.cpp" line="389"/>
<source>Medium River</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="389"/>
+ <location filename="../map/CMapIMG.cpp" line="390"/>
<source>Small River</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="392"/>
+ <location filename="../map/CMapIMG.cpp" line="393"/>
<source>Intermittent water</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="393"/>
+ <location filename="../map/CMapIMG.cpp" line="394"/>
<source>Wetland/Swamp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="394"/>
+ <location filename="../map/CMapIMG.cpp" line="395"/>
<source>Glacier</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="395"/>
+ <location filename="../map/CMapIMG.cpp" line="396"/>
<source>Orchard/Plantation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="396"/>
+ <location filename="../map/CMapIMG.cpp" line="397"/>
<source>Scrub</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="397"/>
+ <location filename="../map/CMapIMG.cpp" line="398"/>
<source>Tundra</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="398"/>
+ <location filename="../map/CMapIMG.cpp" line="399"/>
<source>Flat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="399"/>
+ <location filename="../map/CMapIMG.cpp" line="400"/>
<source>???</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="435"/>
+ <location filename="../map/CMapIMG.cpp" line="436"/>
<source>Failed to read: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="478"/>
+ <location filename="../map/CMapIMG.cpp" line="479"/>
<source>Failed to open: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="502"/>
- <location filename="../map/CMapIMG.cpp" line="506"/>
+ <location filename="../map/CMapIMG.cpp" line="503"/>
+ <location filename="../map/CMapIMG.cpp" line="507"/>
<source>Bad file format: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="595"/>
+ <location filename="../map/CMapIMG.cpp" line="596"/>
<source>Failed to read file structure: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="630"/>
+ <location filename="../map/CMapIMG.cpp" line="631"/>
<source>Loading %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="636"/>
+ <location filename="../map/CMapIMG.cpp" line="637"/>
<source>User abort: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="639"/>
+ <location filename="../map/CMapIMG.cpp" line="640"/>
<source>File is NT format. QMapShack is unable to read map files with NT format: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="730"/>
+ <location filename="../map/CMapIMG.cpp" line="731"/>
<source>File contains locked / encrypted data. Garmin does not want you to use this file with any other software than the one supplied by Garmin.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2305"/>
- <location filename="../map/CMapIMG.cpp" line="2311"/>
- <location filename="../map/CMapIMG.cpp" line="2315"/>
+ <location filename="../map/CMapIMG.cpp" line="2342"/>
+ <location filename="../map/CMapIMG.cpp" line="2348"/>
+ <location filename="../map/CMapIMG.cpp" line="2352"/>
<source>Point of Interest</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2401"/>
+ <location filename="../map/CMapIMG.cpp" line="2438"/>
<source>Unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2443"/>
- <location filename="../map/CMapIMG.cpp" line="2451"/>
- <location filename="../map/CMapIMG.cpp" line="2458"/>
+ <location filename="../map/CMapIMG.cpp" line="2480"/>
+ <location filename="../map/CMapIMG.cpp" line="2488"/>
+ <location filename="../map/CMapIMG.cpp" line="2495"/>
<source>Area</source>
<translation type="unfinished"></translation>
</message>
@@ -2756,7 +2796,7 @@ line %2, column %3:
<location filename="../map/CMapVRT.cpp" line="45"/>
<location filename="../map/CMapVRT.cpp" line="59"/>
<location filename="../map/CMapVRT.cpp" line="88"/>
- <location filename="../map/CMapVRT.cpp" line="126"/>
+ <location filename="../map/CMapVRT.cpp" line="133"/>
<source>Error...</source>
<translation type="unfinished"></translation>
</message>
@@ -2772,7 +2812,7 @@ line %2, column %3:
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapVRT.cpp" line="126"/>
+ <location filename="../map/CMapVRT.cpp" line="133"/>
<source>No georeference information found.</source>
<translation type="unfinished"></translation>
</message>
@@ -2780,22 +2820,22 @@ line %2, column %3:
<context>
<name>CMapVrtBuilder</name>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="28"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="29"/>
<source>Build GDAL VRT</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="46"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="47"/>
<source>Select files...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="70"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="71"/>
<source>Select target file...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="114"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="115"/>
<source>!!! done !!!
</source>
<translation type="unfinished"></translation>
@@ -2923,36 +2963,41 @@ Unknown structure.</source>
<name>CMouseNormal</name>
<message>
<location filename="../mouse/CMouseNormal.cpp" line="39"/>
- <source>Add Waypoint</source>
+ <source>Add POI as Waypoint</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mouse/CMouseNormal.cpp" line="40"/>
- <source>Add Track</source>
+ <source>Add Waypoint</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mouse/CMouseNormal.cpp" line="41"/>
- <source>Add Route</source>
+ <source>Add Track</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mouse/CMouseNormal.cpp" line="42"/>
+ <source>Add Route</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mouse/CMouseNormal.cpp" line="43"/>
<source>Add Area</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="44"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="45"/>
<source>Select Items On Map</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="46"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="47"/>
<source>Copy position</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="47"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="48"/>
<source>Copy position (Grid)</source>
<translation type="unfinished"></translation>
</message>
@@ -2968,7 +3013,7 @@ Unknown structure.</source>
<context>
<name>CMouseRangeTrk</name>
<message>
- <location filename="../mouse/CMouseRangeTrk.cpp" line="227"/>
+ <location filename="../mouse/CMouseRangeTrk.cpp" line="224"/>
<source><b>Select Range</b><br/>Select first track point with left mouse button. And then a second one. Leave range selection with a click of the right mouse button.<br/></source>
<translation type="unfinished"></translation>
</message>
@@ -2976,32 +3021,32 @@ Unknown structure.</source>
<context>
<name>CMouseSelect</name>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="31"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="32"/>
<source><b>Select Items On Map</b><br/>Select a rectangular area on the map. Use the left mouse button and move the mouse. Abort with a right click. Adjust the selection by point-click-move on the corners.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="96"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="98"/>
<source><b>Selected:</b><br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="104"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="106"/>
<source>%1 waypoints<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="99"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="101"/>
<source>%1 tracks<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="109"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="111"/>
<source>%1 routes<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="114"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="116"/>
<source>%1 areas<br/></source>
<translation type="unfinished"></translation>
</message>
@@ -3090,7 +3135,7 @@ y: %4 m/px</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../helpers/CProgressDialog.cpp" line="82"/>
+ <location filename="../helpers/CProgressDialog.cpp" line="86"/>
<source>Elapsed time: %1 seconds.</source>
<translation type="unfinished"></translation>
</message>
@@ -3318,6 +3363,458 @@ is not a valid coordinate system definition:
</message>
</context>
<context>
+ <name>CRouterBRouter</name>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="49"/>
+ <source>original</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="50"/>
+ <source>first alternative</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="51"/>
+ <source>second alternative</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="52"/>
+ <source>third alternative</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="147"/>
+ <source>BRouter (offline)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="152"/>
+ <source>BRouter (online)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="180"/>
+ <source>profile: %1, alternative: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="267"/>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="381"/>
+ <source>response is empty</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="304"/>
+ <source>Bad response from server: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="352"/>
+ <source><b>BRouter</b><br/>Routing request sent to server. Please wait...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="246"/>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="355"/>
+ <source>Calculate route with %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="415"/>
+ <source><b>BRouter</b><br/>Bad response from server:<br/>%1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="405"/>
+ <source><br/>Calculation time: %1s</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="509"/>
+ <source>Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="561"/>
+ <source>running</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="553"/>
+ <source>starting</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="515"/>
+ <source>QMapShack communicates with BRouter via a network connection. Usually this is done on a special address that can't be reached from outside your device. However BRouter listens for connections on all available interfaces. If you are in your own private network with an active firewall, this is not much of a problem. If you are in a public network every open port is a risk as it can be used by someone else to compromise your system. We do not recommend to use the local [...]
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="542"/>
+ <source>Warning...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="547"/>
+ <source>I understand the risk. Don't tell me again.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="568"/>
+ <source>stopped</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="579"/>
+ <source>not installed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="590"/>
+ <source>online</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterSetup</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="479"/>
+ <source>%1 not accessible</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="489"/>
+ <source>%1 invalid result</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="533"/>
+ <source>Error parsing online-config:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="538"/>
+ <source>Network error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterSetupWizard</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="38"/>
+ <source>Restore Default Values</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="371"/>
+ <source>Open Directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="378"/>
+ <source>select Java Executable</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="414"/>
+ <source>please select BRouter installation directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="419"/>
+ <source>selected directory does not exist</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="420"/>
+ <source>create directory and install BRouter there</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="427"/>
+ <source>existing BRouter installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="428"/>
+ <source>update existing BRouter installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="433"/>
+ <source>empty directory, create new BRouter installation here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="434"/>
+ <source>create new BRouter installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="442"/>
+ <source>seems to be a valid Java-executable</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="446"/>
+ <source>doesn't seem to be a valid Java-executable</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="451"/>
+ <source>Java Executable not found</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="496"/>
+ <source>Error loading installation-page at %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="505"/>
+ <source>no brouter-version to install selected</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="513"/>
+ <source>selected %1 for download and installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="524"/>
+ <source>Warning...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="529"/>
+ <source>Download: %1<br/><br/>This will download and install a zip file from a download location that is not secured by any standard at all, using plain HTTP. Usually this should be HTTPS. The risk is someone redirecting the request and sending you a replacement zip with malware. There is no way for QMapShack to detect this. <br/>If you do not understand this or if you are in doubt, do not proceed and abort. Use the Web version of BRouter instead.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="541"/>
+ <source>I understand the risk and wish to proceed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="553"/>
+ <source>download %1 started</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="565"/>
+ <source>Network Error: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="586"/>
+ <source>download %1 finished</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="588"/>
+ <source>unzipping:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="593"/>
+ <source>ready.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="613"/>
+ <source>download of brouter failed: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="623"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="630"/>
+ <source>retrieving available profiles from %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="654"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="736"/>
+ <source>content of profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="729"/>
+ <source>Error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="466"/>
+ <source>Error creating directory %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="571"/>
+ <source>Error directory %1 does not exist</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="578"/>
+ <source>Error creating file %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="582"/>
+ <source>Error writing to file %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterTilesPage</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesPage.cpp" line="82"/>
+ <source>Continue with Setup</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterTilesSelect</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="98"/>
+ <source>available routing-data is being determined.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="108"/>
+ <source>Select outdated</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="109"/>
+ <source>Clear Selection</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="110"/>
+ <source>Delete selection</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="111"/>
+ <source>Download</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="190"/>
+ <source>Error removing %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="281"/>
+ <source>Error creating segments directory %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="685"/>
+ <source>up-to-date: %1 (%2), outdated: %3 (%4), to be downloaded: %5 (%6)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="783"/>
+ <source>being downloaded: %1 of %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="803"/>
+ <source>no local data, online available: %1 (%2)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="789"/>
+ <source>local data outdated (%1, %2 - remote %3, %4)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="321"/>
+ <source>Network Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="330"/>
+ <source>invalid result, no files found</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="365"/>
+ <source>cannot parse: %1 is not a date</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="390"/>
+ <source>cannot parse: %1 is not a valid size</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="409"/>
+ <source>Error retrieving available routing data from %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="490"/>
+ <source>segments directory does not exist: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="504"/>
+ <source>error creating file %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="536"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="576"/>
+ <source>no valid request for filename %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="541"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="584"/>
+ <source>no open file assigned to request for %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="551"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="594"/>
+ <source>error writing to file %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="602"/>
+ <source>error renaming file %1 to %2: %3</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="797"/>
+ <source>local data up to date (%1, %2)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="809"/>
+ <source>no routing-data available</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterToolShell</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="74"/>
+ <source>!!! done !!!
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="79"/>
+ <source>!!! failed !!!
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CRouterMapQuest</name>
<message>
<location filename="../gis/rte/router/CRouterMapQuest.cpp" line="37"/>
@@ -3445,7 +3942,6 @@ is not a valid coordinate system definition:
<name>CRouterRoutino</name>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="55"/>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="238"/>
<source>Warning...</source>
<translation type="unfinished"></translation>
</message>
@@ -3650,18 +4146,13 @@ is not a valid coordinate system definition:
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="238"/>
- <source>%1: Due to limitations in the Windows POSIX API Routino can't handle files larger than 4GB.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="338"/>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="425"/>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="332"/>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="419"/>
<source>Calculate route with %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="346"/>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="340"/>
<source><br/>Calculation time: %1s</source>
<translation type="unfinished"></translation>
</message>
@@ -3669,12 +4160,12 @@ is not a valid coordinate system definition:
<context>
<name>CRouterRoutinoPathSetup</name>
<message>
- <location filename="../gis/rte/router/CRouterRoutinoPathSetup.cpp" line="40"/>
+ <location filename="../gis/rte/router/routino/CRouterRoutinoPathSetup.cpp" line="40"/>
<source>Add or remove paths containing Routino data. There can be multiple databases in a path but no sub-path is parsed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutinoPathSetup.cpp" line="55"/>
+ <location filename="../gis/rte/router/routino/CRouterRoutinoPathSetup.cpp" line="55"/>
<source>Select routing data file path...</source>
<translation type="unfinished"></translation>
</message>
@@ -3682,35 +4173,40 @@ is not a valid coordinate system definition:
<context>
<name>CRouterSetup</name>
<message>
- <location filename="../gis/rte/router/CRouterSetup.cpp" line="36"/>
+ <location filename="../gis/rte/router/CRouterSetup.cpp" line="38"/>
<source>Routino (offline)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterSetup.cpp" line="37"/>
+ <location filename="../gis/rte/router/CRouterSetup.cpp" line="39"/>
<source>MapQuest (online)</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gis/rte/router/CRouterSetup.cpp" line="40"/>
+ <source>BRouter (online)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CRoutinoDatabaseBuilder</name>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="32"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="33"/>
<source>Create Routino Database</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="56"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="57"/>
<source>Select files...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="80"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="81"/>
<source>Select target path...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="141"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="142"/>
<source>!!! done !!!
</source>
<translation type="unfinished"></translation>
@@ -3847,71 +4343,167 @@ is not a valid coordinate system definition:
<context>
<name>CSlfProject</name>
<message>
- <location filename="../gis/slf/CSlfProject.cpp" line="42"/>
- <source>Failed to load file %1...</source>
+ <location filename="../gis/slf/CSlfProject.cpp" line="42"/>
+ <source>Failed to load file %1...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CSlfReader</name>
+ <message>
+ <location filename="../gis/slf/CSlfReader.cpp" line="63"/>
+ <source>Failed to parse timestamp `%1`</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/slf/CSlfReader.cpp" line="76"/>
+ <source>%1 does not exist</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/slf/CSlfReader.cpp" line="81"/>
+ <source>Failed to open %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/slf/CSlfReader.cpp" line="92"/>
+ <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/slf/CSlfReader.cpp" line="99"/>
+ <source>Not a SLF file: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/slf/CSlfReader.cpp" line="106"/>
+ <source>Unsupported revision %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/slf/CSlfReader.cpp" line="181"/>
+ <source>Break %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/slf/CSlfReader.cpp" line="185"/>
+ <source>Lap %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CTableTrk</name>
+ <message>
+ <location filename="../gis/trk/CTableTrk.cpp" line="99"/>
+ <source>Double click to edit elevation value</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CTableTrk.cpp" line="125"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="133"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="136"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="141"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="155"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="157"/>
+ <source>%1 %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CTcxProject</name>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="51"/>
+ <source>Failed to load file %1...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="73"/>
+ <source>Failed to open %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="84"/>
+ <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="91"/>
+ <source>Not a TCX file: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="101"/>
+ <source>This TCX file contains at least 1 workout, but neither an activity nor a course. As workouts do not contain position data, they can not be imported to QMapShack.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="106"/>
+ <source>This TCX file does not contain any activity or course: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="275"/>
+ <source>File exists ...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="276"/>
+ <source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file. Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>CSlfReader</name>
<message>
- <location filename="../gis/slf/CSlfReader.cpp" line="63"/>
- <source>Failed to parse timestamp `%1`</source>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="315"/>
+ <source>The track <b>%1</b> you have selected contains trackpoints with invalid timestamps. Device might not accept the generated TCX course file if left as is. <b>Do you want to apply a filter with constant speed (10 m/s) and continue?</b></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/slf/CSlfReader.cpp" line="76"/>
- <source>%1 does not exist</source>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="339"/>
+ <source>Course</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/slf/CSlfReader.cpp" line="81"/>
- <source>Failed to open %1</source>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="340"/>
+ <source>Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/slf/CSlfReader.cpp" line="92"/>
- <source>Failed to read: %1
-line %2, column %3:
- %4</source>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="341"/>
+ <source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/slf/CSlfReader.cpp" line="99"/>
- <source>Not a SLF file: %1</source>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="314"/>
+ <source>Track with invalid timestamps...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/slf/CSlfReader.cpp" line="106"/>
- <source>Unsupported revision %1: %2</source>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="334"/>
+ <source>Activity or course?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/slf/CSlfReader.cpp" line="181"/>
- <source>Break %1</source>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="335"/>
+ <source>QMapShack does not know how track <b>%1</b> should be saved. <b>Do you want to save it as a course or as an activity? </b>Remember that only waypoints close enough to the track will be saved when saving as a course. Waypoints will not be saved when saving as an activity.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/slf/CSlfReader.cpp" line="185"/>
- <source>Lap %1</source>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="432"/>
+ <source>Failed to create file '%1'</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>CTableTrk</name>
<message>
- <location filename="../gis/trk/CTableTrk.cpp" line="99"/>
- <source>Double click to edit elevation value</source>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="453"/>
+ <source>Failed to write file '%1'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CTableTrk.cpp" line="125"/>
- <location filename="../gis/trk/CTableTrk.cpp" line="133"/>
- <location filename="../gis/trk/CTableTrk.cpp" line="136"/>
- <location filename="../gis/trk/CTableTrk.cpp" line="141"/>
- <location filename="../gis/trk/CTableTrk.cpp" line="155"/>
- <location filename="../gis/trk/CTableTrk.cpp" line="157"/>
- <source>%1 %2</source>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="435"/>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="454"/>
+ <source>Saving GIS data failed...</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -3990,137 +4582,148 @@ line %2, column %3:
</message>
<message>
<location filename="../IAbout.ui" line="62"/>
- <location filename="../IAbout.ui" line="106"/>
- <location filename="../IAbout.ui" line="120"/>
- <location filename="../IAbout.ui" line="134"/>
- <location filename="../IAbout.ui" line="148"/>
+ <location filename="../IAbout.ui" line="113"/>
+ <location filename="../IAbout.ui" line="127"/>
+ <location filename="../IAbout.ui" line="141"/>
+ <location filename="../IAbout.ui" line="155"/>
<source>TextLabel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="99"/>
+ <location filename="../IAbout.ui" line="106"/>
<source>Qt</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="113"/>
+ <location filename="../IAbout.ui" line="120"/>
<source>GDAL</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="127"/>
+ <location filename="../IAbout.ui" line="134"/>
<source>Proj4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="141"/>
+ <location filename="../IAbout.ui" line="148"/>
<source>Routino</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="172"/>
+ <location filename="../IAbout.ui" line="179"/>
<source>Czech:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="182"/>
+ <location filename="../IAbout.ui" line="189"/>
<source>Pavel Fric</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="195"/>
+ <location filename="../IAbout.ui" line="202"/>
<source>German:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="205"/>
- <source>Josef Latt</source>
+ <location filename="../IAbout.ui" line="212"/>
+ <source>Oliver Eichler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="218"/>
+ <location filename="../IAbout.ui" line="225"/>
<source>Dutch:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="228"/>
+ <location filename="../IAbout.ui" line="235"/>
<source>Harrie Klomp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="241"/>
+ <location filename="../IAbout.ui" line="248"/>
<source>French:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="251"/>
+ <location filename="../IAbout.ui" line="258"/>
<source>Rainer Unseld </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="258"/>
+ <location filename="../IAbout.ui" line="265"/>
<source>Jose Luis Domingo Lopez</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="271"/>
+ <location filename="../IAbout.ui" line="278"/>
<source>Spanish:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="281"/>
+ <location filename="../IAbout.ui" line="288"/>
<source><b>Translation:</b></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="305"/>
+ <location filename="../IAbout.ui" line="295"/>
+ <source>Russian:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../IAbout.ui" line="302"/>
+ <source>Wolfgang Thämelt</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../IAbout.ui" line="326"/>
<source>Win64:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="321"/>
+ <location filename="../IAbout.ui" line="342"/>
<source>OS X:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="331"/>
+ <location filename="../IAbout.ui" line="352"/>
<source>Helmut Schmidt</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="338"/>
+ <location filename="../IAbout.ui" line="359"/>
<source>Ivo Kronenberg</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="345"/>
+ <location filename="../IAbout.ui" line="366"/>
<source><b>Binaries:</b></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="354"/>
+ <location filename="../IAbout.ui" line="375"/>
<source>...and thanks to all Linux binary maintainers for doing a great job. Special thanks to Dan Horák and Bas Couwenberg for showing presence on the mailing list to discuss distribution related topics.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="374"/>
+ <location filename="../IAbout.ui" line="395"/>
<source><b>Contributors:</b></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="381"/>
+ <location filename="../IAbout.ui" line="402"/>
<source>Christian Eichler (qms at christian-eichler.de)
-Ivo Kronenberg</source>
+Ivo Kronenberg
+Norbert Truchsess (norbert.truchsess at t-online.de)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="399"/>
+ <location filename="../IAbout.ui" line="421"/>
<source>This software is licensed under GPL3 or any later version</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="406"/>
- <source>© 2014 Oliver Eichler (oliver.eichler at gmx.de)</source>
+ <location filename="../IAbout.ui" line="428"/>
+ <source>© 2017 Oliver Eichler (oliver.eichler at gmx.de)</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -4173,13 +4776,23 @@ Ivo Kronenberg</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/ICombineTrk.ui" line="43"/>
- <location filename="../gis/trk/ICombineTrk.ui" line="70"/>
- <location filename="../gis/trk/ICombineTrk.ui" line="117"/>
- <location filename="../gis/trk/ICombineTrk.ui" line="144"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="24"/>
+ <source>Available Tracks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/ICombineTrk.ui" line="54"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="81"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="139"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="166"/>
<source>...</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gis/trk/ICombineTrk.ui" line="109"/>
+ <source>Combined Tracks</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ICoordFormatSetup</name>
@@ -4231,17 +4844,22 @@ Ivo Kronenberg</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/ICutTrk.ui" line="27"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="30"/>
<source>Keep both parts of the track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/ICutTrk.ui" line="37"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="43"/>
<source>Keep first part of the track and delete second one</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/ICutTrk.ui" line="60"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="55"/>
+ <source>Cut Mode:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/ICutTrk.ui" line="136"/>
<source>Check this to store the result into a new track.
If you keep both parts of the track you have to create new ones.
@@ -4250,7 +4868,7 @@ 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/ICutTrk.ui" line="67"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="143"/>
<source>Create a new track</source>
<translation type="unfinished"></translation>
</message>
@@ -4562,7 +5180,7 @@ If you want to keep just one half you can simply remove the points, or check thi
</message>
<message>
<location filename="../gis/ovl/IDetailsOvlArea.ui" line="132"/>
- <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>
+ <source>The area was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -4676,7 +5294,7 @@ If you want to keep just one half you can simply remove the points, or check thi
</message>
<message>
<location filename="../gis/rte/IDetailsRte.ui" line="154"/>
- <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>
+ <source>The route was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -4715,11 +5333,6 @@ 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="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="287"/>
<source>Toggle read only mode. You have to open the lock to edit the item.</source>
<translation type="unfinished"></translation>
@@ -4836,6 +5449,11 @@ 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="265"/>
+ <source>The track was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+ <translation type="unfinished"></translation>
+ </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"/>
@@ -4988,7 +5606,7 @@ If you want to keep just one half you can simply remove the points, or check thi
</message>
<message>
<location filename="../gis/wpt/IDetailsWpt.ui" line="268"/>
- <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>
+ <source>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -5585,69 +6203,69 @@ It is either a new item or it has been deleted in the database by someone else.<
<context>
<name>IGisProject</name>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="109"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="155"/>
<source>Save project?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="109"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="155"/>
<source><h3>%1</h3>The project was changed. Save before closing it?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="283"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="329"/>
<source>%1: Correlate tracks and waypoints.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="293"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="339"/>
<source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="294"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="340"/>
<source>Canceled correlation...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="339"/>
- <location filename="../gis/prj/IGisProject.cpp" line="392"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="385"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="442"/>
<source>Save "%1" to...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="477"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="527"/>
<source><br/>
Filename: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="482"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="532"/>
<source>Waypoints: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="486"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="536"/>
<source>Tracks: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="490"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="540"/>
<source>Routes: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="494"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="544"/>
<source>Areas: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="614"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="664"/>
<source>Are you sure you want to delete '%1' from project '%2'?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="615"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="665"/>
<source>Delete...</source>
<translation type="unfinished"></translation>
</message>
@@ -5660,28 +6278,28 @@ Filename: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="37"/>
+ <location filename="../gis/IGisWidget.ui" line="49"/>
<source>Opacity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="44"/>
+ <location filename="../gis/IGisWidget.ui" line="56"/>
<source>Change the opacity of all GIS Items on the map.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="96"/>
- <location filename="../gis/IGisWidget.ui" line="126"/>
+ <location filename="../gis/IGisWidget.ui" line="108"/>
+ <location filename="../gis/IGisWidget.ui" line="138"/>
<source>Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="131"/>
+ <location filename="../gis/IGisWidget.ui" line="143"/>
<source>Age</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="165"/>
+ <location filename="../gis/IGisWidget.ui" line="177"/>
<source>To add a database do a right click on the database list above.</source>
<translation type="unfinished"></translation>
</message>
@@ -5783,7 +6401,7 @@ Filename: %1</source>
<context>
<name>ILineOp</name>
<message>
- <location filename="../mouse/line/ILineOp.cpp" line="211"/>
+ <location filename="../mouse/line/ILineOp.cpp" line="212"/>
<source>Routing</source>
<translation type="unfinished"></translation>
</message>
@@ -5840,333 +6458,338 @@ Filename: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="109"/>
+ <location filename="../IMainWindow.ui" line="110"/>
<source>?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="116"/>
+ <location filename="../IMainWindow.ui" line="118"/>
<source>Project</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="127"/>
+ <location filename="../IMainWindow.ui" line="129"/>
<source>Tool</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="152"/>
+ <location filename="../IMainWindow.ui" line="154"/>
<source>Maps</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="195"/>
+ <location filename="../IMainWindow.ui" line="197"/>
<source>Dig. Elev. Model (DEM)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="234"/>
+ <location filename="../IMainWindow.ui" line="236"/>
<source>Data</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="252"/>
+ <location filename="../IMainWindow.ui" line="254"/>
<source>Route</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="286"/>
- <location filename="../IMainWindow.ui" line="289"/>
+ <location filename="../IMainWindow.ui" line="288"/>
+ <location filename="../IMainWindow.ui" line="291"/>
<source>Add Map View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="292"/>
+ <location filename="../IMainWindow.ui" line="294"/>
<source>Ctrl+T</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="307"/>
+ <location filename="../IMainWindow.ui" line="309"/>
<source>Show Scale</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="319"/>
+ <location filename="../IMainWindow.ui" line="321"/>
<source>Setup Map Font</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="334"/>
+ <location filename="../IMainWindow.ui" line="336"/>
<source>Show Grid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="337"/>
+ <location filename="../IMainWindow.ui" line="339"/>
<source>Ctrl+G</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="349"/>
+ <location filename="../IMainWindow.ui" line="351"/>
<source>Setup Grid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="352"/>
+ <location filename="../IMainWindow.ui" line="354"/>
<source>Ctrl+Alt+G</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="367"/>
+ <location filename="../IMainWindow.ui" line="369"/>
<source>Flip Mouse Wheel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="379"/>
- <location filename="../IMainWindow.ui" line="382"/>
+ <location filename="../IMainWindow.ui" line="381"/>
+ <location filename="../IMainWindow.ui" line="384"/>
<source>Setup Map Paths</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="397"/>
+ <location filename="../IMainWindow.ui" line="399"/>
<source>POI Text</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="412"/>
+ <location filename="../IMainWindow.ui" line="414"/>
<source>Night / Day</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="427"/>
+ <location filename="../IMainWindow.ui" line="429"/>
<source>Map Tool Tip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="430"/>
+ <location filename="../IMainWindow.ui" line="432"/>
<source>Ctrl+I</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="442"/>
+ <location filename="../IMainWindow.ui" line="444"/>
<source>Setup DEM Paths</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="454"/>
+ <location filename="../IMainWindow.ui" line="456"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="466"/>
+ <location filename="../IMainWindow.ui" line="468"/>
<source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="469"/>
+ <location filename="../IMainWindow.ui" line="471"/>
<source>F1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="481"/>
- <location filename="../IMainWindow.ui" line="484"/>
+ <location filename="../IMainWindow.ui" line="483"/>
+ <location filename="../IMainWindow.ui" line="486"/>
<source>Setup Map View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="496"/>
+ <location filename="../IMainWindow.ui" line="498"/>
<source>Load GIS Data</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="499"/>
+ <location filename="../IMainWindow.ui" line="501"/>
<source>Load projects from file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="502"/>
+ <location filename="../IMainWindow.ui" line="504"/>
<source>Ctrl+L</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="514"/>
+ <location filename="../IMainWindow.ui" line="516"/>
<source>Save All GIS Data</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="517"/>
+ <location filename="../IMainWindow.ui" line="519"/>
<source>Save all projects in the workspace</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="520"/>
+ <location filename="../IMainWindow.ui" line="522"/>
<source>Ctrl+S</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="532"/>
+ <location filename="../IMainWindow.ui" line="534"/>
<source>Setup Time Zone</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="544"/>
+ <location filename="../IMainWindow.ui" line="546"/>
<source>Add empty project</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="559"/>
+ <location filename="../IMainWindow.ui" line="561"/>
<source>Search Google</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="571"/>
+ <location filename="../IMainWindow.ui" line="573"/>
<source>Close all projects</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="574"/>
+ <location filename="../IMainWindow.ui" line="576"/>
<source>F8</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="586"/>
+ <location filename="../IMainWindow.ui" line="588"/>
<source>Setup Units</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="598"/>
+ <location filename="../IMainWindow.ui" line="600"/>
<source>Setup Workspace</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="601"/>
+ <location filename="../IMainWindow.ui" line="603"/>
<source>Setup save on exit.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="613"/>
+ <location filename="../IMainWindow.ui" line="615"/>
<source>Import Database from QLandkarte</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="616"/>
+ <location filename="../IMainWindow.ui" line="618"/>
<source>Import QLandkarte GT database</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="628"/>
+ <location filename="../IMainWindow.ui" line="630"/>
<source>VRT Builder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="631"/>
+ <location filename="../IMainWindow.ui" line="633"/>
<source>GUI front end to gdalbuildvrt</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="643"/>
+ <location filename="../IMainWindow.ui" line="645"/>
<source>Store Map View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="646"/>
+ <location filename="../IMainWindow.ui" line="648"/>
<source>Write current active map and DEM list including the properties to a file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="658"/>
+ <location filename="../IMainWindow.ui" line="660"/>
<source>Load Map View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="661"/>
+ <location filename="../IMainWindow.ui" line="663"/>
<source>Restore view with active map and DEM list including the properties from a file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="676"/>
+ <location filename="../IMainWindow.ui" line="678"/>
<source>Ext. Profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="679"/>
+ <location filename="../IMainWindow.ui" line="681"/>
<source>Ctrl+E</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="691"/>
+ <location filename="../IMainWindow.ui" line="693"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="694"/>
+ <location filename="../IMainWindow.ui" line="696"/>
<source>Ctrl+Q</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="706"/>
+ <location filename="../IMainWindow.ui" line="708"/>
<source>Clone Map View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="709"/>
+ <location filename="../IMainWindow.ui" line="711"/>
<source>Ctrl+Shift+T</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="721"/>
+ <location filename="../IMainWindow.ui" line="723"/>
<source>Create Routino Database</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="733"/>
+ <location filename="../IMainWindow.ui" line="735"/>
<source>Save(Print) Map Screenshot</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="736"/>
+ <location filename="../IMainWindow.ui" line="738"/>
<source>Print a selected area of the map</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="739"/>
+ <location filename="../IMainWindow.ui" line="741"/>
<source>Ctrl+P</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="751"/>
+ <location filename="../IMainWindow.ui" line="753"/>
<source>Setup Coord. Format</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="754"/>
+ <location filename="../IMainWindow.ui" line="756"/>
<source>Change the format coordinates are displayed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="766"/>
+ <location filename="../IMainWindow.ui" line="768"/>
<source>Setup Map Background</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="778"/>
+ <location filename="../IMainWindow.ui" line="780"/>
<source>Setup Waypoint Icons</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="781"/>
+ <location filename="../IMainWindow.ui" line="783"/>
<source>Setup path to custom icons</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="790"/>
+ <location filename="../IMainWindow.ui" line="792"/>
<source>Close Tab</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="793"/>
+ <location filename="../IMainWindow.ui" line="795"/>
<source>Ctrl+W</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../IMainWindow.ui" line="804"/>
+ <source>Quickstart Help</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>IMapList</name>
@@ -6288,37 +6911,42 @@ I don't want to read the documentation!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="137"/>
+ <location filename="../map/IMapPropSetup.ui" line="139"/>
<source>Areas</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="144"/>
+ <location filename="../map/IMapPropSetup.ui" line="146"/>
<source>Lines</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="151"/>
+ <location filename="../map/IMapPropSetup.ui" line="153"/>
<source>Points</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="196"/>
+ <location filename="../map/IMapPropSetup.ui" line="170"/>
+ <source>Details</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../map/IMapPropSetup.ui" line="227"/>
<source>Cache Size (MB)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="216"/>
+ <location filename="../map/IMapPropSetup.ui" line="247"/>
<source>Expiration (Days)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="233"/>
+ <location filename="../map/IMapPropSetup.ui" line="264"/>
<source>-</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="240"/>
+ <location filename="../map/IMapPropSetup.ui" line="271"/>
<source>Cache Path</source>
<translation type="unfinished"></translation>
</message>
@@ -6462,18 +7090,23 @@ I don't want to read the documentation!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../plot/IPlot.cpp" line="541"/>
+ <location filename="../plot/IPlot.cpp" line="99"/>
+ <source>Cut...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../plot/IPlot.cpp" line="542"/>
<source>Hold CTRL key for vertical zoom, only.
Hold ALT key for horizontal zoom, only.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../plot/IPlot.cpp" line="696"/>
+ <location filename="../plot/IPlot.cpp" line="697"/>
<source>No or bad data.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../plot/IPlot.cpp" line="1296"/>
+ <location filename="../plot/IPlot.cpp" line="1298"/>
<source>Select output file</source>
<translation type="unfinished"></translation>
</message>
@@ -6640,6 +7273,262 @@ or
</message>
</context>
<context>
+ <name>IRouterBRouter</name>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="28"/>
+ <source>Profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="35"/>
+ <source>Alternative</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="64"/>
+ <source>display selected routing profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="67"/>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="128"/>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="142"/>
+ <source>...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="87"/>
+ <source>on-the-fly routing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="111"/>
+ <source>BRouter: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="118"/>
+ <source>not running</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="125"/>
+ <source>start/stop BRouter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="139"/>
+ <source>show BRouter console</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="172"/>
+ <source>Setup</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="181"/>
+ <source>Caution! BRouter is listening on all ports for connections.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>IRouterBRouterInfo</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterInfo.ui" line="14"/>
+ <source>BRouter Profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterInfo.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>IRouterBRouterSetupWizard</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="23"/>
+ <source>BRouter Setup</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="48"/>
+ <source>choose which BRouter to use</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="54"/>
+ <source>BRouter-Web (online)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="61"/>
+ <source>local Installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="68"/>
+ <source>Expert Mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="91"/>
+ <source>local BRouter Installation directory:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="103"/>
+ <source>select installation directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="106"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="162"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="342"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="356"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="389"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="400"/>
+ <source>...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="119"/>
+ <source>labelLocalDirResult</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="128"/>
+ <source>create or update installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="152"/>
+ <source>Java Executable</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="175"/>
+ <source>labelLocalJavaResult</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="184"/>
+ <source>search for installed java</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="241"/>
+ <source>Download and install BRouter Version</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="255"/>
+ <source>about:blank</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="263"/>
+ <source>File to install</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="272"/>
+ <source>Download and Install</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="321"/>
+ <source>available Profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="339"/>
+ <source>install profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="353"/>
+ <source>remove profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="371"/>
+ <source>installed Profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="415"/>
+ <source>content of profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="451"/>
+ <source>BRouter-Web URL:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="501"/>
+ <source>Service-URL</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="511"/>
+ <source>Profile-URL</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="561"/>
+ <source>Hostname</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="571"/>
+ <source>Port</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="581"/>
+ <source>Profile directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="591"/>
+ <source>Segments directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="601"/>
+ <source>Custom Profiles dir</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="611"/>
+ <source>Max Runtime</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="621"/>
+ <source>Number Threads</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="631"/>
+ <source>Java Options</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="551"/>
+ <source>Profiles Url</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>IRouterMapQuest</name>
<message>
<location filename="../gis/rte/router/IRouterMapQuest.ui" line="14"/>
@@ -6743,18 +7632,18 @@ or
<context>
<name>IRouterRoutinoPathSetup</name>
<message>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="14"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="14"/>
<source>Setup Routino database...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="27"/>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="47"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="27"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="47"/>
<source>...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="99"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="99"/>
<source>-</source>
<translation type="unfinished"></translation>
</message>
@@ -7007,18 +7896,18 @@ or
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="20"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="32"/>
<source>Delete all points between the first and last one.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="23"/>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="37"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="35"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="49"/>
<source>...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="34"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="46"/>
<source><html><head/><body><p>Calculate a route between the first and last selected point.</p></body></html></source>
<translation type="unfinished"></translation>
</message>
@@ -7141,12 +8030,13 @@ or
<location filename="../mouse/IScrOptSelect.ui" line="82"/>
<location filename="../mouse/IScrOptSelect.ui" line="102"/>
<location filename="../mouse/IScrOptSelect.ui" line="122"/>
- <location filename="../mouse/IScrOptSelect.ui" line="176"/>
- <location filename="../mouse/IScrOptSelect.ui" line="205"/>
- <location filename="../mouse/IScrOptSelect.ui" line="265"/>
- <location filename="../mouse/IScrOptSelect.ui" line="292"/>
- <location filename="../mouse/IScrOptSelect.ui" line="319"/>
- <location filename="../mouse/IScrOptSelect.ui" line="346"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="142"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="196"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="225"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="285"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="312"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="339"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="366"/>
<source>...</source>
<translation type="unfinished"></translation>
</message>
@@ -7157,41 +8047,46 @@ or
</message>
<message>
<location filename="../mouse/IScrOptSelect.ui" line="99"/>
- <source>Combine all selected tracks to a new one.</source>
+ <source>Change the icon of all selected waypoints.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mouse/IScrOptSelect.ui" line="119"/>
+ <source>Combine all selected tracks to a new one.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mouse/IScrOptSelect.ui" line="139"/>
<source>Delete all selected items.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="173"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="193"/>
<source>Select all items that intersect the selected area.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="202"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="222"/>
<source>Select all itmes that are completely inside the selected area.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="262"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="282"/>
<source>Add tracks to selection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="289"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="309"/>
<source>Add waypoints to selection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="316"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="336"/>
<source>Add routes to selection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="343"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="363"/>
<source>Add areas to selection.</source>
<translation type="unfinished"></translation>
</message>
@@ -8051,36 +8946,36 @@ or
<context>
<name>IToolShell</name>
<message>
- <location filename="../tool/IToolShell.cpp" line="45"/>
+ <location filename="../tool/IToolShell.cpp" line="46"/>
<source>Execution of external program `%1` failed: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="49"/>
+ <location filename="../tool/IToolShell.cpp" line="50"/>
<source>Process cannot be started.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="50"/>
+ <location filename="../tool/IToolShell.cpp" line="51"/>
<source>Make sure the required packages are installed, `%1` exists and is executable.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="54"/>
+ <location filename="../tool/IToolShell.cpp" line="55"/>
<source>External process crashed.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="58"/>
+ <location filename="../tool/IToolShell.cpp" line="59"/>
<source>An unknown error occurred.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="149"/>
+ <location filename="../tool/IToolShell.cpp" line="172"/>
<source>!!! failed !!!
</source>
<translation type="unfinished"></translation>
diff --git a/src/locale/qmapshack_cs.ts b/src/locale/qmapshack_cs.ts
index 43ba41e..3abd684 100644
--- a/src/locale/qmapshack_cs.ts
+++ b/src/locale/qmapshack_cs.ts
@@ -13,6 +13,11 @@
<source>%1 (API V%2)</source>
<translation>%1 (API verze %2)</translation>
</message>
+ <message>
+ <location filename="../CAbout.cpp" line="49"/>
+ <source>(no DBUS: device detection and handling disabled)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CActivityTrk</name>
@@ -112,12 +117,12 @@
<context>
<name>CCanvas</name>
<message>
- <location filename="../canvas/CCanvas.cpp" line="60"/>
+ <location filename="../canvas/CCanvas.cpp" line="61"/>
<source>View %1</source>
<translation>Pohled %1</translation>
</message>
<message>
- <location filename="../canvas/CCanvas.cpp" line="685"/>
+ <location filename="../canvas/CCanvas.cpp" line="693"/>
<source>Setup Map Background</source>
<translation>Nastavit pozadí mapy</translation>
</message>
@@ -262,7 +267,27 @@
<context>
<name>CDBProject</name>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="223"/>
+ <location filename="../gis/db/CDBProject.cpp" line="112"/>
+ <source>Failed to load...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="113"/>
+ <source>Can't load file "%1" . It will be skipped.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="126"/>
+ <source>Project already in database...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="127"/>
+ <source>The project "%1" has already been imported into the database. It will be skipped.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="278"/>
<source>The item %1 has been changed by %2 (%3).
To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
@@ -271,47 +296,47 @@ To solve this conflict you can create and save a clone, force your version or dr
K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji verzi, nebo ji zahodit a vzít jednu z databáze</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="229"/>
+ <location filename="../gis/db/CDBProject.cpp" line="284"/>
<source>Conflict with database...</source>
<translation>Střet s databází...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="230"/>
+ <location filename="../gis/db/CDBProject.cpp" line="285"/>
<source>Clone && Save</source>
<translation>Klonovat a uložit</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="231"/>
+ <location filename="../gis/db/CDBProject.cpp" line="286"/>
<source>Force Save</source>
<translation>Vynutit uložení</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="232"/>
+ <location filename="../gis/db/CDBProject.cpp" line="287"/>
<source>Take remote</source>
<translation>Vzít vzdálenou verzi</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="514"/>
+ <location filename="../gis/db/CDBProject.cpp" line="569"/>
<source>Missing folder...</source>
<translation>Chybí složka...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="515"/>
+ <location filename="../gis/db/CDBProject.cpp" line="570"/>
<source>Failed to save project. The folder has been deleted in the database.</source>
<translation>Nepodařilo se uložit projekt. Složka byla v databázi smazána.</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="522"/>
+ <location filename="../gis/db/CDBProject.cpp" line="577"/>
<source>Save ...</source>
<translation>Uložit...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="585"/>
+ <location filename="../gis/db/CDBProject.cpp" line="640"/>
<source>Error</source>
<translation>Chyba</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="585"/>
+ <location filename="../gis/db/CDBProject.cpp" line="640"/>
<source>There was an unexpected database error:
%1</source>
@@ -320,12 +345,12 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
%1</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="700"/>
+ <location filename="../gis/db/CDBProject.cpp" line="755"/>
<source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
<translation>Projekt '%1' se právě bude aktualizovat z databáze. Jsou tu ovšem neuložené změny.</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="701"/>
+ <location filename="../gis/db/CDBProject.cpp" line="756"/>
<source>Save changes?</source>
<translation>Uložit změny?</translation>
</message>
@@ -855,78 +880,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="65"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="66"/>
<source>_Clone</source>
<translation>_Klon</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="283"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="284"/>
<source>track</source>
<translation>Stopa</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="310"/>
+ <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="316"/>
+ <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="322"/>
+ <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="328"/>
+ <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="346"/>
+ <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="350"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
<source>Length: -</source>
<translation>Délka: -</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="357"/>
- <location filename="../gis/rte/CGisItemRte.cpp" line="599"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="600"/>
<source>Time: %1 %2</source>
<translation>Čas: %1 %2</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="361"/>
+ <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="371"/>
+ <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="377"/>
+ <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="379"/>
+ <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="601"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="602"/>
<source>Distance: %1 %2</source>
<translation>Vzdálenost: %1 %2</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="716"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="717"/>
<source>Changed route points.</source>
<translation>Změněné body cesty.</translation>
</message>
@@ -1070,21 +1095,21 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<translation>Pohyb: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1214"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1227"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1283"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1327"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1466"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1223"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1236"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1292"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1336"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1475"/>
<source>track</source>
<translation>Stopa</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1418"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1427"/>
<source>Hide point %1.</source>
<translation>Skrýt bod %1.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1422"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1431"/>
<source>Hide points %1..%2.</source>
<translation>Skrýt body %1 %2.</translation>
</message>
@@ -1180,47 +1205,47 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<translation>Vzdálenost: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1273"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1282"/>
<source>Permanently removed points %1..%2</source>
<translation>Trvale odstraněné body %1 ... %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1451"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1460"/>
<source>Show points.</source>
<translation>Ukázat body.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1985"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
<source>Changed name</source>
<translation>Změněný název</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1991"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
<source>Changed comment</source>
<translation>Změněná poznámka</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1997"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
<source>Changed description</source>
<translation>Změněný popis</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2003"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2012"/>
<source>Changed links</source>
<translation>Změněné odkazy</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2014"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2023"/>
<source>Changed elevation of point %1 to %2 %3</source>
<translation>Výška bodu %1 byla změněna na %2 %3</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2038"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2047"/>
<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="2077"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2086"/>
<source>Changed activity to '%1' for range(%2..%3).</source>
<translation>Činnost byla změněna pro oblast (%2...%3) na '%1'.</translation>
</message>
@@ -1328,62 +1353,62 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<translation>_Klon</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="272"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="275"/>
<source>Elevation: %1 %2</source>
<translation>Výška: %1 %2</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="283"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="286"/>
<source>Proximity: %1 %2</source>
<translation>Blízkost: %1 %2</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="355"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="358"/>
<source>Changed name</source>
<translation>Změněný název</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="365"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="368"/>
<source>Changed position</source>
<translation>Změněná poloha</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="371"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="374"/>
<source>Changed elevation</source>
<translation>Změněná výška</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="377"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="380"/>
<source>Changed proximity</source>
<translation>Změněná blízkost</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="391"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
<source>Changed icon</source>
<translation>Změněná ikona</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="397"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
<source>Changed comment</source>
<translation>Změněná poznámka</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="403"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="406"/>
<source>Changed description</source>
<translation>Změněný popis</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="409"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="412"/>
<source>Changed links</source>
<translation>Změněné odkazy</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="415"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="418"/>
<source>Changed images</source>
<translation>Změněné obrázky</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="421"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="424"/>
<source>Add image</source>
<translation>Přidat obrázek</translation>
</message>
@@ -1391,139 +1416,149 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<context>
<name>CGisListDB</name>
<message>
- <location filename="../gis/CGisListDB.cpp" line="83"/>
+ <location filename="../gis/CGisListDB.cpp" line="84"/>
<source>Due to changes in the database system QMapShack forgot about the filename of your database '%1'. You have to select it again in the next step.</source>
<translation>Na základě změn v databázovém systému QMapShack souborové názvy ve vaší databázi '%1' už nezná. Musíte je v dalším kroku znovu zvolit.</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="84"/>
+ <location filename="../gis/CGisListDB.cpp" line="85"/>
<source>Select database file.</source>
<translation>Vybrat soubor s databází.</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="117"/>
+ <location filename="../gis/CGisListDB.cpp" line="118"/>
<source>Add Database</source>
<translation>Přidat databázi</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="120"/>
+ <location filename="../gis/CGisListDB.cpp" line="121"/>
<source>Add Folder</source>
<translation>Přidat složku</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="121"/>
+ <location filename="../gis/CGisListDB.cpp" line="122"/>
<source>Rename Folder</source>
<translation>Přejmenovat složku</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="122"/>
+ <location filename="../gis/CGisListDB.cpp" line="123"/>
<source>Copy Folder</source>
<translation>Kopírovat složku</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="123"/>
+ <location filename="../gis/CGisListDB.cpp" line="124"/>
<source>Move Folder</source>
<translation>Přesunout složku</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="124"/>
+ <location filename="../gis/CGisListDB.cpp" line="125"/>
<source>Delete Folder</source>
<translation>Smazat složku</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="125"/>
- <source>Export to GPX...</source>
+ <location filename="../gis/CGisListDB.cpp" line="127"/>
+ <source>Import from Files...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gis/CGisListDB.cpp" line="128"/>
- <location filename="../gis/CGisListDB.cpp" line="141"/>
+ <source>Export to GPX...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListDB.cpp" line="131"/>
+ <location filename="../gis/CGisListDB.cpp" line="147"/>
<source>Delete Item</source>
<translation>Smazat prvek</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="132"/>
+ <location filename="../gis/CGisListDB.cpp" line="135"/>
<source>Search Database</source>
<translation>Prohledat databázi</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="133"/>
+ <location filename="../gis/CGisListDB.cpp" line="136"/>
<source>Sync. with Database</source>
<translation>Seřídit s databází</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="134"/>
+ <location filename="../gis/CGisListDB.cpp" line="137"/>
<source>Remove Database</source>
<translation>Odstranit databázi</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="138"/>
+ <location filename="../gis/CGisListDB.cpp" line="144"/>
<source>Empty</source>
<translation>Prázdný</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="437"/>
+ <location filename="../gis/CGisListDB.cpp" line="444"/>
<source>Remove database...</source>
<translation>Odstranit databázi...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="437"/>
+ <location filename="../gis/CGisListDB.cpp" line="444"/>
<source>Do you really want to remove '%1' from the list?</source>
<translation>Opravdu chcete '%1' odstranit ze seznamu?</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="501"/>
+ <location filename="../gis/CGisListDB.cpp" line="508"/>
<source>Are you sure you want to delete selected folders and all subfolders from the database?</source>
<translation>Opravdu chcete smazat vybrané složky a všechny podsložky z databáze?</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="669"/>
+ <location filename="../gis/CGisListDB.cpp" line="676"/>
<source>Bad operation....</source>
<translation>Špatná operace...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="669"/>
+ <location filename="../gis/CGisListDB.cpp" line="676"/>
<source>The target folder is a subfolder of the one to move. This will not work.</source>
<translation>Cílová složka je podsložkou složky k přesunutí. Toto nebude pracovat.</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="728"/>
+ <location filename="../gis/CGisListDB.cpp" line="735"/>
<source>Folder name...</source>
<translation>Název složky...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="728"/>
+ <location filename="../gis/CGisListDB.cpp" line="735"/>
<source>Rename folder:</source>
<translation>Přejmenovat složku:</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="857"/>
+ <location filename="../gis/CGisListDB.cpp" line="864"/>
<source>Are you sure you want to delete '%1' from folder '%2'?</source>
<translation>Jste si jistý, že chcete smazat '%1' ze složky '%2'?</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="858"/>
+ <location filename="../gis/CGisListDB.cpp" line="865"/>
<source>Delete...</source>
<translation>Smazat...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="501"/>
+ <location filename="../gis/CGisListDB.cpp" line="1055"/>
+ <source>Import GIS Data...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListDB.cpp" line="508"/>
<source>Delete database folder...</source>
<translation>Smazat složku s databází...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="749"/>
- <location filename="../gis/CGisListDB.cpp" line="770"/>
+ <location filename="../gis/CGisListDB.cpp" line="756"/>
+ <location filename="../gis/CGisListDB.cpp" line="777"/>
<source>Remove items...</source>
<translation>Odstranit prvky...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="749"/>
+ <location filename="../gis/CGisListDB.cpp" line="756"/>
<source>Are you sure you want to delete all items from Lost&Found? This will remove them permanently.</source>
<translation>Opravdu chcete smazat všechny prvky ze ztracených a nalezených? Tím budou trvale odstraněny.</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="770"/>
+ <location filename="../gis/CGisListDB.cpp" line="777"/>
<source>Are you sure you want to delete all selected items from Lost&Found? This will remove them permanently.</source>
<translation>Opravdu chcete smazat všechny vybrané prvky ze ztracených a nalezených? Tím budou trvale odstraněny.</translation>
</message>
@@ -1531,201 +1566,206 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<context>
<name>CGisListWks</name>
<message>
- <location filename="../gis/CGisListWks.cpp" line="112"/>
+ <location filename="../gis/CGisListWks.cpp" line="114"/>
<source>Save</source>
<translation>Uložit</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="99"/>
+ <location filename="../gis/CGisListWks.cpp" line="101"/>
<source>Edit..</source>
<translation>Upravit...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="121"/>
+ <location filename="../gis/CGisListWks.cpp" line="123"/>
<source>Close</source>
<translation>Zavřít</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="130"/>
+ <location filename="../gis/CGisListWks.cpp" line="132"/>
<source>Update Project on Device</source>
<translation>Aktualizovat projekt na zařízení</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="144"/>
+ <location filename="../gis/CGisListWks.cpp" line="146"/>
<source>Edit...</source>
<translation>Upravit...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="100"/>
- <location filename="../gis/CGisListWks.cpp" line="145"/>
+ <location filename="../gis/CGisListWks.cpp" line="102"/>
+ <location filename="../gis/CGisListWks.cpp" line="147"/>
<source>Copy to...</source>
<translation>Kopírovat do...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="113"/>
+ <location filename="../gis/CGisListWks.cpp" line="115"/>
<source>Save as...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="153"/>
+ <location filename="../gis/CGisListWks.cpp" line="155"/>
<source>Copy Track with Waypoints</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="161"/>
+ <location filename="../gis/CGisListWks.cpp" line="163"/>
<source>Show Bubble</source>
<translation>Ukázat bublinu</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="163"/>
+ <location filename="../gis/CGisListWks.cpp" line="165"/>
<source>Move Waypoint</source>
<translation>Přesunout cestovní bod</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="164"/>
+ <location filename="../gis/CGisListWks.cpp" line="166"/>
<source>Proj. Waypoint...</source>
<translation>Promítnutí cestovního bodu...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="172"/>
+ <location filename="../gis/CGisListWks.cpp" line="174"/>
<source>Route Instructions</source>
<translation>Pokyny pro cestu</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="174"/>
+ <location filename="../gis/CGisListWks.cpp" line="176"/>
<source>Calculate Route</source>
<translation>Spočítat cestu</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="175"/>
+ <location filename="../gis/CGisListWks.cpp" line="177"/>
<source>Reset Route</source>
<translation>Nastavit cestu znovu</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="176"/>
+ <location filename="../gis/CGisListWks.cpp" line="178"/>
<source>Edit Route</source>
<translation>Upravit cestu</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="177"/>
+ <location filename="../gis/CGisListWks.cpp" line="179"/>
<source>Convert to Track</source>
<translation>Převést na stopu</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="193"/>
+ <location filename="../gis/CGisListWks.cpp" line="195"/>
<source>Create Route</source>
<translation>Vytvořit cestu</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="622"/>
+ <location filename="../gis/CGisListWks.cpp" line="196"/>
+ <source>Change Icon (sel. waypt. only)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="627"/>
<source>Drop items...</source>
<translation>Zahodit prvky...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="647"/>
- <location filename="../gis/CGisListWks.cpp" line="1631"/>
- <location filename="../gis/CGisListWks.cpp" line="1669"/>
+ <location filename="../gis/CGisListWks.cpp" line="652"/>
+ <location filename="../gis/CGisListWks.cpp" line="1650"/>
+ <location filename="../gis/CGisListWks.cpp" line="1688"/>
<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="1178"/>
+ <location filename="../gis/CGisListWks.cpp" line="1197"/>
<source>Delete project...</source>
<translation>Smazat projekt...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1178"/>
+ <location filename="../gis/CGisListWks.cpp" line="1197"/>
<source>Do you really want to delete %1?</source>
<translation>Opravdu chcete smazat %1?</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="147"/>
+ <location filename="../gis/CGisListWks.cpp" line="149"/>
<source>Track Profile</source>
<translation>Profil stopy</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="101"/>
+ <location filename="../gis/CGisListWks.cpp" line="103"/>
<source>Show on Map</source>
<translation>Ukázat na mapě</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="102"/>
+ <location filename="../gis/CGisListWks.cpp" line="104"/>
<source>Hide from Map</source>
<translation>Skrýt v mapě</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="108"/>
+ <location filename="../gis/CGisListWks.cpp" line="110"/>
<source>Sort by Time</source>
<translation>Třídit podle času</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="109"/>
+ <location filename="../gis/CGisListWks.cpp" line="111"/>
<source>Sort by Name</source>
<translation>Třídit podle názvu</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="114"/>
+ <location filename="../gis/CGisListWks.cpp" line="116"/>
<source>Save as GPX 1.1 w/o ext...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="117"/>
+ <location filename="../gis/CGisListWks.cpp" line="119"/>
<source>Send to Devices</source>
<translation>Poslat do zařízení</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="118"/>
+ <location filename="../gis/CGisListWks.cpp" line="120"/>
<source>Sync. with Database</source>
<translation>Seřídit s databází</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="149"/>
+ <location filename="../gis/CGisListWks.cpp" line="151"/>
<source>Select Range</source>
<translation>Vybrat rozsah</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="150"/>
+ <location filename="../gis/CGisListWks.cpp" line="152"/>
<source>Edit Track Points</source>
<translation>Upravit body stopy</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="151"/>
+ <location filename="../gis/CGisListWks.cpp" line="153"/>
<source>Reverse Track</source>
<translation>Obrátit stopu</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="152"/>
+ <location filename="../gis/CGisListWks.cpp" line="154"/>
<source>Combine Tracks</source>
<translation>Spojit stopy</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="186"/>
+ <location filename="../gis/CGisListWks.cpp" line="188"/>
<source>Edit Area Points</source>
<translation>Upravit body oblasti</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="132"/>
- <location filename="../gis/CGisListWks.cpp" line="155"/>
+ <location filename="../gis/CGisListWks.cpp" line="134"/>
+ <location filename="../gis/CGisListWks.cpp" line="157"/>
<source>Delete</source>
<translation>Smazat</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="773"/>
+ <location filename="../gis/CGisListWks.cpp" line="778"/>
<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="819"/>
+ <location filename="../gis/CGisListWks.cpp" line="824"/>
<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="1155"/>
+ <location filename="../gis/CGisListWks.cpp" line="1174"/>
<source>Close all projects...</source>
<translation>Zavřít všechny projekty...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1155"/>
+ <location filename="../gis/CGisListWks.cpp" line="1174"/>
<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>
@@ -1733,27 +1773,27 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<context>
<name>CGisWidget</name>
<message>
- <location filename="../gis/CGisWidget.cpp" line="139"/>
+ <location filename="../gis/CGisWidget.cpp" line="110"/>
<source>Load project...</source>
<translation>Nahrát projekt...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="139"/>
+ <location filename="../gis/CGisWidget.cpp" line="110"/>
<source>The project "%1" is already in the workspace.</source>
<translation>Projekt "%1" je již náhrán do pracovního prostoru.</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="544"/>
+ <location filename="../gis/CGisWidget.cpp" line="515"/>
<source>Copy items...</source>
<translation>Kopírovat prvky...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="672"/>
+ <location filename="../gis/CGisWidget.cpp" line="664"/>
<source>Cut Track...</source>
<translation>Rozkrojit stopu...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="672"/>
+ <location filename="../gis/CGisWidget.cpp" line="664"/>
<source>Do you want to delete the original track?</source>
<translation>Opravdu chcete smazat původní stopu?</translation>
</message>
@@ -1940,48 +1980,48 @@ line %2, column %3:
<context>
<name>CMainWindow</name>
<message>
- <location filename="../CMainWindow.cpp" line="562"/>
+ <location filename="../CMainWindow.cpp" line="588"/>
<source>Use <b>Menu->View->Add Map View</b> to open a new view. Or <b>Menu->File->Load Map View</b> to restore a saved one. Or click <a href='newview'>here</a>.</source>
<translation>Použít <b>Nabídka → Pohled → Přidat pohled na mapu</b> k otevření nového pohledu. Nebo <b>Nabídka → Soubor → Nahrát pohled na mapu</b> k obnovení uložené. Nebo klepněte <a href='newview'>sem</a>.</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="690"/>
+ <location filename="../CMainWindow.cpp" line="716"/>
<source>Ele: %1%2</source>
<translation>Výška: %1%2</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="706"/>
+ <location filename="../CMainWindow.cpp" line="732"/>
<source>[Grid: %1]</source>
<translation>[Mřížka: %1]</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="841"/>
+ <location filename="../CMainWindow.cpp" line="867"/>
<source>Load GIS Data...</source>
<translation>Nahrát data GIS...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="875"/>
+ <location filename="../CMainWindow.cpp" line="901"/>
<source>Select output file</source>
<translation>Vybrat výstupní soubor</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="875"/>
<location filename="../CMainWindow.cpp" line="901"/>
+ <location filename="../CMainWindow.cpp" line="927"/>
<source>QMapShack View (*.view)</source>
<translation>Pohled QMapShack (*.view)</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="901"/>
+ <location filename="../CMainWindow.cpp" line="927"/>
<source>Select file to load</source>
<translation>Vybrat soubor k nahrání</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1080"/>
+ <location filename="../CMainWindow.cpp" line="1106"/>
<source>Fatal...</source>
<translation>Kritické...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1081"/>
+ <location filename="../CMainWindow.cpp" line="1107"/>
<source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your distribution to fix it.</source>
<translation type="unfinished"></translation>
</message>
@@ -1989,7 +2029,7 @@ line %2, column %3:
<context>
<name>CMapDraw</name>
<message>
- <location filename="../map/CMapDraw.cpp" line="420"/>
+ <location filename="../map/CMapDraw.cpp" line="457"/>
<source>There are no maps right now. QMapShack is no fun without maps. You can install maps by pressing the 'Help! I want maps!' button in the 'Maps' dock window. Or you can press the F1 key to open the online documentation that tells you how to use QMapShack.
If it's no fun, why don't you provide maps? Well to host maps ready for download and installation requires a good server. And this is not a free service. The project lacks the money. Additionally map and DEM data has a copyright. Therefore the copyright holder has to be asked prior to package the data. This is not that easy as it might sound and for some data you have to pay royalties. The project simply lacks resources to do this. And we think installing the stuff yourself is [...]
@@ -1999,625 +2039,625 @@ If it's no fun, why don't you provide maps? Well to host maps ready fo
<context>
<name>CMapIMG</name>
<message>
- <location filename="../map/CMapIMG.cpp" line="145"/>
+ <location filename="../map/CMapIMG.cpp" line="146"/>
<source>Failed ...</source>
<translation>Nepodařilo se...</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="156"/>
+ <location filename="../map/CMapIMG.cpp" line="157"/>
<source>Unspecified</source>
<translation>Neurčeno</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="157"/>
+ <location filename="../map/CMapIMG.cpp" line="158"/>
<source>French</source>
<translation>Francouzský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="158"/>
+ <location filename="../map/CMapIMG.cpp" line="159"/>
<source>German</source>
<translation>Německý</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="159"/>
+ <location filename="../map/CMapIMG.cpp" line="160"/>
<source>Dutch</source>
<translation>Holandský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="160"/>
+ <location filename="../map/CMapIMG.cpp" line="161"/>
<source>English</source>
<translation>Anglický</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="161"/>
+ <location filename="../map/CMapIMG.cpp" line="162"/>
<source>Italian</source>
<translation>Italský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="162"/>
+ <location filename="../map/CMapIMG.cpp" line="163"/>
<source>Finnish</source>
<translation>Finský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="163"/>
+ <location filename="../map/CMapIMG.cpp" line="164"/>
<source>Swedish</source>
<translation>Švédský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="164"/>
+ <location filename="../map/CMapIMG.cpp" line="165"/>
<source>Spanish</source>
<translation>Španělský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="165"/>
+ <location filename="../map/CMapIMG.cpp" line="166"/>
<source>Basque</source>
<translation>Baskický</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="166"/>
+ <location filename="../map/CMapIMG.cpp" line="167"/>
<source>Catalan</source>
<translation>Katalánský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="167"/>
+ <location filename="../map/CMapIMG.cpp" line="168"/>
<source>Galician</source>
<translation>Galicijský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="168"/>
+ <location filename="../map/CMapIMG.cpp" line="169"/>
<source>Welsh</source>
<translation>Velšský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="169"/>
+ <location filename="../map/CMapIMG.cpp" line="170"/>
<source>Gaelic</source>
<translation>Gaelský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="170"/>
+ <location filename="../map/CMapIMG.cpp" line="171"/>
<source>Danish</source>
<translation>Dánský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="171"/>
+ <location filename="../map/CMapIMG.cpp" line="172"/>
<source>Norwegian</source>
<translation>Norský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="172"/>
+ <location filename="../map/CMapIMG.cpp" line="173"/>
<source>Portuguese</source>
<translation>Portugalský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="173"/>
+ <location filename="../map/CMapIMG.cpp" line="174"/>
<source>Slovak</source>
<translation>Slovenský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="174"/>
+ <location filename="../map/CMapIMG.cpp" line="175"/>
<source>Czech</source>
<translation>Český</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="175"/>
+ <location filename="../map/CMapIMG.cpp" line="176"/>
<source>Croatian</source>
<translation>Chorvatský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="176"/>
+ <location filename="../map/CMapIMG.cpp" line="177"/>
<source>Hungarian</source>
<translation>Maďarský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="177"/>
+ <location filename="../map/CMapIMG.cpp" line="178"/>
<source>Polish</source>
<translation>Polský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="178"/>
+ <location filename="../map/CMapIMG.cpp" line="179"/>
<source>Turkish</source>
<translation>Turecký</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="179"/>
+ <location filename="../map/CMapIMG.cpp" line="180"/>
<source>Greek</source>
<translation>Řecký</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="180"/>
+ <location filename="../map/CMapIMG.cpp" line="181"/>
<source>Slovenian</source>
<translation>Slovinský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="181"/>
+ <location filename="../map/CMapIMG.cpp" line="182"/>
<source>Russian</source>
<translation>Ruský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="182"/>
+ <location filename="../map/CMapIMG.cpp" line="183"/>
<source>Estonian</source>
<translation>Estonský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="183"/>
+ <location filename="../map/CMapIMG.cpp" line="184"/>
<source>Latvian</source>
<translation>Lotyšský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="184"/>
+ <location filename="../map/CMapIMG.cpp" line="185"/>
<source>Romanian</source>
<translation>Rumunský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="185"/>
+ <location filename="../map/CMapIMG.cpp" line="186"/>
<source>Albanian</source>
<translation>Albánský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="186"/>
+ <location filename="../map/CMapIMG.cpp" line="187"/>
<source>Bosnian</source>
<translation>Bosenský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="187"/>
+ <location filename="../map/CMapIMG.cpp" line="188"/>
<source>Lithuanian</source>
<translation>Litevský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="188"/>
+ <location filename="../map/CMapIMG.cpp" line="189"/>
<source>Serbian</source>
<translation>Srbský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="189"/>
+ <location filename="../map/CMapIMG.cpp" line="190"/>
<source>Macedonian</source>
<translation>Makedonský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="190"/>
+ <location filename="../map/CMapIMG.cpp" line="191"/>
<source>Bulgarian</source>
<translation>Bulharský</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="247"/>
+ <location filename="../map/CMapIMG.cpp" line="248"/>
<source>Major highway</source>
<translation>Dálnice</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="248"/>
+ <location filename="../map/CMapIMG.cpp" line="249"/>
<source>Principal highway</source>
<translation>Silnice první třídy</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="249"/>
+ <location filename="../map/CMapIMG.cpp" line="250"/>
<source>Other highway</source>
<translation>Jiné rychlostní silnice</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="250"/>
+ <location filename="../map/CMapIMG.cpp" line="251"/>
<source>Arterial road</source>
<translation>Rychlostní silnice</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="251"/>
+ <location filename="../map/CMapIMG.cpp" line="252"/>
<source>Collector road</source>
<translation>Státní silnice</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="252"/>
+ <location filename="../map/CMapIMG.cpp" line="253"/>
<source>Residential street</source>
<translation>Silnice v obytné oblasti</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="253"/>
+ <location filename="../map/CMapIMG.cpp" line="254"/>
<source>Alley/Private road</source>
<translation>Soukromá cesta</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="254"/>
+ <location filename="../map/CMapIMG.cpp" line="255"/>
<source>Highway ramp, low speed</source>
<translation>Nájezd na dálnici/sjezd z dálnice</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="255"/>
+ <location filename="../map/CMapIMG.cpp" line="256"/>
<source>Highway ramp, high speed</source>
<translation>Nájezd na dálnici/sjezd z dálnice</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="256"/>
+ <location filename="../map/CMapIMG.cpp" line="257"/>
<source>Unpaved road</source>
<translation>Neasfaltovaná cesta</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="257"/>
+ <location filename="../map/CMapIMG.cpp" line="258"/>
<source>Major highway connector</source>
<translation>Dalniční přivaděč</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="258"/>
+ <location filename="../map/CMapIMG.cpp" line="259"/>
<source>Roundabout</source>
<translation>Kruhový objezd</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="259"/>
+ <location filename="../map/CMapIMG.cpp" line="260"/>
<source>Railroad</source>
<translation>Železnice, koleje</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="260"/>
+ <location filename="../map/CMapIMG.cpp" line="261"/>
<source>Shoreline</source>
<translation>Břeh</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="261"/>
+ <location filename="../map/CMapIMG.cpp" line="262"/>
<source>Trail</source>
<translation>Cesta</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="262"/>
+ <location filename="../map/CMapIMG.cpp" line="263"/>
<source>Stream</source>
<translation>Proud</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="263"/>
+ <location filename="../map/CMapIMG.cpp" line="264"/>
<source>Time zone</source>
<translation>Časové pásmo</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="264"/>
<location filename="../map/CMapIMG.cpp" line="265"/>
+ <location filename="../map/CMapIMG.cpp" line="266"/>
<source>Ferry</source>
<translation>Přívoz</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="266"/>
+ <location filename="../map/CMapIMG.cpp" line="267"/>
<source>State/province border</source>
<translation>Státní/Zemská hranice</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="267"/>
+ <location filename="../map/CMapIMG.cpp" line="268"/>
<source>County/parish border</source>
<translation>Krajská/Obecní hranice</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="268"/>
+ <location filename="../map/CMapIMG.cpp" line="269"/>
<source>International border</source>
<translation>Mezinárodní hranice</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="269"/>
+ <location filename="../map/CMapIMG.cpp" line="270"/>
<source>River</source>
<translation>Řeka</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="270"/>
+ <location filename="../map/CMapIMG.cpp" line="271"/>
<source>Minor land contour</source>
<translation>Malá vrstevnice</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="271"/>
+ <location filename="../map/CMapIMG.cpp" line="272"/>
<source>Intermediate land contour</source>
<translation>Střední vrstevnice</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="272"/>
+ <location filename="../map/CMapIMG.cpp" line="273"/>
<source>Major land contour</source>
<translation>Velká vrstevnice</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="273"/>
+ <location filename="../map/CMapIMG.cpp" line="274"/>
<source>Minor depth contour</source>
<translation>Malá hloubková čára</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="274"/>
+ <location filename="../map/CMapIMG.cpp" line="275"/>
<source>Intermediate depth contour</source>
<translation>Střední hloubková čára</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="275"/>
+ <location filename="../map/CMapIMG.cpp" line="276"/>
<source>Major depth contour</source>
<translation>Velká hloubková čára</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="276"/>
+ <location filename="../map/CMapIMG.cpp" line="277"/>
<source>Intermittent stream</source>
<translation>Přerušovaný potok (Wadi)</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="277"/>
- <location filename="../map/CMapIMG.cpp" line="359"/>
+ <location filename="../map/CMapIMG.cpp" line="278"/>
+ <location filename="../map/CMapIMG.cpp" line="360"/>
<source>Airport runway</source>
<translation>Přistávací dráha</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="278"/>
+ <location filename="../map/CMapIMG.cpp" line="279"/>
<source>Pipeline</source>
<translation>Dálkové potrubí</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="279"/>
+ <location filename="../map/CMapIMG.cpp" line="280"/>
<source>Powerline</source>
<translation>Elektrické vedení</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="280"/>
+ <location filename="../map/CMapIMG.cpp" line="281"/>
<source>Marine boundary</source>
<translation>Hranice moře</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="281"/>
+ <location filename="../map/CMapIMG.cpp" line="282"/>
<source>Hazard boundary</source>
<translation>Nebezpečná hranice</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="346"/>
+ <location filename="../map/CMapIMG.cpp" line="347"/>
<source>Large urban area (>200K)</source>
<translation>Velkoměstská oblast (>200 000)</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="347"/>
+ <location filename="../map/CMapIMG.cpp" line="348"/>
<source>Small urban area (<200K)</source>
<translation>Maloměstská oblast (>200 000)</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="348"/>
+ <location filename="../map/CMapIMG.cpp" line="349"/>
<source>Rural housing area</source>
<translation>Městská obytná oblast</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="349"/>
+ <location filename="../map/CMapIMG.cpp" line="350"/>
<source>Military base</source>
<translation>Vojenská základna</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="350"/>
+ <location filename="../map/CMapIMG.cpp" line="351"/>
<source>Parking lot</source>
<translation>Parkoviště</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="351"/>
+ <location filename="../map/CMapIMG.cpp" line="352"/>
<source>Parking garage</source>
<translation>Parkovací budova</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="352"/>
+ <location filename="../map/CMapIMG.cpp" line="353"/>
<source>Airport</source>
<translation>Letiště</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="353"/>
+ <location filename="../map/CMapIMG.cpp" line="354"/>
<source>Shopping center</source>
<translation>Nákupní středisko</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="354"/>
+ <location filename="../map/CMapIMG.cpp" line="355"/>
<source>Marina</source>
<translation>Přístav</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="355"/>
+ <location filename="../map/CMapIMG.cpp" line="356"/>
<source>University/College</source>
<translation>Univerzita/Vysoká škola</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="356"/>
+ <location filename="../map/CMapIMG.cpp" line="357"/>
<source>Hospital</source>
<translation>Nemocnice</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="357"/>
+ <location filename="../map/CMapIMG.cpp" line="358"/>
<source>Industrial complex</source>
<translation>Průmyslový celek</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="358"/>
+ <location filename="../map/CMapIMG.cpp" line="359"/>
<source>Reservation</source>
<translation>Chráněné území</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="360"/>
+ <location filename="../map/CMapIMG.cpp" line="361"/>
<source>Man-made area</source>
<translation>Zástavba</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="361"/>
+ <location filename="../map/CMapIMG.cpp" line="362"/>
<source>Sports complex</source>
<translation>Oblast pro tělesné činnosti</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="362"/>
+ <location filename="../map/CMapIMG.cpp" line="363"/>
<source>Golf course</source>
<translation>Golfové hřiště</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="363"/>
+ <location filename="../map/CMapIMG.cpp" line="364"/>
<source>Cemetery</source>
<translation>Hřbitov</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="364"/>
<location filename="../map/CMapIMG.cpp" line="365"/>
<location filename="../map/CMapIMG.cpp" line="366"/>
+ <location filename="../map/CMapIMG.cpp" line="367"/>
<source>National park</source>
<translation>Národní park</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="367"/>
+ <location filename="../map/CMapIMG.cpp" line="368"/>
<source>City park</source>
<translation>Městské sady</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="368"/>
<location filename="../map/CMapIMG.cpp" line="369"/>
<location filename="../map/CMapIMG.cpp" line="370"/>
+ <location filename="../map/CMapIMG.cpp" line="371"/>
<source>State park</source>
<translation>Státní park</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="371"/>
+ <location filename="../map/CMapIMG.cpp" line="372"/>
<source>Forest</source>
<translation>Les</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="372"/>
+ <location filename="../map/CMapIMG.cpp" line="373"/>
<source>Ocean</source>
<translation>Oceán</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="373"/>
- <location filename="../map/CMapIMG.cpp" line="375"/>
- <location filename="../map/CMapIMG.cpp" line="385"/>
+ <location filename="../map/CMapIMG.cpp" line="374"/>
+ <location filename="../map/CMapIMG.cpp" line="376"/>
+ <location filename="../map/CMapIMG.cpp" line="386"/>
<source>Blue (unknown)</source>
<translation>Modrá (neznámé)</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="374"/>
+ <location filename="../map/CMapIMG.cpp" line="375"/>
<source>Sea</source>
<translation>Moře</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="376"/>
<location filename="../map/CMapIMG.cpp" line="377"/>
- <location filename="../map/CMapIMG.cpp" line="384"/>
+ <location filename="../map/CMapIMG.cpp" line="378"/>
+ <location filename="../map/CMapIMG.cpp" line="385"/>
<source>Large lake</source>
<translation>Velké jezero</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="378"/>
<location filename="../map/CMapIMG.cpp" line="379"/>
+ <location filename="../map/CMapIMG.cpp" line="380"/>
<source>Medium lake</source>
<translation>Střední jezero</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="380"/>
<location filename="../map/CMapIMG.cpp" line="381"/>
+ <location filename="../map/CMapIMG.cpp" line="382"/>
<source>Small lake</source>
<translation>Malé jezero</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="382"/>
<location filename="../map/CMapIMG.cpp" line="383"/>
+ <location filename="../map/CMapIMG.cpp" line="384"/>
<source>Major lake</source>
<translation>Velmi velké jezero</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="386"/>
+ <location filename="../map/CMapIMG.cpp" line="387"/>
<source>Major River</source>
<translation>Veletok</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="387"/>
+ <location filename="../map/CMapIMG.cpp" line="388"/>
<source>Large River</source>
<translation>Velká řeka</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="388"/>
+ <location filename="../map/CMapIMG.cpp" line="389"/>
<source>Medium River</source>
<translation>Střední řeka</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="389"/>
+ <location filename="../map/CMapIMG.cpp" line="390"/>
<source>Small River</source>
<translation>Malá řeka</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="392"/>
+ <location filename="../map/CMapIMG.cpp" line="393"/>
<source>Intermittent water</source>
<translation>Přerušovaná voda</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="393"/>
+ <location filename="../map/CMapIMG.cpp" line="394"/>
<source>Wetland/Swamp</source>
<translation>Močál/Bažina</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="394"/>
+ <location filename="../map/CMapIMG.cpp" line="395"/>
<source>Glacier</source>
<translation>Ledovec</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="395"/>
+ <location filename="../map/CMapIMG.cpp" line="396"/>
<source>Orchard/Plantation</source>
<translation>Sad/Plantáž</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="396"/>
+ <location filename="../map/CMapIMG.cpp" line="397"/>
<source>Scrub</source>
<translation>Křoví</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="397"/>
+ <location filename="../map/CMapIMG.cpp" line="398"/>
<source>Tundra</source>
<translation>Tundra</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="398"/>
+ <location filename="../map/CMapIMG.cpp" line="399"/>
<source>Flat</source>
<translation>Rovina</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="399"/>
+ <location filename="../map/CMapIMG.cpp" line="400"/>
<source>???</source>
<translation>???</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="435"/>
+ <location filename="../map/CMapIMG.cpp" line="436"/>
<source>Failed to read: </source>
<translation>Nepodařilo se přečíst: </translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="478"/>
+ <location filename="../map/CMapIMG.cpp" line="479"/>
<source>Failed to open: </source>
<translation>Nepodařilo se otevřít: </translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="502"/>
- <location filename="../map/CMapIMG.cpp" line="506"/>
+ <location filename="../map/CMapIMG.cpp" line="503"/>
+ <location filename="../map/CMapIMG.cpp" line="507"/>
<source>Bad file format: </source>
<translation>Špatný formát souboru: </translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="595"/>
+ <location filename="../map/CMapIMG.cpp" line="596"/>
<source>Failed to read file structure: </source>
<translation>Nepodařilo se přečíst stavbu souboru: </translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="630"/>
+ <location filename="../map/CMapIMG.cpp" line="631"/>
<source>Loading %1</source>
<translation>Nahrává se %1</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="636"/>
+ <location filename="../map/CMapIMG.cpp" line="637"/>
<source>User abort: </source>
<translation>Zrušeno uživatelem: </translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="639"/>
+ <location filename="../map/CMapIMG.cpp" line="640"/>
<source>File is NT format. QMapShack is unable to read map files with NT format: </source>
<translation>Soubor je ve formátu NT. QMapShack nedokáže číst mapové soubory ve formátu NT: </translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="730"/>
+ <location filename="../map/CMapIMG.cpp" line="731"/>
<source>File contains locked / encrypted data. Garmin does not want you to use this file with any other software than the one supplied by Garmin.</source>
<translation>Soubor obsahuje zamknutá/zašifrovaná data. Garmin nechce, aby byl tento soubor použit s jiným programem než dodaným Garminem.</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2305"/>
- <location filename="../map/CMapIMG.cpp" line="2311"/>
- <location filename="../map/CMapIMG.cpp" line="2315"/>
+ <location filename="../map/CMapIMG.cpp" line="2342"/>
+ <location filename="../map/CMapIMG.cpp" line="2348"/>
+ <location filename="../map/CMapIMG.cpp" line="2352"/>
<source>Point of Interest</source>
<translation>Podivuhodnost</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2401"/>
+ <location filename="../map/CMapIMG.cpp" line="2438"/>
<source>Unknown</source>
<translation>Neznámý</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2443"/>
- <location filename="../map/CMapIMG.cpp" line="2451"/>
- <location filename="../map/CMapIMG.cpp" line="2458"/>
+ <location filename="../map/CMapIMG.cpp" line="2480"/>
+ <location filename="../map/CMapIMG.cpp" line="2488"/>
+ <location filename="../map/CMapIMG.cpp" line="2495"/>
<source>Area</source>
<translation>Oblast</translation>
</message>
@@ -2764,7 +2804,7 @@ line %2, column %3:
<location filename="../map/CMapVRT.cpp" line="45"/>
<location filename="../map/CMapVRT.cpp" line="59"/>
<location filename="../map/CMapVRT.cpp" line="88"/>
- <location filename="../map/CMapVRT.cpp" line="126"/>
+ <location filename="../map/CMapVRT.cpp" line="133"/>
<source>Error...</source>
<translation>Chyba...</translation>
</message>
@@ -2781,7 +2821,7 @@ line %2, column %3:
<translation>Soubor musí mít 8 bitovou barevnou paletu nebo být v odstínech šedi.</translation>
</message>
<message>
- <location filename="../map/CMapVRT.cpp" line="126"/>
+ <location filename="../map/CMapVRT.cpp" line="133"/>
<source>No georeference information found.</source>
<translation>Nenalezeny žádné údaje o vyjádření prostorových vztahů.</translation>
</message>
@@ -2789,22 +2829,22 @@ line %2, column %3:
<context>
<name>CMapVrtBuilder</name>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="28"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="29"/>
<source>Build GDAL VRT</source>
<translation>Sestavit GDAL VRT</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="46"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="47"/>
<source>Select files...</source>
<translation>Vybrat soubory...</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="70"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="71"/>
<source>Select target file...</source>
<translation>Vybrat cílový soubor...</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="114"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="115"/>
<source>!!! done !!!
</source>
<translation>Hotovo!</translation>
@@ -2935,36 +2975,41 @@ Neznámá stavba.</translation>
<name>CMouseNormal</name>
<message>
<location filename="../mouse/CMouseNormal.cpp" line="39"/>
+ <source>Add POI as Waypoint</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mouse/CMouseNormal.cpp" line="40"/>
<source>Add Waypoint</source>
<translation>Přidat cestovní bod</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="40"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="41"/>
<source>Add Track</source>
<translation>Přidat stopu</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="41"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="42"/>
<source>Add Route</source>
<translation>Přidat cestu</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="42"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="43"/>
<source>Add Area</source>
<translation>Přidat oblast</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="44"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="45"/>
<source>Select Items On Map</source>
<translation>Vybrat prvky na mapě</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="46"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="47"/>
<source>Copy position</source>
<translation>Kopírovat polohu</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="47"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="48"/>
<source>Copy position (Grid)</source>
<translation>Kopírovat polohu (mřížka)</translation>
</message>
@@ -2980,7 +3025,7 @@ Neznámá stavba.</translation>
<context>
<name>CMouseRangeTrk</name>
<message>
- <location filename="../mouse/CMouseRangeTrk.cpp" line="227"/>
+ <location filename="../mouse/CMouseRangeTrk.cpp" line="224"/>
<source><b>Select Range</b><br/>Select first track point with left mouse button. And then a second one. Leave range selection with a click of the right mouse button.<br/></source>
<translation type="unfinished"></translation>
</message>
@@ -2988,32 +3033,32 @@ Neznámá stavba.</translation>
<context>
<name>CMouseSelect</name>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="31"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="32"/>
<source><b>Select Items On Map</b><br/>Select a rectangular area on the map. Use the left mouse button and move the mouse. Abort with a right click. Adjust the selection by point-click-move on the corners.</source>
<translation><b>Vybrat prvky na mapě</b><br/>Vyberte na mapě klepnutím levým tlačítkem myši obdélníkovou oblast. Výběr zrušíte klepnutím pravým tlačítkem myši. Výběr lze upravit posunutím rohových bodů myší.</translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="96"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="98"/>
<source><b>Selected:</b><br/></source>
<translation><b>Vybráno:</b><br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="104"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="106"/>
<source>%1 waypoints<br/></source>
<translation>%1 cestovní body<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="99"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="101"/>
<source>%1 tracks<br/></source>
<translation>%1 stopy<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="109"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="111"/>
<source>%1 routes<br/></source>
<translation>%1 cesty<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="114"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="116"/>
<source>%1 areas<br/></source>
<translation>%1 oblasti<br/></translation>
</message>
@@ -3106,7 +3151,7 @@ y: %4 m/px</translation>
<translation>Uplynulý čas: %1</translation>
</message>
<message>
- <location filename="../helpers/CProgressDialog.cpp" line="82"/>
+ <location filename="../helpers/CProgressDialog.cpp" line="86"/>
<source>Elapsed time: %1 seconds.</source>
<translation>Uplynulý čas: %1 sekund.</translation>
</message>
@@ -3337,6 +3382,458 @@ není platným vymezením soustavy souřadnic
</message>
</context>
<context>
+ <name>CRouterBRouter</name>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="49"/>
+ <source>original</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="50"/>
+ <source>first alternative</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="51"/>
+ <source>second alternative</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="52"/>
+ <source>third alternative</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="147"/>
+ <source>BRouter (offline)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="152"/>
+ <source>BRouter (online)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="180"/>
+ <source>profile: %1, alternative: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="267"/>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="381"/>
+ <source>response is empty</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="304"/>
+ <source>Bad response from server: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="352"/>
+ <source><b>BRouter</b><br/>Routing request sent to server. Please wait...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="246"/>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="355"/>
+ <source>Calculate route with %1</source>
+ <translation type="unfinished">Spočítat cestu s %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="415"/>
+ <source><b>BRouter</b><br/>Bad response from server:<br/>%1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="405"/>
+ <source><br/>Calculation time: %1s</source>
+ <translation type="unfinished"><br/>Doba výpočtu: %1 s</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="509"/>
+ <source>Error</source>
+ <translation type="unfinished">Chyba</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="561"/>
+ <source>running</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="553"/>
+ <source>starting</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="515"/>
+ <source>QMapShack communicates with BRouter via a network connection. Usually this is done on a special address that can't be reached from outside your device. However BRouter listens for connections on all available interfaces. If you are in your own private network with an active firewall, this is not much of a problem. If you are in a public network every open port is a risk as it can be used by someone else to compromise your system. We do not recommend to use the local [...]
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="542"/>
+ <source>Warning...</source>
+ <translation type="unfinished">Varování...</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="547"/>
+ <source>I understand the risk. Don't tell me again.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="568"/>
+ <source>stopped</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="579"/>
+ <source>not installed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="590"/>
+ <source>online</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterSetup</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="479"/>
+ <source>%1 not accessible</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="489"/>
+ <source>%1 invalid result</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="533"/>
+ <source>Error parsing online-config:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="538"/>
+ <source>Network error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterSetupWizard</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="38"/>
+ <source>Restore Default Values</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="371"/>
+ <source>Open Directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="378"/>
+ <source>select Java Executable</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="414"/>
+ <source>please select BRouter installation directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="419"/>
+ <source>selected directory does not exist</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="420"/>
+ <source>create directory and install BRouter there</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="427"/>
+ <source>existing BRouter installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="428"/>
+ <source>update existing BRouter installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="433"/>
+ <source>empty directory, create new BRouter installation here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="434"/>
+ <source>create new BRouter installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="442"/>
+ <source>seems to be a valid Java-executable</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="446"/>
+ <source>doesn't seem to be a valid Java-executable</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="451"/>
+ <source>Java Executable not found</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="496"/>
+ <source>Error loading installation-page at %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="505"/>
+ <source>no brouter-version to install selected</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="513"/>
+ <source>selected %1 for download and installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="524"/>
+ <source>Warning...</source>
+ <translation type="unfinished">Varování...</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="529"/>
+ <source>Download: %1<br/><br/>This will download and install a zip file from a download location that is not secured by any standard at all, using plain HTTP. Usually this should be HTTPS. The risk is someone redirecting the request and sending you a replacement zip with malware. There is no way for QMapShack to detect this. <br/>If you do not understand this or if you are in doubt, do not proceed and abort. Use the Web version of BRouter instead.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="541"/>
+ <source>I understand the risk and wish to proceed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="553"/>
+ <source>download %1 started</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="565"/>
+ <source>Network Error: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="586"/>
+ <source>download %1 finished</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="588"/>
+ <source>unzipping:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="593"/>
+ <source>ready.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="613"/>
+ <source>download of brouter failed: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="623"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="630"/>
+ <source>retrieving available profiles from %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="654"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="736"/>
+ <source>content of profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="729"/>
+ <source>Error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="466"/>
+ <source>Error creating directory %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="571"/>
+ <source>Error directory %1 does not exist</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="578"/>
+ <source>Error creating file %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="582"/>
+ <source>Error writing to file %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterTilesPage</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesPage.cpp" line="82"/>
+ <source>Continue with Setup</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterTilesSelect</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="98"/>
+ <source>available routing-data is being determined.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="108"/>
+ <source>Select outdated</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="109"/>
+ <source>Clear Selection</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="110"/>
+ <source>Delete selection</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="111"/>
+ <source>Download</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="281"/>
+ <source>Error creating segments directory %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="365"/>
+ <source>cannot parse: %1 is not a date</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="390"/>
+ <source>cannot parse: %1 is not a valid size</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="409"/>
+ <source>Error retrieving available routing data from %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="490"/>
+ <source>segments directory does not exist: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="504"/>
+ <source>error creating file %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="536"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="576"/>
+ <source>no valid request for filename %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="541"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="584"/>
+ <source>no open file assigned to request for %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="551"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="594"/>
+ <source>error writing to file %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="602"/>
+ <source>error renaming file %1 to %2: %3</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="685"/>
+ <source>up-to-date: %1 (%2), outdated: %3 (%4), to be downloaded: %5 (%6)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="783"/>
+ <source>being downloaded: %1 of %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="803"/>
+ <source>no local data, online available: %1 (%2)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="789"/>
+ <source>local data outdated (%1, %2 - remote %3, %4)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="190"/>
+ <source>Error removing %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="321"/>
+ <source>Network Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="330"/>
+ <source>invalid result, no files found</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="797"/>
+ <source>local data up to date (%1, %2)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="809"/>
+ <source>no routing-data available</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterToolShell</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="74"/>
+ <source>!!! done !!!
+</source>
+ <translation type="unfinished">Hotovo!</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="79"/>
+ <source>!!! failed !!!
+</source>
+ <translation type="unfinished">Nepodařilo se!</translation>
+ </message>
+</context>
+<context>
<name>CRouterMapQuest</name>
<message>
<location filename="../gis/rte/router/CRouterMapQuest.cpp" line="37"/>
@@ -3659,7 +4156,6 @@ není platným vymezením soustavy souřadnic
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="55"/>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="238"/>
<source>Warning...</source>
<translation>Varování...</translation>
</message>
@@ -3669,18 +4165,13 @@ není platným vymezením soustavy souřadnic
<translation>V databázi cest není žádná hlavní silnice poblíž souřadnic k umístění cestovního bodu.</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="238"/>
- <source>%1: Due to limitations in the Windows POSIX API Routino can't handle files larger than 4GB.</source>
- <translation>%1: Kvůli omezením Windows POSIX API Routino nedokáže zpracovat soubory větší než 4 GB.</translation>
- </message>
- <message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="338"/>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="425"/>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="332"/>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="419"/>
<source>Calculate route with %1</source>
<translation>Spočítat cestu s %1</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="346"/>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="340"/>
<source><br/>Calculation time: %1s</source>
<translation><br/>Doba výpočtu: %1 s</translation>
</message>
@@ -3688,12 +4179,12 @@ není platným vymezením soustavy souřadnic
<context>
<name>CRouterRoutinoPathSetup</name>
<message>
- <location filename="../gis/rte/router/CRouterRoutinoPathSetup.cpp" line="40"/>
+ <location filename="../gis/rte/router/routino/CRouterRoutinoPathSetup.cpp" line="40"/>
<source>Add or remove paths containing Routino data. There can be multiple databases in a path but no sub-path is parsed.</source>
<translation>Přidat nebo odstranit cesty obsahující data Routino. V cestě může být více databází, ale žádná podcesta není zpracována.</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutinoPathSetup.cpp" line="55"/>
+ <location filename="../gis/rte/router/routino/CRouterRoutinoPathSetup.cpp" line="55"/>
<source>Select routing data file path...</source>
<translation>Vybrat cestu k souboru s daty se stanovením cesty...</translation>
</message>
@@ -3701,35 +4192,40 @@ není platným vymezením soustavy souřadnic
<context>
<name>CRouterSetup</name>
<message>
- <location filename="../gis/rte/router/CRouterSetup.cpp" line="36"/>
+ <location filename="../gis/rte/router/CRouterSetup.cpp" line="38"/>
<source>Routino (offline)</source>
<translation>Routino (nepřipojeno)</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterSetup.cpp" line="37"/>
+ <location filename="../gis/rte/router/CRouterSetup.cpp" line="39"/>
<source>MapQuest (online)</source>
<translation>MapQuest (nepřipojeno)</translation>
</message>
+ <message>
+ <location filename="../gis/rte/router/CRouterSetup.cpp" line="40"/>
+ <source>BRouter (online)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CRoutinoDatabaseBuilder</name>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="32"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="33"/>
<source>Create Routino Database</source>
<translation>Vytvořit databázi Routino</translation>
</message>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="56"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="57"/>
<source>Select files...</source>
<translation>Vybrat soubory...</translation>
</message>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="80"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="81"/>
<source>Select target path...</source>
<translation>Vybrat cílovou cestu...</translation>
</message>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="141"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="142"/>
<source>!!! done !!!
</source>
<translation>Hotovo!</translation>
@@ -3913,27 +4409,125 @@ line %2, column %3:
<translation>Přestávka %1</translation>
</message>
<message>
- <location filename="../gis/slf/CSlfReader.cpp" line="185"/>
- <source>Lap %1</source>
- <translation>Kolo %1</translation>
+ <location filename="../gis/slf/CSlfReader.cpp" line="185"/>
+ <source>Lap %1</source>
+ <translation>Kolo %1</translation>
+ </message>
+</context>
+<context>
+ <name>CTableTrk</name>
+ <message>
+ <location filename="../gis/trk/CTableTrk.cpp" line="99"/>
+ <source>Double click to edit elevation value</source>
+ <translation>Dvakrát klepněte pro upravení hodnoty výšky</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CTableTrk.cpp" line="125"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="133"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="136"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="141"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="155"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="157"/>
+ <source>%1 %2</source>
+ <translation>%1 %2</translation>
+ </message>
+</context>
+<context>
+ <name>CTcxProject</name>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="51"/>
+ <source>Failed to load file %1...</source>
+ <translation type="unfinished">Nepodařilo se nahrát soubor %1...</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="73"/>
+ <source>Failed to open %1</source>
+ <translation type="unfinished">Nepodařilo se otevřít %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="84"/>
+ <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+ <translation type="unfinished">Chyba při čtení: %1
+Řádek %2, Sloupec %3:
+%4</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="91"/>
+ <source>Not a TCX file: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="101"/>
+ <source>This TCX file contains at least 1 workout, but neither an activity nor a course. As workouts do not contain position data, they can not be imported to QMapShack.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="106"/>
+ <source>This TCX file does not contain any activity or course: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="275"/>
+ <source>File exists ...</source>
+ <translation type="unfinished">Soubor existuje...</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="276"/>
+ <source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file. Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="315"/>
+ <source>The track <b>%1</b> you have selected contains trackpoints with invalid timestamps. Device might not accept the generated TCX course file if left as is. <b>Do you want to apply a filter with constant speed (10 m/s) and continue?</b></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="339"/>
+ <source>Course</source>
+ <translation type="unfinished">Směr</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="340"/>
+ <source>Activity</source>
+ <translation type="unfinished">Činnost</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="341"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="314"/>
+ <source>Track with invalid timestamps...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="334"/>
+ <source>Activity or course?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="335"/>
+ <source>QMapShack does not know how track <b>%1</b> should be saved. <b>Do you want to save it as a course or as an activity? </b>Remember that only waypoints close enough to the track will be saved when saving as a course. Waypoints will not be saved when saving as an activity.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="432"/>
+ <source>Failed to create file '%1'</source>
+ <translation type="unfinished">Nepodařilo se vytvořit soubor '%1'</translation>
</message>
-</context>
-<context>
- <name>CTableTrk</name>
<message>
- <location filename="../gis/trk/CTableTrk.cpp" line="99"/>
- <source>Double click to edit elevation value</source>
- <translation>Dvakrát klepněte pro upravení hodnoty výšky</translation>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="453"/>
+ <source>Failed to write file '%1'</source>
+ <translation type="unfinished">Nepodařilo se zapsat soubor '%1'</translation>
</message>
<message>
- <location filename="../gis/trk/CTableTrk.cpp" line="125"/>
- <location filename="../gis/trk/CTableTrk.cpp" line="133"/>
- <location filename="../gis/trk/CTableTrk.cpp" line="136"/>
- <location filename="../gis/trk/CTableTrk.cpp" line="141"/>
- <location filename="../gis/trk/CTableTrk.cpp" line="155"/>
- <location filename="../gis/trk/CTableTrk.cpp" line="157"/>
- <source>%1 %2</source>
- <translation>%1 %2</translation>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="435"/>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="454"/>
+ <source>Saving GIS data failed...</source>
+ <translation type="unfinished">Nepodařilo se uložit data GIS...</translation>
</message>
</context>
<context>
@@ -4011,139 +4605,149 @@ line %2, column %3:
</message>
<message>
<location filename="../IAbout.ui" line="62"/>
- <location filename="../IAbout.ui" line="106"/>
- <location filename="../IAbout.ui" line="120"/>
- <location filename="../IAbout.ui" line="134"/>
- <location filename="../IAbout.ui" line="148"/>
+ <location filename="../IAbout.ui" line="113"/>
+ <location filename="../IAbout.ui" line="127"/>
+ <location filename="../IAbout.ui" line="141"/>
+ <location filename="../IAbout.ui" line="155"/>
<source>TextLabel</source>
<translation>Textový štítek</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="99"/>
+ <location filename="../IAbout.ui" line="106"/>
<source>Qt</source>
<translation>Qt</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="113"/>
+ <location filename="../IAbout.ui" line="120"/>
<source>GDAL</source>
<translation>GDAL</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="127"/>
+ <location filename="../IAbout.ui" line="134"/>
<source>Proj4</source>
<translation>Proj4</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="141"/>
+ <location filename="../IAbout.ui" line="148"/>
<source>Routino</source>
<translation>Routino</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="172"/>
+ <location filename="../IAbout.ui" line="179"/>
<source>Czech:</source>
<translation>Čeština:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="195"/>
+ <location filename="../IAbout.ui" line="202"/>
<source>German:</source>
<translation>Němčina:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="218"/>
+ <location filename="../IAbout.ui" line="212"/>
+ <source>Oliver Eichler</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../IAbout.ui" line="225"/>
<source>Dutch:</source>
<translation>Nizozemština:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="241"/>
+ <location filename="../IAbout.ui" line="248"/>
<source>French:</source>
<translation>Francouzština:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="251"/>
+ <location filename="../IAbout.ui" line="258"/>
<source>Rainer Unseld </source>
<translation>Rainer Unseld</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="381"/>
- <source>Christian Eichler (qms at christian-eichler.de)
-Ivo Kronenberg</source>
- <translation>Christian Eichler (qms at christian-eichler.de)
-Ivo Kronenberg</translation>
+ <location filename="../IAbout.ui" line="295"/>
+ <source>Russian:</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="182"/>
+ <location filename="../IAbout.ui" line="302"/>
+ <source>Wolfgang Thämelt</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../IAbout.ui" line="428"/>
+ <source>© 2017 Oliver Eichler (oliver.eichler at gmx.de)</source>
+ <translation type="unfinished">© 2014 Oliver Eichler (oliver.eichler at gmx.de) {2016 ?} {2017 ?}</translation>
+ </message>
+ <message>
+ <location filename="../IAbout.ui" line="189"/>
<source>Pavel Fric</source>
<translation>Pavel Fric</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="281"/>
+ <location filename="../IAbout.ui" line="288"/>
<source><b>Translation:</b></source>
<translation><b>Překlad</b></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="228"/>
+ <location filename="../IAbout.ui" line="235"/>
<source>Harrie Klomp</source>
<translation>Harrie Klomp</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="271"/>
+ <location filename="../IAbout.ui" line="278"/>
<source>Spanish:</source>
<translation>Španělština:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="305"/>
+ <location filename="../IAbout.ui" line="326"/>
<source>Win64:</source>
<translation>Win64:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="321"/>
+ <location filename="../IAbout.ui" line="342"/>
<source>OS X:</source>
<translation>OS X:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="345"/>
+ <location filename="../IAbout.ui" line="366"/>
<source><b>Binaries:</b></source>
<translation><b>Spustitelné soubory:</b></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="374"/>
+ <location filename="../IAbout.ui" line="395"/>
<source><b>Contributors:</b></source>
<translation><b>Přispěvatelé</b></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="205"/>
- <source>Josef Latt</source>
- <translation>Josef Latt</translation>
- </message>
- <message>
- <location filename="../IAbout.ui" line="258"/>
+ <location filename="../IAbout.ui" line="265"/>
<source>Jose Luis Domingo Lopez</source>
<translation>Jose Luis Domingo Lopez</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="338"/>
+ <location filename="../IAbout.ui" line="359"/>
<source>Ivo Kronenberg</source>
<translation>Ivo Kronenberg</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="331"/>
+ <location filename="../IAbout.ui" line="352"/>
<source>Helmut Schmidt</source>
<translation>Helmut Schmidt</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="354"/>
+ <location filename="../IAbout.ui" line="375"/>
<source>...and thanks to all Linux binary maintainers for doing a great job. Special thanks to Dan Horák and Bas Couwenberg for showing presence on the mailing list to discuss distribution related topics.</source>
<translation>... a poděkování všem tvůrcům spustitelných souborů pro Linux za jejich dobrou práci. Zvláštní poděkování Danovi Horákovi a Basi Couwenbergovi za účast v diskuzi v poštovním seznamu.</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="399"/>
- <source>This software is licensed under GPL3 or any later version</source>
- <translation>Tento program je licencován pod GPL3 nebo kteroukoli pozdější verzí</translation>
+ <location filename="../IAbout.ui" line="402"/>
+ <source>Christian Eichler (qms at christian-eichler.de)
+Ivo Kronenberg
+Norbert Truchsess (norbert.truchsess at t-online.de)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="406"/>
- <source>© 2014 Oliver Eichler (oliver.eichler at gmx.de)</source>
- <translation>© 2014 Oliver Eichler (oliver.eichler at gmx.de)</translation>
+ <location filename="../IAbout.ui" line="421"/>
+ <source>This software is licensed under GPL3 or any later version</source>
+ <translation>Tento program je licencován pod GPL3 nebo kteroukoli pozdější verzí</translation>
</message>
</context>
<context>
@@ -4195,13 +4799,23 @@ Ivo Kronenberg</translation>
<translation>Spojit stopy...</translation>
</message>
<message>
- <location filename="../gis/trk/ICombineTrk.ui" line="43"/>
- <location filename="../gis/trk/ICombineTrk.ui" line="70"/>
- <location filename="../gis/trk/ICombineTrk.ui" line="117"/>
- <location filename="../gis/trk/ICombineTrk.ui" line="144"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="24"/>
+ <source>Available Tracks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/ICombineTrk.ui" line="54"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="81"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="139"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="166"/>
<source>...</source>
<translation>...</translation>
</message>
+ <message>
+ <location filename="../gis/trk/ICombineTrk.ui" line="109"/>
+ <source>Combined Tracks</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ICoordFormatSetup</name>
@@ -4253,17 +4867,22 @@ Ivo Kronenberg</translation>
<translation>Smazat první část stopy a zachovat druhou</translation>
</message>
<message>
- <location filename="../gis/trk/ICutTrk.ui" line="27"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="30"/>
<source>Keep both parts of the track</source>
<translation>Zachovat obě části stopy</translation>
</message>
<message>
- <location filename="../gis/trk/ICutTrk.ui" line="37"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="43"/>
<source>Keep first part of the track and delete second one</source>
<translation>Zachovat první část stopy a smazat druhou</translation>
</message>
<message>
- <location filename="../gis/trk/ICutTrk.ui" line="60"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="55"/>
+ <source>Cut Mode:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/ICutTrk.ui" line="136"/>
<source>Check this to store the result into a new track.
If you keep both parts of the track you have to create new ones.
@@ -4276,7 +4895,7 @@ Pokud zachováte obě části stopy, musíte vytvořit nové.
Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body, nebo toto zaškrtnout pro vytvoření nové stopy.</translation>
</message>
<message>
- <location filename="../gis/trk/ICutTrk.ui" line="67"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="143"/>
<source>Create a new track</source>
<translation>Vytvořit novou stopu</translation>
</message>
@@ -4588,8 +5207,8 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
</message>
<message>
<location filename="../gis/ovl/IDetailsOvlArea.ui" line="132"/>
- <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>
+ <source>The area was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../gis/ovl/IDetailsOvlArea.ui" line="148"/>
@@ -4701,16 +5320,16 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<translation>Informace</translation>
</message>
<message>
+ <location filename="../gis/rte/IDetailsRte.ui" line="154"/>
+ <source>The route was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../gis/rte/IDetailsRte.ui" line="205"/>
<source>-</source>
<translation>-</translation>
</message>
<message>
- <location filename="../gis/rte/IDetailsRte.ui" line="154"/>
- <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/rte/IDetailsRte.ui" line="170"/>
<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>
@@ -4778,11 +5397,6 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<translation>...</translation>
</message>
<message>
- <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="387"/>
<source>Style</source>
<translation>Styl</translation>
@@ -4828,6 +5442,11 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<translation>x </translation>
</message>
<message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="265"/>
+ <source>The track was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../gis/trk/IDetailsTrk.ui" line="436"/>
<source>Width</source>
<translation>Šířka</translation>
@@ -4988,6 +5607,11 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<translation>Dialog</translation>
</message>
<message>
+ <location filename="../gis/wpt/IDetailsWpt.ui" line="268"/>
+ <source>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../gis/wpt/IDetailsWpt.ui" line="284"/>
<source>Toggle read only mode. You have to open the lock to edit the item.</source>
<translation>Přepnout režim pouze pro čtení. Musíte otevřít zámek, abyste mohl prvek upravovat.</translation>
@@ -5029,11 +5653,6 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<translation>Blízkost:</translation>
</message>
<message>
- <location filename="../gis/wpt/IDetailsWpt.ui" line="268"/>
- <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/wpt/IDetailsWpt.ui" line="413"/>
<source>Hist.</source>
<translation>Historie</translation>
@@ -5615,70 +6234,70 @@ Buď je to nový symbol nebo byl v databázi někým smazán.</translation>
<context>
<name>IGisProject</name>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="109"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="155"/>
<source>Save project?</source>
<translation>Uložit projekt?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="109"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="155"/>
<source><h3>%1</h3>The project was changed. Save before closing it?</source>
<translation><h3>%1</h3>Projekt byl změněn. Uložit jej před zavřením?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="283"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="329"/>
<source>%1: Correlate tracks and waypoints.</source>
<translation>%1: Svázat stopy a cestovní body.</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="293"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="339"/>
<source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
<translation><h3>%1</h3>Trvalo to moc dlouho? Chcete svázání stop a cestovních bodů pro tento projekt přeskočit i v budoucnu?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="294"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="340"/>
<source>Canceled correlation...</source>
<translation>Svázání zrušeno...</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="339"/>
- <location filename="../gis/prj/IGisProject.cpp" line="392"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="385"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="442"/>
<source>Save "%1" to...</source>
<translation>Uložit "%1" do...</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="477"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="527"/>
<source><br/>
Filename: %1</source>
<translation><br/>
Název souboru: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="482"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="532"/>
<source>Waypoints: %1</source>
<translation>Cestovní body: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="486"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="536"/>
<source>Tracks: %1</source>
<translation>Stopy: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="490"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="540"/>
<source>Routes: %1</source>
<translation>Cesty: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="494"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="544"/>
<source>Areas: %1</source>
<translation>Oblasti: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="614"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="664"/>
<source>Are you sure you want to delete '%1' from project '%2'?</source>
<translation>Jste si jistý, že chcete smazat '%1' z projektu '%2'?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="615"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="665"/>
<source>Delete...</source>
<translation>Smazat...</translation>
</message>
@@ -5691,28 +6310,28 @@ Název souboru: %1</translation>
<translation>Formulář</translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="37"/>
+ <location filename="../gis/IGisWidget.ui" line="49"/>
<source>Opacity</source>
<translation type="unfinished">Neprůhlednost</translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="44"/>
+ <location filename="../gis/IGisWidget.ui" line="56"/>
<source>Change the opacity of all GIS Items on the map.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="96"/>
- <location filename="../gis/IGisWidget.ui" line="126"/>
+ <location filename="../gis/IGisWidget.ui" line="108"/>
+ <location filename="../gis/IGisWidget.ui" line="138"/>
<source>Name</source>
<translation>Název</translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="131"/>
+ <location filename="../gis/IGisWidget.ui" line="143"/>
<source>Age</source>
<translation>Věk</translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="165"/>
+ <location filename="../gis/IGisWidget.ui" line="177"/>
<source>To add a database do a right click on the database list above.</source>
<translation>Pro přidání databáze klepněte pravým tlačítkem myši na seznam s databázemi výše.</translation>
</message>
@@ -5814,7 +6433,7 @@ Název souboru: %1</translation>
<context>
<name>ILineOp</name>
<message>
- <location filename="../mouse/line/ILineOp.cpp" line="211"/>
+ <location filename="../mouse/line/ILineOp.cpp" line="212"/>
<source>Routing</source>
<translation>Cesta</translation>
</message>
@@ -5871,333 +6490,338 @@ Název souboru: %1</translation>
<translation>Okno</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="109"/>
+ <location filename="../IMainWindow.ui" line="110"/>
<source>?</source>
<translation>Nápověda</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="116"/>
+ <location filename="../IMainWindow.ui" line="118"/>
<source>Project</source>
<translation>Projekt</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="127"/>
+ <location filename="../IMainWindow.ui" line="129"/>
<source>Tool</source>
<translation>Nástroj</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="152"/>
+ <location filename="../IMainWindow.ui" line="154"/>
<source>Maps</source>
<translation>Mapy</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="195"/>
+ <location filename="../IMainWindow.ui" line="197"/>
<source>Dig. Elev. Model (DEM)</source>
<translation>Digitální výškový model</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="234"/>
+ <location filename="../IMainWindow.ui" line="236"/>
<source>Data</source>
<translation>Data</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="292"/>
+ <location filename="../IMainWindow.ui" line="294"/>
<source>Ctrl+T</source>
<translation>Ctrl+T</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="307"/>
+ <location filename="../IMainWindow.ui" line="309"/>
<source>Show Scale</source>
<translation>Ukázat měřítko</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="319"/>
+ <location filename="../IMainWindow.ui" line="321"/>
<source>Setup Map Font</source>
<translation>Nastavit písmo mapy</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="334"/>
+ <location filename="../IMainWindow.ui" line="336"/>
<source>Show Grid</source>
<translation>Ukázat mřížku</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="337"/>
+ <location filename="../IMainWindow.ui" line="339"/>
<source>Ctrl+G</source>
<translation>Ctrl+G</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="349"/>
+ <location filename="../IMainWindow.ui" line="351"/>
<source>Setup Grid</source>
<translation>Nastavit mřížku</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="352"/>
+ <location filename="../IMainWindow.ui" line="354"/>
<source>Ctrl+Alt+G</source>
<translation>Ctrl+Alt+G</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="367"/>
+ <location filename="../IMainWindow.ui" line="369"/>
<source>Flip Mouse Wheel</source>
<translation>Obrátit kolečko myši</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="379"/>
- <location filename="../IMainWindow.ui" line="382"/>
+ <location filename="../IMainWindow.ui" line="381"/>
+ <location filename="../IMainWindow.ui" line="384"/>
<source>Setup Map Paths</source>
<translation>Nastavit cesty k mapám</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="397"/>
+ <location filename="../IMainWindow.ui" line="399"/>
<source>POI Text</source>
<translation>Text POI</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="412"/>
+ <location filename="../IMainWindow.ui" line="414"/>
<source>Night / Day</source>
<translation>Noc/Den</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="427"/>
+ <location filename="../IMainWindow.ui" line="429"/>
<source>Map Tool Tip</source>
<translation>Rada k nástroji pro mapu</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="442"/>
+ <location filename="../IMainWindow.ui" line="444"/>
<source>Setup DEM Paths</source>
<translation>Nastavit cesty k výškovým modelům</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="454"/>
+ <location filename="../IMainWindow.ui" line="456"/>
<source>About</source>
<translation>O programu</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="466"/>
+ <location filename="../IMainWindow.ui" line="468"/>
<source>Help</source>
<translation>Nápověda</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="252"/>
+ <location filename="../IMainWindow.ui" line="254"/>
<source>Route</source>
<translation>Cesta</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="286"/>
- <location filename="../IMainWindow.ui" line="289"/>
+ <location filename="../IMainWindow.ui" line="288"/>
+ <location filename="../IMainWindow.ui" line="291"/>
<source>Add Map View</source>
<translation>Přidat pohled na mapu</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="430"/>
+ <location filename="../IMainWindow.ui" line="432"/>
<source>Ctrl+I</source>
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="469"/>
+ <location filename="../IMainWindow.ui" line="471"/>
<source>F1</source>
<translation>F1</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="481"/>
- <location filename="../IMainWindow.ui" line="484"/>
+ <location filename="../IMainWindow.ui" line="483"/>
+ <location filename="../IMainWindow.ui" line="486"/>
<source>Setup Map View</source>
<translation>Nastavit pohled na mapu</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="496"/>
+ <location filename="../IMainWindow.ui" line="498"/>
<source>Load GIS Data</source>
<translation>Nahrát data GIS</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="499"/>
+ <location filename="../IMainWindow.ui" line="501"/>
<source>Load projects from file</source>
<translation>Nahrát projekty ze souboru</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="502"/>
+ <location filename="../IMainWindow.ui" line="504"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="514"/>
+ <location filename="../IMainWindow.ui" line="516"/>
<source>Save All GIS Data</source>
<translation>Uložit všechna data GIS</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="517"/>
+ <location filename="../IMainWindow.ui" line="519"/>
<source>Save all projects in the workspace</source>
<translation>Uložit všechny projekty nacházející se v pracovním prostoru</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="520"/>
+ <location filename="../IMainWindow.ui" line="522"/>
<source>Ctrl+S</source>
<translation>Ctrl+S</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="532"/>
+ <location filename="../IMainWindow.ui" line="534"/>
<source>Setup Time Zone</source>
<translation>Nastavit časové pásmo</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="544"/>
+ <location filename="../IMainWindow.ui" line="546"/>
<source>Add empty project</source>
<translation>Přidat prázdný projekt</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="559"/>
+ <location filename="../IMainWindow.ui" line="561"/>
<source>Search Google</source>
<translation>Hledat pomocí Google</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="571"/>
+ <location filename="../IMainWindow.ui" line="573"/>
<source>Close all projects</source>
<translation>Zavřít všechny projekty</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="574"/>
+ <location filename="../IMainWindow.ui" line="576"/>
<source>F8</source>
<translation>F8</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="586"/>
+ <location filename="../IMainWindow.ui" line="588"/>
<source>Setup Units</source>
<translation>Nastavit jednotky</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="598"/>
+ <location filename="../IMainWindow.ui" line="600"/>
<source>Setup Workspace</source>
<translation>Nastavit pracovní prostor</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="601"/>
+ <location filename="../IMainWindow.ui" line="603"/>
<source>Setup save on exit.</source>
<translation>Nastavit uložení při ukončení.</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="613"/>
+ <location filename="../IMainWindow.ui" line="615"/>
<source>Import Database from QLandkarte</source>
<translation>Zavést databázi z QLandkarte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="616"/>
+ <location filename="../IMainWindow.ui" line="618"/>
<source>Import QLandkarte GT database</source>
<translation>Zavést databázi GT QLandkarte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="628"/>
+ <location filename="../IMainWindow.ui" line="630"/>
<source>VRT Builder</source>
<translation>Sestavovač VRT</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="631"/>
+ <location filename="../IMainWindow.ui" line="633"/>
<source>GUI front end to gdalbuildvrt</source>
<translation>Rozhraní pro gdalbuildvrt</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="643"/>
+ <location filename="../IMainWindow.ui" line="645"/>
<source>Store Map View</source>
<translation>Uložit pohled na mapu</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="646"/>
+ <location filename="../IMainWindow.ui" line="648"/>
<source>Write current active map and DEM list including the properties to a file</source>
<translation>Zapsat nynější činnou mapu a seznam výškových modelů včetně vlastností do souboru</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="658"/>
+ <location filename="../IMainWindow.ui" line="660"/>
<source>Load Map View</source>
<translation>Nahrát pohled na mapu</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="661"/>
+ <location filename="../IMainWindow.ui" line="663"/>
<source>Restore view with active map and DEM list including the properties from a file</source>
<translation>Obnovit pohled s činnou mapou a seznam výškových modelů včetně vlastností ze souboru</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="676"/>
+ <location filename="../IMainWindow.ui" line="678"/>
<source>Ext. Profile</source>
<translation>Ext. Profil</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="679"/>
+ <location filename="../IMainWindow.ui" line="681"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="691"/>
+ <location filename="../IMainWindow.ui" line="693"/>
<source>Close</source>
<translation>Zavřít</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="694"/>
+ <location filename="../IMainWindow.ui" line="696"/>
<source>Ctrl+Q</source>
<translation>Ctrl+Q</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="706"/>
+ <location filename="../IMainWindow.ui" line="708"/>
<source>Clone Map View</source>
<translation>Klonovat pohled na mapu</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="709"/>
+ <location filename="../IMainWindow.ui" line="711"/>
<source>Ctrl+Shift+T</source>
<translation>Ctrl+Shift+T</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="721"/>
+ <location filename="../IMainWindow.ui" line="723"/>
<source>Create Routino Database</source>
<translation>Vytvořit databázi Routino</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="733"/>
+ <location filename="../IMainWindow.ui" line="735"/>
<source>Save(Print) Map Screenshot</source>
<translation>Uložit (vytisknout) snímek obrazovky s mapou</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="736"/>
+ <location filename="../IMainWindow.ui" line="738"/>
<source>Print a selected area of the map</source>
<translation>Vytisknout vybranou oblast mapy</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="739"/>
+ <location filename="../IMainWindow.ui" line="741"/>
<source>Ctrl+P</source>
<translation>Ctrl+P</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="751"/>
+ <location filename="../IMainWindow.ui" line="753"/>
<source>Setup Coord. Format</source>
<translation>Nastavit formát souřadnic</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="754"/>
+ <location filename="../IMainWindow.ui" line="756"/>
<source>Change the format coordinates are displayed</source>
<translation>Změnit formát, v němž jsou souřadnice zobrazeny</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="766"/>
+ <location filename="../IMainWindow.ui" line="768"/>
<source>Setup Map Background</source>
<translation>Nastavit pozadí mapy</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="778"/>
+ <location filename="../IMainWindow.ui" line="780"/>
<source>Setup Waypoint Icons</source>
<translation>Stanovit ikony cestovních bodů</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="781"/>
+ <location filename="../IMainWindow.ui" line="783"/>
<source>Setup path to custom icons</source>
<translation>Stanovit cestu k vlastním ikonám</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="790"/>
+ <location filename="../IMainWindow.ui" line="792"/>
<source>Close Tab</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="793"/>
+ <location filename="../IMainWindow.ui" line="795"/>
<source>Ctrl+W</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../IMainWindow.ui" line="804"/>
+ <source>Quickstart Help</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>IMapList</name>
@@ -6321,37 +6945,42 @@ Nechce se mi číst dokumentaci!</translation>
<translation><html><head/><body><p>Klepněte pro použití nynějšího měřítka jako nejmenšího měřítka pro zobrazení mapy.</p></body></html></translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="137"/>
+ <location filename="../map/IMapPropSetup.ui" line="139"/>
<source>Areas</source>
<translation>Oblasti</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="144"/>
+ <location filename="../map/IMapPropSetup.ui" line="146"/>
<source>Lines</source>
<translation>Čáry</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="151"/>
+ <location filename="../map/IMapPropSetup.ui" line="153"/>
<source>Points</source>
<translation>Body</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="233"/>
+ <location filename="../map/IMapPropSetup.ui" line="170"/>
+ <source>Details</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../map/IMapPropSetup.ui" line="264"/>
<source>-</source>
<translation>-</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="240"/>
+ <location filename="../map/IMapPropSetup.ui" line="271"/>
<source>Cache Path</source>
<translation>Cesta k vyrovnávací paměti</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="196"/>
+ <location filename="../map/IMapPropSetup.ui" line="227"/>
<source>Cache Size (MB)</source>
<translation>Velikost vyrovnávací paměti (MB)</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="216"/>
+ <location filename="../map/IMapPropSetup.ui" line="247"/>
<source>Expiration (Days)</source>
<translation>Datum vypršení (dny)</translation>
</message>
@@ -6495,18 +7124,23 @@ Nechce se mi číst dokumentaci!</translation>
<translation>Přidat cestovní bod</translation>
</message>
<message>
- <location filename="../plot/IPlot.cpp" line="541"/>
+ <location filename="../plot/IPlot.cpp" line="99"/>
+ <source>Cut...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../plot/IPlot.cpp" line="542"/>
<source>Hold CTRL key for vertical zoom, only.
Hold ALT key for horizontal zoom, only.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../plot/IPlot.cpp" line="696"/>
+ <location filename="../plot/IPlot.cpp" line="697"/>
<source>No or bad data.</source>
<translation>Žádné nebo špatné údaje.</translation>
</message>
<message>
- <location filename="../plot/IPlot.cpp" line="1296"/>
+ <location filename="../plot/IPlot.cpp" line="1298"/>
<source>Select output file</source>
<translation>Vybrat výstupní soubor</translation>
</message>
@@ -6676,6 +7310,262 @@ nebo
</message>
</context>
<context>
+ <name>IRouterBRouter</name>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished">Formulář</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="28"/>
+ <source>Profile</source>
+ <translation type="unfinished">Profil</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="35"/>
+ <source>Alternative</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="64"/>
+ <source>display selected routing profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="67"/>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="128"/>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="142"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="87"/>
+ <source>on-the-fly routing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="111"/>
+ <source>BRouter: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="118"/>
+ <source>not running</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="125"/>
+ <source>start/stop BRouter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="139"/>
+ <source>show BRouter console</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="172"/>
+ <source>Setup</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="181"/>
+ <source>Caution! BRouter is listening on all ports for connections.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>IRouterBRouterInfo</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterInfo.ui" line="14"/>
+ <source>BRouter Profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterInfo.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation type="unfinished">Textový štítek</translation>
+ </message>
+</context>
+<context>
+ <name>IRouterBRouterSetupWizard</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="23"/>
+ <source>BRouter Setup</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="48"/>
+ <source>choose which BRouter to use</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="54"/>
+ <source>BRouter-Web (online)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="61"/>
+ <source>local Installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="68"/>
+ <source>Expert Mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="91"/>
+ <source>local BRouter Installation directory:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="103"/>
+ <source>select installation directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="106"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="162"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="342"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="356"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="389"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="400"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="119"/>
+ <source>labelLocalDirResult</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="128"/>
+ <source>create or update installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="152"/>
+ <source>Java Executable</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="175"/>
+ <source>labelLocalJavaResult</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="184"/>
+ <source>search for installed java</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="241"/>
+ <source>Download and install BRouter Version</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="255"/>
+ <source>about:blank</source>
+ <translation type="unfinished">o:prázdný</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="263"/>
+ <source>File to install</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="272"/>
+ <source>Download and Install</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="321"/>
+ <source>available Profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="339"/>
+ <source>install profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="353"/>
+ <source>remove profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="371"/>
+ <source>installed Profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="415"/>
+ <source>content of profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="451"/>
+ <source>BRouter-Web URL:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="501"/>
+ <source>Service-URL</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="511"/>
+ <source>Profile-URL</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="561"/>
+ <source>Hostname</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="571"/>
+ <source>Port</source>
+ <translation type="unfinished">Přípojka</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="581"/>
+ <source>Profile directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="591"/>
+ <source>Segments directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="601"/>
+ <source>Custom Profiles dir</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="611"/>
+ <source>Max Runtime</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="621"/>
+ <source>Number Threads</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="631"/>
+ <source>Java Options</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="551"/>
+ <source>Profiles Url</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>IRouterMapQuest</name>
<message>
<location filename="../gis/rte/router/IRouterMapQuest.ui" line="14"/>
@@ -6779,18 +7669,18 @@ nebo
<context>
<name>IRouterRoutinoPathSetup</name>
<message>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="14"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="14"/>
<source>Setup Routino database...</source>
<translation>Nastavit databázi Routino...</translation>
</message>
<message>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="27"/>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="47"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="27"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="47"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="99"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="99"/>
<source>-</source>
<translation>-</translation>
</message>
@@ -7043,18 +7933,18 @@ nebo
<translation>Formulář</translation>
</message>
<message>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="20"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="32"/>
<source>Delete all points between the first and last one.</source>
<translation>Smazat všechny body mezi prvním a posledním bodem.</translation>
</message>
<message>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="23"/>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="37"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="35"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="49"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="34"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="46"/>
<source><html><head/><body><p>Calculate a route between the first and last selected point.</p></body></html></source>
<translation><html><head/><body><p>Spočítat cestu mezi prvním a posledním vybraným bodem.</p></body></html></translation>
</message>
@@ -7177,12 +8067,13 @@ nebo
<location filename="../mouse/IScrOptSelect.ui" line="82"/>
<location filename="../mouse/IScrOptSelect.ui" line="102"/>
<location filename="../mouse/IScrOptSelect.ui" line="122"/>
- <location filename="../mouse/IScrOptSelect.ui" line="176"/>
- <location filename="../mouse/IScrOptSelect.ui" line="205"/>
- <location filename="../mouse/IScrOptSelect.ui" line="265"/>
- <location filename="../mouse/IScrOptSelect.ui" line="292"/>
- <location filename="../mouse/IScrOptSelect.ui" line="319"/>
- <location filename="../mouse/IScrOptSelect.ui" line="346"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="142"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="196"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="225"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="285"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="312"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="339"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="366"/>
<source>...</source>
<translation>...</translation>
</message>
@@ -7193,41 +8084,46 @@ nebo
</message>
<message>
<location filename="../mouse/IScrOptSelect.ui" line="99"/>
+ <source>Change the icon of all selected waypoints.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mouse/IScrOptSelect.ui" line="119"/>
<source>Combine all selected tracks to a new one.</source>
<translation>Spojit všechny vybrané stopy do nové.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="119"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="139"/>
<source>Delete all selected items.</source>
<translation>Smazat všechny vybrané prvky.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="173"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="193"/>
<source>Select all items that intersect the selected area.</source>
<translation>Vybrat všechny prvky, které protínají vybranou oblast.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="202"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="222"/>
<source>Select all itmes that are completely inside the selected area.</source>
<translation>Vybrat všechny prvky, které jsou úplně uvnitř vybrané oblasti.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="262"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="282"/>
<source>Add tracks to selection.</source>
<translation>Přidat stopy do výběru.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="289"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="309"/>
<source>Add waypoints to selection.</source>
<translation>Přidat cestovní body do výběru.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="316"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="336"/>
<source>Add routes to selection.</source>
<translation>Přidat cesty do výběru.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="343"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="363"/>
<source>Add areas to selection.</source>
<translation>Přidat oblasti do výběru.</translation>
</message>
@@ -8095,36 +8991,36 @@ nebo
<context>
<name>IToolShell</name>
<message>
- <location filename="../tool/IToolShell.cpp" line="45"/>
+ <location filename="../tool/IToolShell.cpp" line="46"/>
<source>Execution of external program `%1` failed: </source>
<translation>Nepodařilo se spustit vnější program `%1`: </translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="49"/>
+ <location filename="../tool/IToolShell.cpp" line="50"/>
<source>Process cannot be started.
</source>
<translation>Proces nelze spustit.</translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="50"/>
+ <location filename="../tool/IToolShell.cpp" line="51"/>
<source>Make sure the required packages are installed, `%1` exists and is executable.
</source>
<translation>Ujistěte se, že jsou nainstalovány požadované balíčky, že `%1` existuje a je spustitelný.</translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="54"/>
+ <location filename="../tool/IToolShell.cpp" line="55"/>
<source>External process crashed.
</source>
<translation>Vnější proces spadl.</translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="58"/>
+ <location filename="../tool/IToolShell.cpp" line="59"/>
<source>An unknown error occurred.
</source>
<translation>Vyskytla se neznámá chyba.</translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="149"/>
+ <location filename="../tool/IToolShell.cpp" line="172"/>
<source>!!! failed !!!
</source>
<translation>Nepodařilo se!</translation>
diff --git a/src/locale/qmapshack_de.ts b/src/locale/qmapshack_de.ts
index 488110d..68b56e3 100644
--- a/src/locale/qmapshack_de.ts
+++ b/src/locale/qmapshack_de.ts
@@ -13,6 +13,11 @@
<source>%1 (API V%2)</source>
<translation></translation>
</message>
+ <message>
+ <location filename="../CAbout.cpp" line="49"/>
+ <source>(no DBUS: device detection and handling disabled)</source>
+ <translation>(kein DBUS: Keine Geräteerkennung und - verwaltung)</translation>
+ </message>
</context>
<context>
<name>CActivityTrk</name>
@@ -112,12 +117,12 @@
<context>
<name>CCanvas</name>
<message>
- <location filename="../canvas/CCanvas.cpp" line="60"/>
+ <location filename="../canvas/CCanvas.cpp" line="61"/>
<source>View %1</source>
<translation>Ansicht %1</translation>
</message>
<message>
- <location filename="../canvas/CCanvas.cpp" line="685"/>
+ <location filename="../canvas/CCanvas.cpp" line="693"/>
<source>Setup Map Background</source>
<translation>Kartenhintergrund einstellen</translation>
</message>
@@ -262,7 +267,27 @@
<context>
<name>CDBProject</name>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="223"/>
+ <location filename="../gis/db/CDBProject.cpp" line="112"/>
+ <source>Failed to load...</source>
+ <translation>Laden fehlgeschlagen...</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="113"/>
+ <source>Can't load file "%1" . It will be skipped.</source>
+ <translation>Konnte die Datei "%1" nicht laden. Wird ausgelassen.</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="126"/>
+ <source>Project already in database...</source>
+ <translation>Das Projekt ist schon in der Datenbank...</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="127"/>
+ <source>The project "%1" has already been imported into the database. It will be skipped.</source>
+ <translation>Das Projekt "%1" wurde schon in die Datenbank importiert. Wird asugelassen.</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="278"/>
<source>The item %1 has been changed by %2 (%3).
To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
@@ -271,47 +296,47 @@ To solve this conflict you can create and save a clone, force your version or dr
Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihre Version oder verwerfen diese und nehmen die Version in der Datenbank</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="229"/>
+ <location filename="../gis/db/CDBProject.cpp" line="284"/>
<source>Conflict with database...</source>
<translation>Konflikt mit der Datenbank...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="230"/>
+ <location filename="../gis/db/CDBProject.cpp" line="285"/>
<source>Clone && Save</source>
<translation>Klonen && Speichern</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="231"/>
+ <location filename="../gis/db/CDBProject.cpp" line="286"/>
<source>Force Save</source>
<translation>Speichern erzwingen</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="232"/>
+ <location filename="../gis/db/CDBProject.cpp" line="287"/>
<source>Take remote</source>
<translation>Entfernte Version nehmen</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="514"/>
+ <location filename="../gis/db/CDBProject.cpp" line="569"/>
<source>Missing folder...</source>
<translation>Fehlender Ordner...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="515"/>
+ <location filename="../gis/db/CDBProject.cpp" line="570"/>
<source>Failed to save project. The folder has been deleted in the database.</source>
<translation>Speichern des Projektes fehlgeschlagen. Der Ordner wurde in der Datenbank gelöscht.</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="522"/>
+ <location filename="../gis/db/CDBProject.cpp" line="577"/>
<source>Save ...</source>
<translation>Speichern ...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="585"/>
+ <location filename="../gis/db/CDBProject.cpp" line="640"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="585"/>
+ <location filename="../gis/db/CDBProject.cpp" line="640"/>
<source>There was an unexpected database error:
%1</source>
@@ -320,12 +345,12 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
%1</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="700"/>
+ <location filename="../gis/db/CDBProject.cpp" line="755"/>
<source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
<translation>Das Projekt '%1' will sich gerade aus der Datenbank aktualisieren. Es gibt allerdings nicht gespeicherte Änderungen.</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="701"/>
+ <location filename="../gis/db/CDBProject.cpp" line="756"/>
<source>Save changes?</source>
<translation>Änderungen speichern?</translation>
</message>
@@ -348,7 +373,7 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<message>
<location filename="../dem/CDemPathSetup.cpp" line="41"/>
<source>Add or remove paths containing DEM data. There can be multiple files in a path but no sub-path is parsed. Supported formats are: %1</source>
- <translation>Hinzufügen oder Entfernen von Verzeichnissen mit DEM Daten. Im Verzeichnis können mehrere Dateien vorliegen. Allerdings wird kein Unterverzeichnis durchsucht. Unterstützte Formate sind: %1</translation>
+ <translation>Hinzufügen oder Entfernen von Verzeichnissen mit Höhendaten. In einem Verzeichnis können mehrere Dateien liegen. Unterverzeichnisse werden jedoch nicht durchsucht. Unterstützte Formate sind: %1</translation>
</message>
<message>
<location filename="../dem/CDemPathSetup.cpp" line="56"/>
@@ -855,78 +880,78 @@ 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="65"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="66"/>
<source>_Clone</source>
<translation>_Klon</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="283"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="284"/>
<source>track</source>
<translation>Track</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="310"/>
+ <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="316"/>
+ <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="322"/>
+ <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="328"/>
+ <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="346"/>
+ <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="350"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
<source>Length: -</source>
<translation>Länge: -</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="357"/>
- <location filename="../gis/rte/CGisItemRte.cpp" line="599"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="600"/>
<source>Time: %1 %2</source>
<translation>Gesamtzeit: %1 %2</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="361"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
<source>Time: -</source>
<translation>Gesamtzeit: -</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="371"/>
+ <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="377"/>
+ <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="379"/>
+ <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="601"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="602"/>
<source>Distance: %1 %2</source>
<translation>Entfernung: %1 %2</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="716"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="717"/>
<source>Changed route points.</source>
<translation>Geänderte Routenpunkte.</translation>
</message>
@@ -936,7 +961,7 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<message>
<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>
+ <translation>FIT Dekodierfehler: Datei %1 enthält keine GPS Daten.</translation>
</message>
<message>
<location filename="../gis/tnv/serialization.cpp" line="211"/>
@@ -1085,21 +1110,21 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<translation>Zeit in Bew.: - (-) </translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1214"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1227"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1283"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1327"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1466"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1223"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1236"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1292"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1336"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1475"/>
<source>track</source>
<translation>Track</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1418"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1427"/>
<source>Hide point %1.</source>
<translation>Punkt %1 verbergen.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1422"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1431"/>
<source>Hide points %1..%2.</source>
<translation>Punkte %1 %2 verbergen.</translation>
</message>
@@ -1180,47 +1205,47 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<translation>Entfernung: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1273"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1282"/>
<source>Permanently removed points %1..%2</source>
<translation>Punkte %1..%2 dauerhaft entfernt</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1451"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1460"/>
<source>Show points.</source>
<translation>Punkte anzeigen.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1985"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
<source>Changed name</source>
<translation>Name geändert</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1991"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
<source>Changed comment</source>
<translation>Kommentar geändert</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1997"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
<source>Changed description</source>
<translation>Beschreibung geändert</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2003"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2012"/>
<source>Changed links</source>
<translation>Geänderte Verknüpfungen</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2014"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2023"/>
<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="2038"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2047"/>
<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="2077"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2086"/>
<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>
@@ -1328,62 +1353,62 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<translation>_Klon</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="272"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="275"/>
<source>Elevation: %1 %2</source>
<translation>Höhe: %1 %2</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="283"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="286"/>
<source>Proximity: %1 %2</source>
<translation>Abstand: %1 %2</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="355"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="358"/>
<source>Changed name</source>
<translation>Name geändert</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="365"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="368"/>
<source>Changed position</source>
<translation>Position geändert</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="371"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="374"/>
<source>Changed elevation</source>
<translation>Höhe geändert</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="377"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="380"/>
<source>Changed proximity</source>
<translation>Abstandsalarm geändert</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="391"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
<source>Changed icon</source>
<translation>Symbol geändert</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="397"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
<source>Changed comment</source>
<translation>Kommentar geändert</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="403"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="406"/>
<source>Changed description</source>
<translation>Beschreibung geändert</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="409"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="412"/>
<source>Changed links</source>
<translation>Geänderte Verknüpfungen</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="415"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="418"/>
<source>Changed images</source>
<translation>Bilder geändert</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="421"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="424"/>
<source>Add image</source>
<translation>Bild hinzufügen</translation>
</message>
@@ -1391,139 +1416,149 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<context>
<name>CGisListDB</name>
<message>
- <location filename="../gis/CGisListDB.cpp" line="120"/>
+ <location filename="../gis/CGisListDB.cpp" line="121"/>
<source>Add Folder</source>
<translation>Ordner hinzufügen</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="124"/>
+ <location filename="../gis/CGisListDB.cpp" line="125"/>
<source>Delete Folder</source>
<translation>Ordner löschen</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="83"/>
+ <location filename="../gis/CGisListDB.cpp" line="84"/>
<source>Due to changes in the database system QMapShack forgot about the filename of your database '%1'. You have to select it again in the next step.</source>
- <translation>Aufgrund der Änderungen im Datenbanksystem kennt QMapShack den Dateinamen Ihrer Datenbank nicht mehr. Sie müssen diesen im nächsten Schritt erneut wählen.</translation>
+ <translation>Aufgrund der Änderungen im Datenbanksystem kennt QMapShack den Dateinamen Ihrer Datenbank '%1' nicht mehr. Sie müssen diesen im nächsten Schritt erneut wählen.</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="84"/>
+ <location filename="../gis/CGisListDB.cpp" line="85"/>
<source>Select database file.</source>
<translation>Datenbankdatei wählen.</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="117"/>
+ <location filename="../gis/CGisListDB.cpp" line="118"/>
<source>Add Database</source>
<translation>Datenbank hinzufügen</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="121"/>
+ <location filename="../gis/CGisListDB.cpp" line="122"/>
<source>Rename Folder</source>
<translation>Ordner umbenennen</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="122"/>
+ <location filename="../gis/CGisListDB.cpp" line="123"/>
<source>Copy Folder</source>
<translation>Ordner kopieren</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="123"/>
+ <location filename="../gis/CGisListDB.cpp" line="124"/>
<source>Move Folder</source>
<translation>Ordner verschieben</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="125"/>
+ <location filename="../gis/CGisListDB.cpp" line="127"/>
+ <source>Import from Files...</source>
+ <translation>Aus Dateien importieren...</translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListDB.cpp" line="128"/>
<source>Export to GPX...</source>
<translation>Als GPX exportieren...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="128"/>
- <location filename="../gis/CGisListDB.cpp" line="141"/>
+ <location filename="../gis/CGisListDB.cpp" line="131"/>
+ <location filename="../gis/CGisListDB.cpp" line="147"/>
<source>Delete Item</source>
<translation>Element löschen</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="132"/>
+ <location filename="../gis/CGisListDB.cpp" line="135"/>
<source>Search Database</source>
<translation>Datenbank durchsuchen</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="133"/>
+ <location filename="../gis/CGisListDB.cpp" line="136"/>
<source>Sync. with Database</source>
<translation>Mit der Datenbank synchronisieren</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="134"/>
+ <location filename="../gis/CGisListDB.cpp" line="137"/>
<source>Remove Database</source>
<translation>Datenbank entfernen</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="138"/>
+ <location filename="../gis/CGisListDB.cpp" line="144"/>
<source>Empty</source>
<translation>Leeren</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="437"/>
+ <location filename="../gis/CGisListDB.cpp" line="444"/>
<source>Remove database...</source>
<translation>Datenbank entfernen...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="437"/>
+ <location filename="../gis/CGisListDB.cpp" line="444"/>
<source>Do you really want to remove '%1' from the list?</source>
<translation>Wollen Sie '%1' wirklich aus der Liste entfernen?</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="501"/>
+ <location filename="../gis/CGisListDB.cpp" line="508"/>
<source>Are you sure you want to delete selected folders and all subfolders from the database?</source>
<translation>Sind Sie sicher, dass Sie alle ausgewählten Ordner und alle Unterordner löschen wollen?</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="669"/>
+ <location filename="../gis/CGisListDB.cpp" line="676"/>
<source>Bad operation....</source>
<translation>Falsche Funktion...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="669"/>
+ <location filename="../gis/CGisListDB.cpp" line="676"/>
<source>The target folder is a subfolder of the one to move. This will not work.</source>
<translation>Der Zielordner ist ein Unterordner von dem zu verschiebenden. Das kann nicht funktionieren.</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="728"/>
+ <location filename="../gis/CGisListDB.cpp" line="735"/>
<source>Folder name...</source>
<translation>Ordnername...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="728"/>
+ <location filename="../gis/CGisListDB.cpp" line="735"/>
<source>Rename folder:</source>
<translation>Ordner umbenennen:</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="857"/>
+ <location filename="../gis/CGisListDB.cpp" line="864"/>
<source>Are you sure you want to delete '%1' from folder '%2'?</source>
<translation>Sind Sie sicher, dass Sie '%1' aus dem Ordner '%2' löschen wollen? </translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="858"/>
+ <location filename="../gis/CGisListDB.cpp" line="865"/>
<source>Delete...</source>
<translation>Löschen...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="501"/>
+ <location filename="../gis/CGisListDB.cpp" line="1055"/>
+ <source>Import GIS Data...</source>
+ <translation>GIS Daten importieren...</translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListDB.cpp" line="508"/>
<source>Delete database folder...</source>
<translation>Datenbankordner löschen...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="749"/>
- <location filename="../gis/CGisListDB.cpp" line="770"/>
+ <location filename="../gis/CGisListDB.cpp" line="756"/>
+ <location filename="../gis/CGisListDB.cpp" line="777"/>
<source>Remove items...</source>
<translation>Element entfernen...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="749"/>
+ <location filename="../gis/CGisListDB.cpp" line="756"/>
<source>Are you sure you want to delete all items from Lost&Found? This will remove them permanently.</source>
<translation>Sind Sie sicher, dass Sie alle Elemente in Verloren & Gefunden löschen wollen? Sie werden dauerhaft entfernt.</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="770"/>
+ <location filename="../gis/CGisListDB.cpp" line="777"/>
<source>Are you sure you want to delete all selected items from Lost&Found? This will remove them permanently.</source>
<translation>Sind Sie sicher, dass Sie alle ausgewählten Elemente in Verloren & Gefunden löschen wollen? Sie werden dauerhaft entfernt.</translation>
</message>
@@ -1531,201 +1566,206 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<context>
<name>CGisListWks</name>
<message>
- <location filename="../gis/CGisListWks.cpp" line="112"/>
+ <location filename="../gis/CGisListWks.cpp" line="114"/>
<source>Save</source>
<translation>Speichern</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="99"/>
+ <location filename="../gis/CGisListWks.cpp" line="101"/>
<source>Edit..</source>
<translation>Bearbeiten..</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="108"/>
+ <location filename="../gis/CGisListWks.cpp" line="110"/>
<source>Sort by Time</source>
<translation>Nach der Zeit sortieren</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="109"/>
+ <location filename="../gis/CGisListWks.cpp" line="111"/>
<source>Sort by Name</source>
<translation>Nach dem Namen sortieren</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="121"/>
+ <location filename="../gis/CGisListWks.cpp" line="123"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="130"/>
+ <location filename="../gis/CGisListWks.cpp" line="132"/>
<source>Update Project on Device</source>
<translation>Aktualisiere das Projekt auf dem Gerät</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="144"/>
+ <location filename="../gis/CGisListWks.cpp" line="146"/>
<source>Edit...</source>
<translation>Bearbeiten...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="100"/>
- <location filename="../gis/CGisListWks.cpp" line="145"/>
+ <location filename="../gis/CGisListWks.cpp" line="102"/>
+ <location filename="../gis/CGisListWks.cpp" line="147"/>
<source>Copy to...</source>
<translation>Kopieren nach...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="113"/>
+ <location filename="../gis/CGisListWks.cpp" line="115"/>
<source>Save as...</source>
<translation>Speichern unter...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="153"/>
+ <location filename="../gis/CGisListWks.cpp" line="155"/>
<source>Copy Track with Waypoints</source>
<translation>Track mit Wegpunkten kopieren</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="161"/>
+ <location filename="../gis/CGisListWks.cpp" line="163"/>
<source>Show Bubble</source>
<translation>Infoblase anzeigen</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="163"/>
+ <location filename="../gis/CGisListWks.cpp" line="165"/>
<source>Move Waypoint</source>
<translation>Wegpunkt verschieben</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="172"/>
+ <location filename="../gis/CGisListWks.cpp" line="174"/>
<source>Route Instructions</source>
<translation>Navigationsanweisungen</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="174"/>
+ <location filename="../gis/CGisListWks.cpp" line="176"/>
<source>Calculate Route</source>
<translation>Route berechnen</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="175"/>
+ <location filename="../gis/CGisListWks.cpp" line="177"/>
<source>Reset Route</source>
<translation>Route zurücksetzen</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="176"/>
+ <location filename="../gis/CGisListWks.cpp" line="178"/>
<source>Edit Route</source>
<translation>Route bearbeiten</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="177"/>
+ <location filename="../gis/CGisListWks.cpp" line="179"/>
<source>Convert to Track</source>
<translation>In einen Track umwandeln</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="193"/>
+ <location filename="../gis/CGisListWks.cpp" line="195"/>
<source>Create Route</source>
<translation>Route erstellen</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="622"/>
+ <location filename="../gis/CGisListWks.cpp" line="196"/>
+ <source>Change Icon (sel. waypt. only)</source>
+ <translation>Symbol änd. (nur ausgew. Wegp.)</translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="627"/>
<source>Drop items...</source>
<translation>Elemente verwerfen...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="647"/>
- <location filename="../gis/CGisListWks.cpp" line="1631"/>
- <location filename="../gis/CGisListWks.cpp" line="1669"/>
+ <location filename="../gis/CGisListWks.cpp" line="652"/>
+ <location filename="../gis/CGisListWks.cpp" line="1650"/>
+ <location filename="../gis/CGisListWks.cpp" line="1688"/>
<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="1178"/>
+ <location filename="../gis/CGisListWks.cpp" line="1197"/>
<source>Delete project...</source>
<translation>Projekt löschen...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1178"/>
+ <location filename="../gis/CGisListWks.cpp" line="1197"/>
<source>Do you really want to delete %1?</source>
<translation>Sind Sie sicher, dass sie %1 löschen wollen?</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="164"/>
+ <location filename="../gis/CGisListWks.cpp" line="166"/>
<source>Proj. Waypoint...</source>
<translation>Wegpunkt Projektion...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="147"/>
+ <location filename="../gis/CGisListWks.cpp" line="149"/>
<source>Track Profile</source>
<translation>Trackprofil</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="117"/>
+ <location filename="../gis/CGisListWks.cpp" line="119"/>
<source>Send to Devices</source>
<translation>Ans Gerät senden</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="149"/>
+ <location filename="../gis/CGisListWks.cpp" line="151"/>
<source>Select Range</source>
<translation>Bereich wählen</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="150"/>
+ <location filename="../gis/CGisListWks.cpp" line="152"/>
<source>Edit Track Points</source>
<translation>Trackpunkte bearbeiten</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="151"/>
+ <location filename="../gis/CGisListWks.cpp" line="153"/>
<source>Reverse Track</source>
<translation>Track umkehren</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="152"/>
+ <location filename="../gis/CGisListWks.cpp" line="154"/>
<source>Combine Tracks</source>
<translation>Tracks verbinden</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="186"/>
+ <location filename="../gis/CGisListWks.cpp" line="188"/>
<source>Edit Area Points</source>
<translation>Gebietspunkte bearbeiten</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="132"/>
- <location filename="../gis/CGisListWks.cpp" line="155"/>
+ <location filename="../gis/CGisListWks.cpp" line="134"/>
+ <location filename="../gis/CGisListWks.cpp" line="157"/>
<source>Delete</source>
<translation>Löschen</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="101"/>
+ <location filename="../gis/CGisListWks.cpp" line="103"/>
<source>Show on Map</source>
<translation>Auf der Karte anzeigen.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="102"/>
+ <location filename="../gis/CGisListWks.cpp" line="104"/>
<source>Hide from Map</source>
<translation>Auf der Karte ausblenden.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="114"/>
+ <location filename="../gis/CGisListWks.cpp" line="116"/>
<source>Save as GPX 1.1 w/o ext...</source>
<translation>Als GPX o. Erw. speichern...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="118"/>
+ <location filename="../gis/CGisListWks.cpp" line="120"/>
<source>Sync. with Database</source>
<translation>Mit der Datenbank synchronisieren</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="773"/>
+ <location filename="../gis/CGisListWks.cpp" line="778"/>
<source>Saving workspace. Please wait.</source>
<translation>Arbeitsplatz wird gespeichert. Bitte warten.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="819"/>
+ <location filename="../gis/CGisListWks.cpp" line="824"/>
<source>Loading workspace. Please wait.</source>
<translation>Arbeitsplatz laden. Bitte warten.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1155"/>
+ <location filename="../gis/CGisListWks.cpp" line="1174"/>
<source>Close all projects...</source>
<translation>Alle Projekte schließen...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1155"/>
+ <location filename="../gis/CGisListWks.cpp" line="1174"/>
<source>This will remove all projects from the workspace.</source>
<translation>Dies wird alle Projekte aus dem Arbeitsplatz entfernen.</translation>
</message>
@@ -1733,27 +1773,27 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<context>
<name>CGisWidget</name>
<message>
- <location filename="../gis/CGisWidget.cpp" line="139"/>
+ <location filename="../gis/CGisWidget.cpp" line="110"/>
<source>Load project...</source>
<translation>Lade Projekt...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="139"/>
+ <location filename="../gis/CGisWidget.cpp" line="110"/>
<source>The project "%1" is already in the workspace.</source>
<translation>Das Projekt "%1" ist schon im Arbeitsplatz geladen.</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="544"/>
+ <location filename="../gis/CGisWidget.cpp" line="515"/>
<source>Copy items...</source>
<translation>Elemente kopieren...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="672"/>
+ <location filename="../gis/CGisWidget.cpp" line="664"/>
<source>Cut Track...</source>
<translation>Track teilen...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="672"/>
+ <location filename="../gis/CGisWidget.cpp" line="664"/>
<source>Do you want to delete the original track?</source>
<translation>Wollen Sie den ursprünglichen Track löschen?</translation>
</message>
@@ -1940,48 +1980,48 @@ Zeile %2, Spalte %3:
<context>
<name>CMainWindow</name>
<message>
- <location filename="../CMainWindow.cpp" line="562"/>
+ <location filename="../CMainWindow.cpp" line="588"/>
<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="690"/>
+ <location filename="../CMainWindow.cpp" line="716"/>
<source>Ele: %1%2</source>
<translation>Höhe: %1%2</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="706"/>
+ <location filename="../CMainWindow.cpp" line="732"/>
<source>[Grid: %1]</source>
<translation>[Gitter: %1]</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="841"/>
+ <location filename="../CMainWindow.cpp" line="867"/>
<source>Load GIS Data...</source>
<translation>GIS Daten laden...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="875"/>
+ <location filename="../CMainWindow.cpp" line="901"/>
<source>Select output file</source>
<translation>Ausgabedatei auswählen</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="875"/>
<location filename="../CMainWindow.cpp" line="901"/>
+ <location filename="../CMainWindow.cpp" line="927"/>
<source>QMapShack View (*.view)</source>
<translation>QMapShack Ansicht (*.view)</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="901"/>
+ <location filename="../CMainWindow.cpp" line="927"/>
<source>Select file to load</source>
<translation>Zu ladende Datei auswählen</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1080"/>
+ <location filename="../CMainWindow.cpp" line="1106"/>
<source>Fatal...</source>
<translation>Schwerer Fehler...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1081"/>
+ <location filename="../CMainWindow.cpp" line="1107"/>
<source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your distribution to fix it.</source>
<translation>QMapShack hat eine unvollständig installierte Proj4 Bibliothek gefunden. Die Übersetzungstabellen für EPSG Projektionen, die normalerweise in /usr/share/proj installiert sind, fehlen. Bitte kontaktieren Sie den Paketbetreuer ihrer Distribution, um das zu beheben.</translation>
</message>
@@ -1989,7 +2029,7 @@ Zeile %2, Spalte %3:
<context>
<name>CMapDraw</name>
<message>
- <location filename="../map/CMapDraw.cpp" line="420"/>
+ <location filename="../map/CMapDraw.cpp" line="457"/>
<source>There are no maps right now. QMapShack is no fun without maps. You can install maps by pressing the 'Help! I want maps!' button in the 'Maps' dock window. Or you can press the F1 key to open the online documentation that tells you how to use QMapShack.
If it's no fun, why don't you provide maps? Well to host maps ready for download and installation requires a good server. And this is not a free service. The project lacks the money. Additionally map and DEM data has a copyright. Therefore the copyright holder has to be asked prior to package the data. This is not that easy as it might sound and for some data you have to pay royalties. The project simply lacks resources to do this. And we think installing the stuff yourself is [...]
@@ -2001,626 +2041,626 @@ Wenn QMapShack ohne Karten keinen Spaß macht, warum werden dann keine mitgelief
<context>
<name>CMapIMG</name>
<message>
- <location filename="../map/CMapIMG.cpp" line="145"/>
+ <location filename="../map/CMapIMG.cpp" line="146"/>
<source>Failed ...</source>
<translation>Fehlgeschlagen...</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="156"/>
+ <location filename="../map/CMapIMG.cpp" line="157"/>
<source>Unspecified</source>
<translation>Nicht angegeben</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="157"/>
+ <location filename="../map/CMapIMG.cpp" line="158"/>
<source>French</source>
<translation>Französisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="158"/>
+ <location filename="../map/CMapIMG.cpp" line="159"/>
<source>German</source>
<translation>Deutsch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="159"/>
+ <location filename="../map/CMapIMG.cpp" line="160"/>
<source>Dutch</source>
<translation>Niederländisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="160"/>
+ <location filename="../map/CMapIMG.cpp" line="161"/>
<source>English</source>
<translation>Englisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="161"/>
+ <location filename="../map/CMapIMG.cpp" line="162"/>
<source>Italian</source>
<translation>Italienisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="162"/>
+ <location filename="../map/CMapIMG.cpp" line="163"/>
<source>Finnish</source>
<translation>Finnisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="163"/>
+ <location filename="../map/CMapIMG.cpp" line="164"/>
<source>Swedish</source>
<translation>Schwedisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="164"/>
+ <location filename="../map/CMapIMG.cpp" line="165"/>
<source>Spanish</source>
<translation>Spanisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="165"/>
+ <location filename="../map/CMapIMG.cpp" line="166"/>
<source>Basque</source>
<translation>Baskisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="166"/>
+ <location filename="../map/CMapIMG.cpp" line="167"/>
<source>Catalan</source>
<translation>Katalanisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="167"/>
+ <location filename="../map/CMapIMG.cpp" line="168"/>
<source>Galician</source>
<translation>Galizisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="168"/>
+ <location filename="../map/CMapIMG.cpp" line="169"/>
<source>Welsh</source>
<translation>Walisisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="169"/>
+ <location filename="../map/CMapIMG.cpp" line="170"/>
<source>Gaelic</source>
<translation>Gälisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="170"/>
+ <location filename="../map/CMapIMG.cpp" line="171"/>
<source>Danish</source>
<translation>Dänisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="171"/>
+ <location filename="../map/CMapIMG.cpp" line="172"/>
<source>Norwegian</source>
<translation>Norwegisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="172"/>
+ <location filename="../map/CMapIMG.cpp" line="173"/>
<source>Portuguese</source>
<translation>Portugiesisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="173"/>
+ <location filename="../map/CMapIMG.cpp" line="174"/>
<source>Slovak</source>
<translation>Slowakisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="174"/>
+ <location filename="../map/CMapIMG.cpp" line="175"/>
<source>Czech</source>
<translation>Tschechisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="175"/>
+ <location filename="../map/CMapIMG.cpp" line="176"/>
<source>Croatian</source>
<translation>Kroatisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="176"/>
+ <location filename="../map/CMapIMG.cpp" line="177"/>
<source>Hungarian</source>
<translation>Ungarisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="177"/>
+ <location filename="../map/CMapIMG.cpp" line="178"/>
<source>Polish</source>
<translation>Polnisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="178"/>
+ <location filename="../map/CMapIMG.cpp" line="179"/>
<source>Turkish</source>
<translation>Türkisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="179"/>
+ <location filename="../map/CMapIMG.cpp" line="180"/>
<source>Greek</source>
<translation>Griechisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="180"/>
+ <location filename="../map/CMapIMG.cpp" line="181"/>
<source>Slovenian</source>
<translation>Slowenisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="181"/>
+ <location filename="../map/CMapIMG.cpp" line="182"/>
<source>Russian</source>
<translation>Russisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="182"/>
+ <location filename="../map/CMapIMG.cpp" line="183"/>
<source>Estonian</source>
<translation>Estnisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="183"/>
+ <location filename="../map/CMapIMG.cpp" line="184"/>
<source>Latvian</source>
<translation>Lettisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="184"/>
+ <location filename="../map/CMapIMG.cpp" line="185"/>
<source>Romanian</source>
<translation>Rumänisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="185"/>
+ <location filename="../map/CMapIMG.cpp" line="186"/>
<source>Albanian</source>
<translatorcomment>Albanisch</translatorcomment>
<translation>Albanisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="186"/>
+ <location filename="../map/CMapIMG.cpp" line="187"/>
<source>Bosnian</source>
<translation>Bosnisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="187"/>
+ <location filename="../map/CMapIMG.cpp" line="188"/>
<source>Lithuanian</source>
<translation>Litauisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="188"/>
+ <location filename="../map/CMapIMG.cpp" line="189"/>
<source>Serbian</source>
<translation>Serbisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="189"/>
+ <location filename="../map/CMapIMG.cpp" line="190"/>
<source>Macedonian</source>
<translation>Makedonisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="190"/>
+ <location filename="../map/CMapIMG.cpp" line="191"/>
<source>Bulgarian</source>
<translation>Bulgarisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="247"/>
+ <location filename="../map/CMapIMG.cpp" line="248"/>
<source>Major highway</source>
<translation>Autobahn</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="248"/>
+ <location filename="../map/CMapIMG.cpp" line="249"/>
<source>Principal highway</source>
<translation>Bundesstraße</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="249"/>
+ <location filename="../map/CMapIMG.cpp" line="250"/>
<source>Other highway</source>
<translation>Schnellstraße</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="250"/>
+ <location filename="../map/CMapIMG.cpp" line="251"/>
<source>Arterial road</source>
<translation>Fernstraße</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="251"/>
+ <location filename="../map/CMapIMG.cpp" line="252"/>
<source>Collector road</source>
<translation>Sammelstraße</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="252"/>
+ <location filename="../map/CMapIMG.cpp" line="253"/>
<source>Residential street</source>
<translation>Wohnstraße</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="253"/>
+ <location filename="../map/CMapIMG.cpp" line="254"/>
<source>Alley/Private road</source>
<translation>Allee/Privatstraße</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="254"/>
+ <location filename="../map/CMapIMG.cpp" line="255"/>
<source>Highway ramp, low speed</source>
<translation>Auffahrt (langsam)</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="255"/>
+ <location filename="../map/CMapIMG.cpp" line="256"/>
<source>Highway ramp, high speed</source>
<translation>Auffahrt (schnell)</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="256"/>
+ <location filename="../map/CMapIMG.cpp" line="257"/>
<source>Unpaved road</source>
<translation>Unbefestigte Straße</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="257"/>
+ <location filename="../map/CMapIMG.cpp" line="258"/>
<source>Major highway connector</source>
<translation>Autobahnzubringer</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="258"/>
+ <location filename="../map/CMapIMG.cpp" line="259"/>
<source>Roundabout</source>
<translation>Kreisverkehr</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="259"/>
+ <location filename="../map/CMapIMG.cpp" line="260"/>
<source>Railroad</source>
<translation>Eisenbahn</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="260"/>
+ <location filename="../map/CMapIMG.cpp" line="261"/>
<source>Shoreline</source>
<translation>Küstenlinie</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="261"/>
+ <location filename="../map/CMapIMG.cpp" line="262"/>
<source>Trail</source>
<translation></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="262"/>
+ <location filename="../map/CMapIMG.cpp" line="263"/>
<source>Stream</source>
<translation>Bach</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="263"/>
+ <location filename="../map/CMapIMG.cpp" line="264"/>
<source>Time zone</source>
<translation>Zeitzone</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="264"/>
<location filename="../map/CMapIMG.cpp" line="265"/>
+ <location filename="../map/CMapIMG.cpp" line="266"/>
<source>Ferry</source>
<translation>Fähre</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="266"/>
+ <location filename="../map/CMapIMG.cpp" line="267"/>
<source>State/province border</source>
<translation>Staats-/Landesgrenze</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="267"/>
+ <location filename="../map/CMapIMG.cpp" line="268"/>
<source>County/parish border</source>
<translation>Kreis-/Gemeindegrenze</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="268"/>
+ <location filename="../map/CMapIMG.cpp" line="269"/>
<source>International border</source>
<translation>Internationale Grenze</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="269"/>
+ <location filename="../map/CMapIMG.cpp" line="270"/>
<source>River</source>
<translation>Fluss</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="270"/>
+ <location filename="../map/CMapIMG.cpp" line="271"/>
<source>Minor land contour</source>
<translation>Höhenlinie klein</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="271"/>
+ <location filename="../map/CMapIMG.cpp" line="272"/>
<source>Intermediate land contour</source>
<translation>Höhenlinie mittel</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="272"/>
+ <location filename="../map/CMapIMG.cpp" line="273"/>
<source>Major land contour</source>
<translation>Höhenlinie groß</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="273"/>
+ <location filename="../map/CMapIMG.cpp" line="274"/>
<source>Minor depth contour</source>
<translation>Tiefenlinie klein</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="274"/>
+ <location filename="../map/CMapIMG.cpp" line="275"/>
<source>Intermediate depth contour</source>
<translation>Tiefenlinie mittel</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="275"/>
+ <location filename="../map/CMapIMG.cpp" line="276"/>
<source>Major depth contour</source>
<translation>Tiefenlinie groß</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="276"/>
+ <location filename="../map/CMapIMG.cpp" line="277"/>
<source>Intermittent stream</source>
<translation>Intermittierender Bach</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="277"/>
- <location filename="../map/CMapIMG.cpp" line="359"/>
+ <location filename="../map/CMapIMG.cpp" line="278"/>
+ <location filename="../map/CMapIMG.cpp" line="360"/>
<source>Airport runway</source>
<translation>Landebahn</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="278"/>
+ <location filename="../map/CMapIMG.cpp" line="279"/>
<source>Pipeline</source>
<translation>Pipeline</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="279"/>
+ <location filename="../map/CMapIMG.cpp" line="280"/>
<source>Powerline</source>
<translation>Stromleitung</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="280"/>
+ <location filename="../map/CMapIMG.cpp" line="281"/>
<source>Marine boundary</source>
<translation>Meeresgrenze</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="281"/>
+ <location filename="../map/CMapIMG.cpp" line="282"/>
<source>Hazard boundary</source>
<translation>Gefahrbereichgrenze</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="346"/>
+ <location filename="../map/CMapIMG.cpp" line="347"/>
<source>Large urban area (>200K)</source>
<translation>Großes Wohngebiet (>200K)</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="347"/>
+ <location filename="../map/CMapIMG.cpp" line="348"/>
<source>Small urban area (<200K)</source>
<translation>Kleines Wohngebiet (<200K)</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="348"/>
+ <location filename="../map/CMapIMG.cpp" line="349"/>
<source>Rural housing area</source>
<translation>Ländliches Wohngebiet</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="349"/>
+ <location filename="../map/CMapIMG.cpp" line="350"/>
<source>Military base</source>
<translation>Militärbasis</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="350"/>
+ <location filename="../map/CMapIMG.cpp" line="351"/>
<source>Parking lot</source>
<translation>Parkplatz</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="351"/>
+ <location filename="../map/CMapIMG.cpp" line="352"/>
<source>Parking garage</source>
<translation>Parkhaus</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="352"/>
+ <location filename="../map/CMapIMG.cpp" line="353"/>
<source>Airport</source>
<translation>Flugplatz</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="353"/>
+ <location filename="../map/CMapIMG.cpp" line="354"/>
<source>Shopping center</source>
<translation>Einkaufszentrum</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="354"/>
+ <location filename="../map/CMapIMG.cpp" line="355"/>
<source>Marina</source>
<translation>Jachthafen</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="355"/>
+ <location filename="../map/CMapIMG.cpp" line="356"/>
<source>University/College</source>
<translation>Universität/Hochschule</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="356"/>
+ <location filename="../map/CMapIMG.cpp" line="357"/>
<source>Hospital</source>
<translation>Krankenhaus</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="357"/>
+ <location filename="../map/CMapIMG.cpp" line="358"/>
<source>Industrial complex</source>
<translation>Industrie</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="358"/>
+ <location filename="../map/CMapIMG.cpp" line="359"/>
<source>Reservation</source>
<translation>Schutzgebiet</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="360"/>
+ <location filename="../map/CMapIMG.cpp" line="361"/>
<source>Man-made area</source>
<translation>Fabrikgelände</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="361"/>
+ <location filename="../map/CMapIMG.cpp" line="362"/>
<source>Sports complex</source>
<translation>Sportanlage</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="362"/>
+ <location filename="../map/CMapIMG.cpp" line="363"/>
<source>Golf course</source>
<translation>Golfplatz</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="363"/>
+ <location filename="../map/CMapIMG.cpp" line="364"/>
<source>Cemetery</source>
<translation>Friedhof</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="364"/>
<location filename="../map/CMapIMG.cpp" line="365"/>
<location filename="../map/CMapIMG.cpp" line="366"/>
+ <location filename="../map/CMapIMG.cpp" line="367"/>
<source>National park</source>
<translation>Nationalpark</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="367"/>
+ <location filename="../map/CMapIMG.cpp" line="368"/>
<source>City park</source>
<translation>Stadtpark</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="368"/>
<location filename="../map/CMapIMG.cpp" line="369"/>
<location filename="../map/CMapIMG.cpp" line="370"/>
+ <location filename="../map/CMapIMG.cpp" line="371"/>
<source>State park</source>
<translation></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="371"/>
+ <location filename="../map/CMapIMG.cpp" line="372"/>
<source>Forest</source>
<translation>Wald</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="372"/>
+ <location filename="../map/CMapIMG.cpp" line="373"/>
<source>Ocean</source>
<translation>Ozean</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="373"/>
- <location filename="../map/CMapIMG.cpp" line="375"/>
- <location filename="../map/CMapIMG.cpp" line="385"/>
+ <location filename="../map/CMapIMG.cpp" line="374"/>
+ <location filename="../map/CMapIMG.cpp" line="376"/>
+ <location filename="../map/CMapIMG.cpp" line="386"/>
<source>Blue (unknown)</source>
<translation></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="374"/>
+ <location filename="../map/CMapIMG.cpp" line="375"/>
<source>Sea</source>
<translation>Meer</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="376"/>
<location filename="../map/CMapIMG.cpp" line="377"/>
- <location filename="../map/CMapIMG.cpp" line="384"/>
+ <location filename="../map/CMapIMG.cpp" line="378"/>
+ <location filename="../map/CMapIMG.cpp" line="385"/>
<source>Large lake</source>
<translation>See</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="378"/>
<location filename="../map/CMapIMG.cpp" line="379"/>
+ <location filename="../map/CMapIMG.cpp" line="380"/>
<source>Medium lake</source>
<translation>See</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="380"/>
<location filename="../map/CMapIMG.cpp" line="381"/>
+ <location filename="../map/CMapIMG.cpp" line="382"/>
<source>Small lake</source>
<translation>See</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="382"/>
<location filename="../map/CMapIMG.cpp" line="383"/>
+ <location filename="../map/CMapIMG.cpp" line="384"/>
<source>Major lake</source>
<translation>See</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="386"/>
+ <location filename="../map/CMapIMG.cpp" line="387"/>
<source>Major River</source>
<translation>Strom</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="387"/>
+ <location filename="../map/CMapIMG.cpp" line="388"/>
<source>Large River</source>
<translation>Fluss</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="388"/>
+ <location filename="../map/CMapIMG.cpp" line="389"/>
<source>Medium River</source>
<translation>Fluss</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="389"/>
+ <location filename="../map/CMapIMG.cpp" line="390"/>
<source>Small River</source>
<translation>Fluss</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="392"/>
+ <location filename="../map/CMapIMG.cpp" line="393"/>
<source>Intermittent water</source>
<translation>Gewässer</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="393"/>
+ <location filename="../map/CMapIMG.cpp" line="394"/>
<source>Wetland/Swamp</source>
<translation>Feuchtgebiet/Sumpf</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="394"/>
+ <location filename="../map/CMapIMG.cpp" line="395"/>
<source>Glacier</source>
<translation>Gletscher</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="395"/>
+ <location filename="../map/CMapIMG.cpp" line="396"/>
<source>Orchard/Plantation</source>
<translation>Obstgarten/Plantage</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="396"/>
+ <location filename="../map/CMapIMG.cpp" line="397"/>
<source>Scrub</source>
<translation>Buschwerk</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="397"/>
+ <location filename="../map/CMapIMG.cpp" line="398"/>
<source>Tundra</source>
<translation>Tundra</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="398"/>
+ <location filename="../map/CMapIMG.cpp" line="399"/>
<source>Flat</source>
<translation>Ebene</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="399"/>
+ <location filename="../map/CMapIMG.cpp" line="400"/>
<source>???</source>
<translation></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="435"/>
+ <location filename="../map/CMapIMG.cpp" line="436"/>
<source>Failed to read: </source>
<translation>Lesen fehlgeschlagen:</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="478"/>
+ <location filename="../map/CMapIMG.cpp" line="479"/>
<source>Failed to open: </source>
<translation>Öffnen fehlgeschlagen:</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="502"/>
- <location filename="../map/CMapIMG.cpp" line="506"/>
+ <location filename="../map/CMapIMG.cpp" line="503"/>
+ <location filename="../map/CMapIMG.cpp" line="507"/>
<source>Bad file format: </source>
<translation>Falsches Format:</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="595"/>
+ <location filename="../map/CMapIMG.cpp" line="596"/>
<source>Failed to read file structure: </source>
<translation>Lesen der Dateistruktur fehlgeschlagen:</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="630"/>
+ <location filename="../map/CMapIMG.cpp" line="631"/>
<source>Loading %1</source>
<translation>Lädt %1</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="636"/>
+ <location filename="../map/CMapIMG.cpp" line="637"/>
<source>User abort: </source>
<translation>Benutzerabbruch:</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="639"/>
+ <location filename="../map/CMapIMG.cpp" line="640"/>
<source>File is NT format. QMapShack is unable to read map files with NT format: </source>
<translation>Die Datei hat das NT Format. QMapShack kann dieses Format nicht lesen:</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="730"/>
+ <location filename="../map/CMapIMG.cpp" line="731"/>
<source>File contains locked / encrypted data. Garmin does not want you to use this file with any other software than the one supplied by Garmin.</source>
<translation>Die Datei enthält verschlüsselte Daten. Garmin möchte nicht, dass diese Datei mit einer anderen Software, als der von Garmin bereitgestellten, benutzt wird.</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2305"/>
- <location filename="../map/CMapIMG.cpp" line="2311"/>
- <location filename="../map/CMapIMG.cpp" line="2315"/>
+ <location filename="../map/CMapIMG.cpp" line="2342"/>
+ <location filename="../map/CMapIMG.cpp" line="2348"/>
+ <location filename="../map/CMapIMG.cpp" line="2352"/>
<source>Point of Interest</source>
<translation>Ort von Interesse</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2401"/>
+ <location filename="../map/CMapIMG.cpp" line="2438"/>
<source>Unknown</source>
<translation>Unbekannt</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2443"/>
- <location filename="../map/CMapIMG.cpp" line="2451"/>
- <location filename="../map/CMapIMG.cpp" line="2458"/>
+ <location filename="../map/CMapIMG.cpp" line="2480"/>
+ <location filename="../map/CMapIMG.cpp" line="2488"/>
+ <location filename="../map/CMapIMG.cpp" line="2495"/>
<source>Area</source>
<translation>Gebiet</translation>
</message>
@@ -2666,7 +2706,7 @@ Wenn QMapShack ohne Karten keinen Spaß macht, warum werden dann keine mitgelief
<message>
<location filename="../map/CMapPathSetup.cpp" line="47"/>
<source>Add or remove paths containing maps. There can be multiple maps in a path but no sub-path is parsed. Supported formats are: %1</source>
- <translation>Hinzufügen oder Entfernen von Karten. In einem Verzeichnis können mehrere Karten liegen. Unterverzeichnisse werden jedoch nicht durchsucht. Unterstützte Formate sind: %1 </translation>
+ <translation>Hinzufügen oder Entfernen von Verzeichnissen mit Karten. In einem Verzeichnis können mehrere Karten liegen. Unterverzeichnisse werden jedoch nicht durchsucht. Unterstützte Formate sind: %1 </translation>
</message>
<message>
<location filename="../map/CMapPathSetup.cpp" line="62"/>
@@ -2767,7 +2807,7 @@ Zeile %2, Spalte %3:
<location filename="../map/CMapVRT.cpp" line="45"/>
<location filename="../map/CMapVRT.cpp" line="59"/>
<location filename="../map/CMapVRT.cpp" line="88"/>
- <location filename="../map/CMapVRT.cpp" line="126"/>
+ <location filename="../map/CMapVRT.cpp" line="133"/>
<source>Error...</source>
<translation>Fehler...</translation>
</message>
@@ -2783,7 +2823,7 @@ Zeile %2, Spalte %3:
<translation>Die Datei muss eine 8 bit Palette oder Graustufen haben.</translation>
</message>
<message>
- <location filename="../map/CMapVRT.cpp" line="126"/>
+ <location filename="../map/CMapVRT.cpp" line="133"/>
<source>No georeference information found.</source>
<translation>Keine Georeferenzierung gefunden.</translation>
</message>
@@ -2791,22 +2831,22 @@ Zeile %2, Spalte %3:
<context>
<name>CMapVrtBuilder</name>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="28"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="29"/>
<source>Build GDAL VRT</source>
<translation>GDAL VRT erstellen</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="46"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="47"/>
<source>Select files...</source>
<translation>Dateien auswählen...</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="70"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="71"/>
<source>Select target file...</source>
<translation>Zieldatei auswählen...</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="114"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="115"/>
<source>!!! done !!!
</source>
<translation>!!! erledigt !!!</translation>
@@ -2937,36 +2977,41 @@ Unbekannte Struktur.</translation>
<name>CMouseNormal</name>
<message>
<location filename="../mouse/CMouseNormal.cpp" line="39"/>
+ <source>Add POI as Waypoint</source>
+ <translation>POI als Wegpunkt hinzufügen</translation>
+ </message>
+ <message>
+ <location filename="../mouse/CMouseNormal.cpp" line="40"/>
<source>Add Waypoint</source>
<translation>Wegpunkt hinzufügen</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="40"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="41"/>
<source>Add Track</source>
<translation>Track hinzufügen</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="41"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="42"/>
<source>Add Route</source>
<translation>Route hinzufügen</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="42"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="43"/>
<source>Add Area</source>
<translation>Gebiet hinzufügen</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="44"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="45"/>
<source>Select Items On Map</source>
<translation>Elemente auf der Karte auswählen</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="46"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="47"/>
<source>Copy position</source>
<translation>Position kopieren</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="47"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="48"/>
<source>Copy position (Grid)</source>
<translation>Position kopieren (Gitter)</translation>
</message>
@@ -2982,7 +3027,7 @@ Unbekannte Struktur.</translation>
<context>
<name>CMouseRangeTrk</name>
<message>
- <location filename="../mouse/CMouseRangeTrk.cpp" line="227"/>
+ <location filename="../mouse/CMouseRangeTrk.cpp" line="224"/>
<source><b>Select Range</b><br/>Select first track point with left mouse button. And then a second one. Leave range selection with a click of the right mouse button.<br/></source>
<translation><b>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>
@@ -2990,32 +3035,32 @@ Unbekannte Struktur.</translation>
<context>
<name>CMouseSelect</name>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="31"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="32"/>
<source><b>Select Items On Map</b><br/>Select a rectangular area on the map. Use the left mouse button and move the mouse. Abort with a right click. Adjust the selection by point-click-move on the corners.</source>
<translation><b>Elemente auf der Karte wählen</b><br/>Wählen Sie mit der linken Maustaste einen rechteckigen Bereich auf der Karte aus. Abbruch mit Rechtsklick. Die Auswahl kann durch Verschieben der Eckpunkte mit der Maus angepasst werden.</translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="96"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="98"/>
<source><b>Selected:</b><br/></source>
<translation><b>Ausgewählt:</b><br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="99"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="101"/>
<source>%1 tracks<br/></source>
<translation>%1 Tracks<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="104"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="106"/>
<source>%1 waypoints<br/></source>
<translation>%1 Wegpunkte<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="109"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="111"/>
<source>%1 routes<br/></source>
<translation>%1 Routen<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="114"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="116"/>
<source>%1 areas<br/></source>
<translation>%1 Gebiete<br/></translation>
</message>
@@ -3108,7 +3153,7 @@ y: %4 m/px</translation>
<translation>Verstrichene Zeit: %1</translation>
</message>
<message>
- <location filename="../helpers/CProgressDialog.cpp" line="82"/>
+ <location filename="../helpers/CProgressDialog.cpp" line="86"/>
<source>Elapsed time: %1 seconds.</source>
<translation>Verstrichene Zeit: %1 Sekunden.</translation>
</message>
@@ -3339,6 +3384,458 @@ ist keine gültige Koordinatensystemdefinition:
</message>
</context>
<context>
+ <name>CRouterBRouter</name>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="49"/>
+ <source>original</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="50"/>
+ <source>first alternative</source>
+ <translation>erste Variante</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="51"/>
+ <source>second alternative</source>
+ <translation>zweite Variante</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="52"/>
+ <source>third alternative</source>
+ <translation>dritte Variante</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="147"/>
+ <source>BRouter (offline)</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="152"/>
+ <source>BRouter (online)</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="180"/>
+ <source>profile: %1, alternative: %2</source>
+ <translation>Profil: %1, Variante: %2</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="267"/>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="381"/>
+ <source>response is empty</source>
+ <translation>Anwort ist leer</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="304"/>
+ <source>Bad response from server: %1</source>
+ <translation>Fehlerhafte Serverantwort: %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="352"/>
+ <source><b>BRouter</b><br/>Routing request sent to server. Please wait...</source>
+ <translation><b>BRouter</b><br/>Routen-anfrage an den Server geschickt. Bitte warten...</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="246"/>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="355"/>
+ <source>Calculate route with %1</source>
+ <translation>Berechne Route mit %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="415"/>
+ <source><b>BRouter</b><br/>Bad response from server:<br/>%1</source>
+ <translation><b>BRouter</b><br/>Fehler-Antwort vom Server<br/>%1</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="405"/>
+ <source><br/>Calculation time: %1s</source>
+ <translation><br/>Berechnungszeit: %1 s</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="509"/>
+ <source>Error</source>
+ <translation>Fehler</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="561"/>
+ <source>running</source>
+ <translation>wird ausgeführt</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="553"/>
+ <source>starting</source>
+ <translation>started</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="515"/>
+ <source>QMapShack communicates with BRouter via a network connection. Usually this is done on a special address that can't be reached from outside your device. However BRouter listens for connections on all available interfaces. If you are in your own private network with an active firewall, this is not much of a problem. If you are in a public network every open port is a risk as it can be used by someone else to compromise your system. We do not recommend to use the local [...]
+ <translation>QMapShack kommuniziert mit BRouter über eine Netzwerkverbindung. Normalerweise wird das über eine spezielle Addresse gemacht, die von außen nicht zugänglich ist. Allerdings horcht BRouter auf allen verfügbaren Netzwerkschnittstellen. Wenn Sie in ihrem eigenen privaten Netzwerk mit einer aktiven Firewall sind, ist das kein großes Problem. Wenn Sie in einem öffentlichen Netzwerk sind, stellt jeder offene Zugang ein Risiko dar, weil er von jemanden missbraucht werden ka [...]
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="542"/>
+ <source>Warning...</source>
+ <translation>Warnung...</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="547"/>
+ <source>I understand the risk. Don't tell me again.</source>
+ <translation>Ich verstehe das Risiko. Bitte nicht mehr zeigen.</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="568"/>
+ <source>stopped</source>
+ <translation>angehalten</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="579"/>
+ <source>not installed</source>
+ <translation>nicht installiert</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="590"/>
+ <source>online</source>
+ <translation></translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterSetup</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="479"/>
+ <source>%1 not accessible</source>
+ <translation>%1 ist nicht erreichbar</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="489"/>
+ <source>%1 invalid result</source>
+ <translation>ungültige Antwort von %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="533"/>
+ <source>Error parsing online-config:</source>
+ <translation>Fehler beim Auswerten der Online-konfiguration:</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="538"/>
+ <source>Network error:</source>
+ <translation>Netzwerk Fehler:</translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterSetupWizard</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="38"/>
+ <source>Restore Default Values</source>
+ <translation>Vorgabewerte wiederherstellen</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="371"/>
+ <source>Open Directory</source>
+ <translation>Verzeichnis öffnen</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="378"/>
+ <source>select Java Executable</source>
+ <translation>installiertes Java-Programm auswählen</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="414"/>
+ <source>please select BRouter installation directory</source>
+ <translation>bitte das BRouter Installations-Verzeichnis auswählen</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="419"/>
+ <source>selected directory does not exist</source>
+ <translation>ausgewähltes Verzeichnis existiert nicht</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="420"/>
+ <source>create directory and install BRouter there</source>
+ <translation>Verzeichnis anlegen und BRouter darin installieren</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="427"/>
+ <source>existing BRouter installation</source>
+ <translation>vorhandene BRouter-Installation gefunden</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="428"/>
+ <source>update existing BRouter installation</source>
+ <translation>vorhandene BRouter-Installation aktualisieren</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="433"/>
+ <source>empty directory, create new BRouter installation here</source>
+ <translation>leeres Verzeichnis, neue BRouter-Installation hier einrichten</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="434"/>
+ <source>create new BRouter installation</source>
+ <translation>neue BRouter-Installaion erzeugen</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="442"/>
+ <source>seems to be a valid Java-executable</source>
+ <translation>es scheint eine gültige Java Installation zu geben</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="446"/>
+ <source>doesn't seem to be a valid Java-executable</source>
+ <translation>es scheint keine gültige Java Installation zu geben</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="451"/>
+ <source>Java Executable not found</source>
+ <translation>Java Programm nicht gefunden</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="496"/>
+ <source>Error loading installation-page at %1</source>
+ <translation>Fehler beim Laden der Installationsseite von %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="505"/>
+ <source>no brouter-version to install selected</source>
+ <translation>keine BRouter-Version zum Installieren ausgewählt</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="513"/>
+ <source>selected %1 for download and installation</source>
+ <translation>%1 zum Herunterladen und Installieren ausgewählt</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="524"/>
+ <source>Warning...</source>
+ <translation>Warnung...</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="529"/>
+ <source>Download: %1<br/><br/>This will download and install a zip file from a download location that is not secured by any standard at all, using plain HTTP. Usually this should be HTTPS. The risk is someone redirecting the request and sending you a replacement zip with malware. There is no way for QMapShack to detect this. <br/>If you do not understand this or if you are in doubt, do not proceed and abort. Use the Web version of BRouter instead.</source>
+ <translation>Download: %1<br/><br/>Sie sind dabei eine ZIP Datei aus dem Netz zu laden und zu installieren. Dies Aktion ist nach keinem Standard gesichert und benutzt nur HTTP. Es sollte aber HTTPS sein. Sie haben damit das Risiko, dass jemand die Verbindung umleitet und Ihnen eine Datei mit Schadsoftware sendet. QMapShack kann das nicht unterscheiden. <br/>Wenn Si das nicht verstanden haben oder im Zweifel sind, brechen Sie hier ab. Benützen Sie stattdessen die [...]
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="541"/>
+ <source>I understand the risk and wish to proceed.</source>
+ <translation>Ich verstehe das Risiko und möchte weiter machen.</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="553"/>
+ <source>download %1 started</source>
+ <translation>Herunterladen von %1 gestartet</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="565"/>
+ <source>Network Error: %1</source>
+ <translation>Netzwerkfehler: %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="586"/>
+ <source>download %1 finished</source>
+ <translation>Herunterladen von %1 ist fertig</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="588"/>
+ <source>unzipping:</source>
+ <translation>entpacken:</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="593"/>
+ <source>ready.</source>
+ <translation>fertig.</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="613"/>
+ <source>download of brouter failed: %1</source>
+ <translation>Herunterladen von BRouter fehlgeschlagen: %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="623"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="630"/>
+ <source>retrieving available profiles from %1</source>
+ <translation>Unter %1 verfügbare Profile werden ermittelt</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="654"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="736"/>
+ <source>content of profile</source>
+ <translation>Profil-Inhalt</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="729"/>
+ <source>Error:</source>
+ <translation>Fehler:</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="466"/>
+ <source>Error creating directory %1</source>
+ <translation>Fehler beim Anlegen des Verzeichnisses %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="571"/>
+ <source>Error directory %1 does not exist</source>
+ <translation>Fehler: Das Verzeichnis %1 existiert nicht</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="578"/>
+ <source>Error creating file %1</source>
+ <translation>Fehler beim Anlegen der Datei %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="582"/>
+ <source>Error writing to file %1</source>
+ <translation>Fehler beim Schreiben der Datei %1</translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterTilesPage</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesPage.cpp" line="82"/>
+ <source>Continue with Setup</source>
+ <translation>weiter Einrichten</translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterTilesSelect</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="98"/>
+ <source>available routing-data is being determined.</source>
+ <translation>verfügbare Routing-daten werden ermittelt.</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="108"/>
+ <source>Select outdated</source>
+ <translation>Veraltete Daten auswählen</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="109"/>
+ <source>Clear Selection</source>
+ <translation>Auswahl aufheben</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="110"/>
+ <source>Delete selection</source>
+ <translation>Ausgewählte Daten löschen</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="111"/>
+ <source>Download</source>
+ <translation>Herunterladen</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="281"/>
+ <source>Error creating segments directory %1</source>
+ <translation>Fehler beim Anlegen des Verzeichniss für die Routingdaten %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="365"/>
+ <source>cannot parse: %1 is not a date</source>
+ <translation>nicht interpretierbar: %1 ist kein Datum</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="390"/>
+ <source>cannot parse: %1 is not a valid size</source>
+ <translation>nicht interpretierbar: %1 ist keine gültige Größenangabe</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="409"/>
+ <source>Error retrieving available routing data from %1: %2</source>
+ <translation>Fehler beim Abruf der verfügbaren Routingdaten von %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="490"/>
+ <source>segments directory does not exist: </source>
+ <translation>Das Verzeichniss für die Routingdaten existiert nicht:</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="504"/>
+ <source>error creating file %1: %2</source>
+ <translation>Fehler beim Anlegen der Datei %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="536"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="576"/>
+ <source>no valid request for filename %1</source>
+ <translation>keine gültige Netzwerkanfrage für die Datei %1 vorhanden</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="541"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="584"/>
+ <source>no open file assigned to request for %1</source>
+ <translation>der Netzwerkanfrage für %1 ist keine offene Datei zugeordnet</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="551"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="594"/>
+ <source>error writing to file %1: %2</source>
+ <translation>Fehler beim Schreiben der Datei %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="602"/>
+ <source>error renaming file %1 to %2: %3</source>
+ <translation>Fehler beim Umbenennen der Datei von %1 nach %2: %3</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="685"/>
+ <source>up-to-date: %1 (%2), outdated: %3 (%4), to be downloaded: %5 (%6)</source>
+ <translation>Aktuell: %1 (%2), Veraltet: %3 (%4), noch Herunterzuladen: %5 (%6)</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="783"/>
+ <source>being downloaded: %1 of %2</source>
+ <translation>wird heruntergeladen: %1 von %2</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="803"/>
+ <source>no local data, online available: %1 (%2)</source>
+ <translation>lokale keine Daten. Verfügbar: %1 (%2)</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="789"/>
+ <source>local data outdated (%1, %2 - remote %3, %4)</source>
+ <translation>lokale Daten veraltet (%1, %2 - auf dem Server: %3, %4)</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="190"/>
+ <source>Error removing %1: %2</source>
+ <translation>Fehler beim Löschen der Datei %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="321"/>
+ <source>Network Error</source>
+ <translation>Netzwerkfehler</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="330"/>
+ <source>invalid result, no files found</source>
+ <translation>ungültige Anwort, keine Dateien gefunden</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="797"/>
+ <source>local data up to date (%1, %2)</source>
+ <translation>lokale Daten sind aktuell (%1, %2)</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="809"/>
+ <source>no routing-data available</source>
+ <translation>keine Routing-daten verfügbar</translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterToolShell</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="74"/>
+ <source>!!! done !!!
+</source>
+ <translation>!!! erledigt !!!</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="79"/>
+ <source>!!! failed !!!
+</source>
+ <translation>!!! fehlgeschlagen !!!</translation>
+ </message>
+</context>
+<context>
<name>CRouterMapQuest</name>
<message>
<location filename="../gis/rte/router/CRouterMapQuest.cpp" line="37"/>
@@ -3661,7 +4158,6 @@ ist keine gültige Koordinatensystemdefinition:
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="55"/>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="238"/>
<source>Warning...</source>
<translation>Warnung...</translation>
</message>
@@ -3672,18 +4168,13 @@ ist keine gültige Koordinatensystemdefinition:
<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"/>
- <source>%1: Due to limitations in the Windows POSIX API Routino can't handle files larger than 4GB.</source>
- <translation>%1: Aufgrund der Einschränkungen der Windows POSIX API können Dateien, die größer als 4GB sind, nicht bearbeitet werden.</translation>
- </message>
- <message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="338"/>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="425"/>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="332"/>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="419"/>
<source>Calculate route with %1</source>
<translation>Berechne Route mit %1</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="346"/>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="340"/>
<source><br/>Calculation time: %1s</source>
<translation><br/>Berechnungszeit: %1 s</translation>
</message>
@@ -3691,12 +4182,12 @@ ist keine gültige Koordinatensystemdefinition:
<context>
<name>CRouterRoutinoPathSetup</name>
<message>
- <location filename="../gis/rte/router/CRouterRoutinoPathSetup.cpp" line="40"/>
+ <location filename="../gis/rte/router/routino/CRouterRoutinoPathSetup.cpp" line="40"/>
<source>Add or remove paths containing Routino data. There can be multiple databases in a path but no sub-path is parsed.</source>
<translation>Pfade mit Routino Daten hinzufügen oder entfernen. In einem Pfad können mehrere Datenbanken sein. Teilpfade werden nicht geparst.</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutinoPathSetup.cpp" line="55"/>
+ <location filename="../gis/rte/router/routino/CRouterRoutinoPathSetup.cpp" line="55"/>
<source>Select routing data file path...</source>
<translation>Pfad für Routingdatendatei wählen...</translation>
</message>
@@ -3704,35 +4195,40 @@ ist keine gültige Koordinatensystemdefinition:
<context>
<name>CRouterSetup</name>
<message>
- <location filename="../gis/rte/router/CRouterSetup.cpp" line="36"/>
+ <location filename="../gis/rte/router/CRouterSetup.cpp" line="38"/>
<source>Routino (offline)</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterSetup.cpp" line="37"/>
- <source>MapQuest (online)</source>
+ <location filename="../gis/rte/router/CRouterSetup.cpp" line="39"/>
+ <source>MapQuest (online)</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterSetup.cpp" line="40"/>
+ <source>BRouter (online)</source>
<translation></translation>
</message>
</context>
<context>
<name>CRoutinoDatabaseBuilder</name>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="32"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="33"/>
<source>Create Routino Database</source>
<translation>Routino Datenbank erstellen</translation>
</message>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="56"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="57"/>
<source>Select files...</source>
<translation>Dateien auswählen...</translation>
</message>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="80"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="81"/>
<source>Select target path...</source>
<translation>Zielpfad auswählen...</translation>
</message>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="141"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="142"/>
<source>!!! done !!!
</source>
<translation>!!! erledigt !!!</translation>
@@ -3940,6 +4436,104 @@ Zeile %2, Spalte %3:
</message>
</context>
<context>
+ <name>CTcxProject</name>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="51"/>
+ <source>Failed to load file %1...</source>
+ <translation>Datei %1 konnte nicht geladen werden...</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="73"/>
+ <source>Failed to open %1</source>
+ <translation>Die Datei %1 konnte nicht geöffnet werden</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="84"/>
+ <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+ <translation>Fehler beim Lesen: %1
+Zeile %2, Spalte %3:
+ %4</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="91"/>
+ <source>Not a TCX file: %1</source>
+ <translation>Keine TCX Datei: %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="101"/>
+ <source>This TCX file contains at least 1 workout, but neither an activity nor a course. As workouts do not contain position data, they can not be imported to QMapShack.</source>
+ <translation>Diese TCX Datei enthält mindestens einen Workout, aber keine Aktivität oder einen Kurs. Da Workouts keine Positionsdaten beinhalten, können sie nicht in QMapShack geladen werden.</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="106"/>
+ <source>This TCX file does not contain any activity or course: %1</source>
+ <translation>Diese TCX Datei enthält keine Aktivität oder Runden: %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="275"/>
+ <source>File exists ...</source>
+ <translation>Datei existiert...</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="276"/>
+ <source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file. Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
+ <translation>Die Datei existiert schon und wurde nicht mit QMapShack erstellt. Wenn Sie 'Ja' drücken werden die ursprünglichen Daten verloren gehen. Auch wenn die Datei mit QMapShack geladen wurde. QMapShack ist möglicherweise nicht in der Lage alle Daten zu laden und wieder zu speichern. Diese Daten werden verloren gehen. Wir empfehlen eine andere Datei zu benutzen. <b>Wollen Sie wirklich die Datei überschreiben?</b></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="315"/>
+ <source>The track <b>%1</b> you have selected contains trackpoints with invalid timestamps. Device might not accept the generated TCX course file if left as is. <b>Do you want to apply a filter with constant speed (10 m/s) and continue?</b></source>
+ <translation>Der Track <b>%1</b>, den Sie ausgewählt haben, beinhaltet Trackpunkte mit einer ungültigen Zeitmarke. Das Gerät wird die erzeugte TCX Kursdatei nicht akzeptieren, wenn sie so bleibt wie sie ist. <b> Wollen Sie einen Filter anwenden, der die Geschwindigkeit auf 10m/s setzt und fortfahren?</b></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="339"/>
+ <source>Course</source>
+ <translation>Kurs</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="340"/>
+ <source>Activity</source>
+ <translation>Aktivität</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="341"/>
+ <source>Cancel</source>
+ <translation>Abbrechen</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="314"/>
+ <source>Track with invalid timestamps...</source>
+ <translation>Track mit ungültiger Zeitmarke...</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="334"/>
+ <source>Activity or course?</source>
+ <translation>Aktivität oder Kurs?</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="335"/>
+ <source>QMapShack does not know how track <b>%1</b> should be saved. <b>Do you want to save it as a course or as an activity? </b>Remember that only waypoints close enough to the track will be saved when saving as a course. Waypoints will not be saved when saving as an activity.</source>
+ <translation>QMapShack weiß nicht als was der Track <b>%1</b> gespeichert werden soll. <b> Wollen Sie ihn als Kurs oder als Aktivität speichern? <b> Bedenken Sie, dass nur Wegpunkte die nahe genug am Track sind bei einem Kurs gespeichert werden. Wegpunkte werden bei einer Aktivität nicht gespeichert.</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="432"/>
+ <source>Failed to create file '%1'</source>
+ <translation>Datei '%1' konnte nicht erstellt werden</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="453"/>
+ <source>Failed to write file '%1'</source>
+ <translation>Datei '%1' konnte nicht geschrieben werden</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="435"/>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="454"/>
+ <source>Saving GIS data failed...</source>
+ <translation>Das Speichern der GIS Daten ist fehlgeschlagen...</translation>
+ </message>
+</context>
+<context>
<name>CTextEditWidget</name>
<message>
<location filename="../widgets/CTextEditWidget.cpp" line="70"/>
@@ -4014,138 +4608,149 @@ Zeile %2, Spalte %3:
</message>
<message>
<location filename="../IAbout.ui" line="62"/>
- <location filename="../IAbout.ui" line="106"/>
- <location filename="../IAbout.ui" line="120"/>
- <location filename="../IAbout.ui" line="134"/>
- <location filename="../IAbout.ui" line="148"/>
+ <location filename="../IAbout.ui" line="113"/>
+ <location filename="../IAbout.ui" line="127"/>
+ <location filename="../IAbout.ui" line="141"/>
+ <location filename="../IAbout.ui" line="155"/>
<source>TextLabel</source>
<translation>Bezeichnung</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="99"/>
+ <location filename="../IAbout.ui" line="106"/>
<source>Qt</source>
<translation></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="113"/>
+ <location filename="../IAbout.ui" line="120"/>
<source>GDAL</source>
<translation></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="127"/>
+ <location filename="../IAbout.ui" line="134"/>
<source>Proj4</source>
<translation></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="141"/>
+ <location filename="../IAbout.ui" line="148"/>
<source>Routino</source>
<translation>Routino</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="172"/>
+ <location filename="../IAbout.ui" line="179"/>
<source>Czech:</source>
<translation>Tschechisch:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="195"/>
+ <location filename="../IAbout.ui" line="202"/>
<source>German:</source>
<translation>Deutsch:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="218"/>
+ <location filename="../IAbout.ui" line="212"/>
+ <source>Oliver Eichler</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../IAbout.ui" line="225"/>
<source>Dutch:</source>
<translation>Niederländisch:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="241"/>
+ <location filename="../IAbout.ui" line="248"/>
<source>French:</source>
<translation>Französisch:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="251"/>
+ <location filename="../IAbout.ui" line="258"/>
<source>Rainer Unseld </source>
<translation></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="381"/>
- <source>Christian Eichler (qms at christian-eichler.de)
-Ivo Kronenberg</source>
+ <location filename="../IAbout.ui" line="295"/>
+ <source>Russian:</source>
+ <translation>Russisch:</translation>
+ </message>
+ <message>
+ <location filename="../IAbout.ui" line="302"/>
+ <source>Wolfgang Thämelt</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../IAbout.ui" line="428"/>
+ <source>© 2017 Oliver Eichler (oliver.eichler at gmx.de)</source>
<translation></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="182"/>
+ <location filename="../IAbout.ui" line="189"/>
<source>Pavel Fric</source>
<translation></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="281"/>
+ <location filename="../IAbout.ui" line="288"/>
<source><b>Translation:</b></source>
<translation><b>Übersetzung:</b></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="228"/>
+ <location filename="../IAbout.ui" line="235"/>
<source>Harrie Klomp</source>
<translation></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="271"/>
+ <location filename="../IAbout.ui" line="278"/>
<source>Spanish:</source>
<translation>Spanisch:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="305"/>
+ <location filename="../IAbout.ui" line="326"/>
<source>Win64:</source>
<translation></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="345"/>
+ <location filename="../IAbout.ui" line="366"/>
<source><b>Binaries:</b></source>
<translation><b>Ausführbare Dateien:</b></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="321"/>
+ <location filename="../IAbout.ui" line="342"/>
<source>OS X:</source>
<translation></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="374"/>
+ <location filename="../IAbout.ui" line="395"/>
<source><b>Contributors:</b></source>
<translation><b>Mitwirkende:</b></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="205"/>
- <source>Josef Latt</source>
- <translation></translation>
- </message>
- <message>
- <location filename="../IAbout.ui" line="258"/>
+ <location filename="../IAbout.ui" line="265"/>
<source>Jose Luis Domingo Lopez</source>
<translation></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="338"/>
+ <location filename="../IAbout.ui" line="359"/>
<source>Ivo Kronenberg</source>
<translation></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="331"/>
+ <location filename="../IAbout.ui" line="352"/>
<source>Helmut Schmidt</source>
<translation></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="354"/>
+ <location filename="../IAbout.ui" line="375"/>
<source>...and thanks to all Linux binary maintainers for doing a great job. Special thanks to Dan Horák and Bas Couwenberg for showing presence on the mailing list to discuss distribution related topics.</source>
<translation>... und Danke an alle Ersteller von ausführbaren Linux-Dateien für die gute Arbeit. Ganz besonderen Dank an Dan Horák und Bas Couwenberg für ihre Teilnahme an der Diskussion in der Mailingliste distributionsbezogene Punkte betreffend.</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="399"/>
- <source>This software is licensed under GPL3 or any later version</source>
- <translation>Diese Software steht unter der GPL3 Lizenz (oder spätere Versionen)</translation>
+ <location filename="../IAbout.ui" line="402"/>
+ <source>Christian Eichler (qms at christian-eichler.de)
+Ivo Kronenberg
+Norbert Truchsess (norbert.truchsess at t-online.de)</source>
+ <translation></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="406"/>
- <source>© 2014 Oliver Eichler (oliver.eichler at gmx.de)</source>
- <translation></translation>
+ <location filename="../IAbout.ui" line="421"/>
+ <source>This software is licensed under GPL3 or any later version</source>
+ <translation>Diese Software steht unter der GPL3 Lizenz (oder spätere Versionen)</translation>
</message>
</context>
<context>
@@ -4197,13 +4802,23 @@ Ivo Kronenberg</source>
<translation>Tracks verbinden...</translation>
</message>
<message>
- <location filename="../gis/trk/ICombineTrk.ui" line="43"/>
- <location filename="../gis/trk/ICombineTrk.ui" line="70"/>
- <location filename="../gis/trk/ICombineTrk.ui" line="117"/>
- <location filename="../gis/trk/ICombineTrk.ui" line="144"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="24"/>
+ <source>Available Tracks</source>
+ <translation>Vorh. Tracks</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/ICombineTrk.ui" line="54"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="81"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="139"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="166"/>
<source>...</source>
<translation></translation>
</message>
+ <message>
+ <location filename="../gis/trk/ICombineTrk.ui" line="109"/>
+ <source>Combined Tracks</source>
+ <translation>Verb. Tracks</translation>
+ </message>
</context>
<context>
<name>ICoordFormatSetup</name>
@@ -4255,17 +4870,22 @@ Ivo Kronenberg</source>
<translation>Löscht den ersten Teil des Tracks und behält den zweiten</translation>
</message>
<message>
- <location filename="../gis/trk/ICutTrk.ui" line="27"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="30"/>
<source>Keep both parts of the track</source>
<translation>Behält beide Teile des Tracks</translation>
</message>
<message>
- <location filename="../gis/trk/ICutTrk.ui" line="37"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="43"/>
<source>Keep first part of the track and delete second one</source>
<translation>Behält den ersten Teil des Tracks und löscht den zweiten</translation>
</message>
<message>
- <location filename="../gis/trk/ICutTrk.ui" line="60"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="55"/>
+ <source>Cut Mode:</source>
+ <translation>Teilmodus:</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/ICutTrk.ui" line="136"/>
<source>Check this to store the result into a new track.
If you keep both parts of the track you have to create new ones.
@@ -4278,7 +4898,7 @@ Wenn Sie beide Teile des Tracks behalten wollen, müssen neue Tracks erstellt we
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"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="143"/>
<source>Create a new track</source>
<translation>Neuen Track erstellen</translation>
</message>
@@ -4590,8 +5210,8 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
</message>
<message>
<location filename="../gis/ovl/IDetailsOvlArea.ui" line="132"/>
- <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>
+ <source>The area was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+ <translation>Das Gebiet wurde in QMapShack importiert und geändert. Die ursprünglichen Daten werden nicht mehr angezeigt. Näheres siehe Änderungshistorie.</translation>
</message>
<message>
<location filename="../gis/ovl/IDetailsOvlArea.ui" line="148"/>
@@ -4703,16 +5323,16 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
<translation>Info</translation>
</message>
<message>
+ <location filename="../gis/rte/IDetailsRte.ui" line="154"/>
+ <source>The route was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+ <translation>Die Route wurde in QMapShack importiert und geändert. Die ursprünglichen Daten werden nicht mehr angezeigt. Näheres siehe Änderungshistorie.</translation>
+ </message>
+ <message>
<location filename="../gis/rte/IDetailsRte.ui" line="205"/>
<source>-</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/rte/IDetailsRte.ui" line="154"/>
- <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/rte/IDetailsRte.ui" line="170"/>
<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>
@@ -4779,11 +5399,6 @@ 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="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="387"/>
<source>Style</source>
<translation>Stil</translation>
@@ -4818,6 +5433,11 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
-</translation>
</message>
<message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="265"/>
+ <source>The track was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+ <translation>Der Track wurde in QMapShack importiert und geändert. Die ursprünglichen Daten werden nicht mehr angezeigt. Näheres siehe Änderungshistorie.</translation>
+ </message>
+ <message>
<location filename="../gis/trk/IDetailsTrk.ui" line="641"/>
<source>with arrows</source>
<translation>mit Richtungspfeilen</translation>
@@ -4997,11 +5617,6 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
<translation></translation>
</message>
<message>
- <location filename="../gis/wpt/IDetailsWpt.ui" line="268"/>
- <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/wpt/IDetailsWpt.ui" line="43"/>
<source>Info</source>
<translation>Info</translation>
@@ -5030,6 +5645,11 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
<translation>Abstand:</translation>
</message>
<message>
+ <location filename="../gis/wpt/IDetailsWpt.ui" line="268"/>
+ <source>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+ <translation>Der Wegpunkt wurde in QMapShack importiert und geändert. Die ursprünglichen Daten werden nicht mehr angezeigt. Näheres siehe Änderungshistorie.</translation>
+ </message>
+ <message>
<location filename="../gis/wpt/IDetailsWpt.ui" line="284"/>
<source>Toggle read only mode. You have to open the lock to edit the item.</source>
<translation>Den Schreibschutz ändern. Das Schloss muss offen sein um das Element zu bearbeiten.</translation>
@@ -5615,70 +6235,70 @@ It is either a new item or it has been deleted in the database by someone else.<
<context>
<name>IGisProject</name>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="109"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="155"/>
<source>Save project?</source>
<translation>Projekt speichern?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="109"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="155"/>
<source><h3>%1</h3>The project was changed. Save before closing it?</source>
<translation><h3>%1</h3>Das Projekt wurde geändert. Speichern, bevor es geschlossen wird?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="283"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="329"/>
<source>%1: Correlate tracks and waypoints.</source>
<translation>%1: Tracks und Wegpunkte verknüpfen.</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="293"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="339"/>
<source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
<translation><h3>%1</h3>Hat das zu lange gedauert? Wollen Sie die Verknüpfung von Tracks und Wegpunkten auch in Zukunft für dieses Projekt überspringen?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="294"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="340"/>
<source>Canceled correlation...</source>
<translation>Verknüpfung abgebrochen...</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="339"/>
- <location filename="../gis/prj/IGisProject.cpp" line="392"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="385"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="442"/>
<source>Save "%1" to...</source>
<translation>Speichere "%1" nach...</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="477"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="527"/>
<source><br/>
Filename: %1</source>
<translation><br/>
Dateiname: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="482"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="532"/>
<source>Waypoints: %1</source>
<translation>Wegpunkte: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="486"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="536"/>
<source>Tracks: %1</source>
<translation>Tracks: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="490"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="540"/>
<source>Routes: %1</source>
<translation>Routen: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="494"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="544"/>
<source>Areas: %1</source>
<translation>Gebiete: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="614"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="664"/>
<source>Are you sure you want to delete '%1' from project '%2'?</source>
<translation>Sind Sie sicher, dass Sie '%1' aus dem Projekt '%2' löschen wollen? </translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="615"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="665"/>
<source>Delete...</source>
<translation>Löschen...</translation>
</message>
@@ -5691,28 +6311,28 @@ Dateiname: %1</translation>
<translation></translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="37"/>
+ <location filename="../gis/IGisWidget.ui" line="49"/>
<source>Opacity</source>
<translation>Transparenz</translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="44"/>
+ <location filename="../gis/IGisWidget.ui" line="56"/>
<source>Change the opacity of all GIS Items on the map.</source>
<translation>Ändert die Transparenz von allen GIS Elementen auf der Karte.</translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="96"/>
- <location filename="../gis/IGisWidget.ui" line="126"/>
+ <location filename="../gis/IGisWidget.ui" line="108"/>
+ <location filename="../gis/IGisWidget.ui" line="138"/>
<source>Name</source>
<translation>Name</translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="131"/>
+ <location filename="../gis/IGisWidget.ui" line="143"/>
<source>Age</source>
<translation>Alter</translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="165"/>
+ <location filename="../gis/IGisWidget.ui" line="177"/>
<source>To add a database do a right click on the database list above.</source>
<translation>Eine neue Datenbank wird über einen Rechtsklick im Fenster erstellt.</translation>
</message>
@@ -5814,7 +6434,7 @@ Dateiname: %1</translation>
<context>
<name>ILineOp</name>
<message>
- <location filename="../mouse/line/ILineOp.cpp" line="211"/>
+ <location filename="../mouse/line/ILineOp.cpp" line="212"/>
<source>Routing</source>
<translation></translation>
</message>
@@ -5871,330 +6491,335 @@ Dateiname: %1</translation>
<translation>Fenster</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="109"/>
+ <location filename="../IMainWindow.ui" line="110"/>
<source>?</source>
<translation>?</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="116"/>
+ <location filename="../IMainWindow.ui" line="118"/>
<source>Project</source>
<translation>Projekt</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="127"/>
+ <location filename="../IMainWindow.ui" line="129"/>
<source>Tool</source>
<translation>Werkzeug</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="152"/>
+ <location filename="../IMainWindow.ui" line="154"/>
<source>Maps</source>
<translation>Karten</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="195"/>
+ <location filename="../IMainWindow.ui" line="197"/>
<source>Dig. Elev. Model (DEM)</source>
<translation>Dig. Höhenmodell (DEM)</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="234"/>
+ <location filename="../IMainWindow.ui" line="236"/>
<source>Data</source>
<translation>Daten</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="252"/>
+ <location filename="../IMainWindow.ui" line="254"/>
<source>Route</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="286"/>
- <location filename="../IMainWindow.ui" line="289"/>
+ <location filename="../IMainWindow.ui" line="288"/>
+ <location filename="../IMainWindow.ui" line="291"/>
<source>Add Map View</source>
<translation>Kartenansicht hinzufügen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="292"/>
+ <location filename="../IMainWindow.ui" line="294"/>
<source>Ctrl+T</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="307"/>
+ <location filename="../IMainWindow.ui" line="309"/>
<source>Show Scale</source>
<translation>Maßstab</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="319"/>
+ <location filename="../IMainWindow.ui" line="321"/>
<source>Setup Map Font</source>
<translation>Kartenfont einstellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="334"/>
+ <location filename="../IMainWindow.ui" line="336"/>
<source>Show Grid</source>
<translation>Gitter</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="337"/>
+ <location filename="../IMainWindow.ui" line="339"/>
<source>Ctrl+G</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="349"/>
+ <location filename="../IMainWindow.ui" line="351"/>
<source>Setup Grid</source>
<translation>Gitter einstellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="352"/>
+ <location filename="../IMainWindow.ui" line="354"/>
<source>Ctrl+Alt+G</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="367"/>
+ <location filename="../IMainWindow.ui" line="369"/>
<source>Flip Mouse Wheel</source>
<translation>Mausrad umdrehen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="379"/>
- <location filename="../IMainWindow.ui" line="382"/>
+ <location filename="../IMainWindow.ui" line="381"/>
+ <location filename="../IMainWindow.ui" line="384"/>
<source>Setup Map Paths</source>
<translation>Kartenverzeichnisse angeben</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="397"/>
+ <location filename="../IMainWindow.ui" line="399"/>
<source>POI Text</source>
<translation>POI Text</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="412"/>
+ <location filename="../IMainWindow.ui" line="414"/>
<source>Night / Day</source>
<translation>Nacht / Tag</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="427"/>
+ <location filename="../IMainWindow.ui" line="429"/>
<source>Map Tool Tip</source>
<translation>Kartentooltip</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="430"/>
+ <location filename="../IMainWindow.ui" line="432"/>
<source>Ctrl+I</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="442"/>
+ <location filename="../IMainWindow.ui" line="444"/>
<source>Setup DEM Paths</source>
<translation>DEM Verzeichnisse angeben</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="454"/>
+ <location filename="../IMainWindow.ui" line="456"/>
<source>About</source>
<translation>Über</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="466"/>
+ <location filename="../IMainWindow.ui" line="468"/>
<source>Help</source>
<translation>Hilfe</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="469"/>
+ <location filename="../IMainWindow.ui" line="471"/>
<source>F1</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="481"/>
- <location filename="../IMainWindow.ui" line="484"/>
+ <location filename="../IMainWindow.ui" line="483"/>
+ <location filename="../IMainWindow.ui" line="486"/>
<source>Setup Map View</source>
<translation>Kartenansicht einstellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="628"/>
+ <location filename="../IMainWindow.ui" line="630"/>
<source>VRT Builder</source>
<translation>VRT Builder</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="631"/>
+ <location filename="../IMainWindow.ui" line="633"/>
<source>GUI front end to gdalbuildvrt</source>
<translation>Eine graphische Benutzerschnittstelle zu gdalbuildvrt </translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="643"/>
+ <location filename="../IMainWindow.ui" line="645"/>
<source>Store Map View</source>
<translation>Kartenansicht speichern</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="646"/>
+ <location filename="../IMainWindow.ui" line="648"/>
<source>Write current active map and DEM list including the properties to a file</source>
<translation>Speichert die aktiven Karten und DEM Dateien inklusive der Eigenschaften in einer Datei</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="658"/>
+ <location filename="../IMainWindow.ui" line="660"/>
<source>Load Map View</source>
<translation>Kartenansicht laden</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="661"/>
+ <location filename="../IMainWindow.ui" line="663"/>
<source>Restore view with active map and DEM list including the properties from a file</source>
<translation>Stellt die aktiven Karten und DEM Dateien inklusive der Eigenschaften aus einer Datei wieder her</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="676"/>
+ <location filename="../IMainWindow.ui" line="678"/>
<source>Ext. Profile</source>
<translation>Erw. Profil</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="679"/>
+ <location filename="../IMainWindow.ui" line="681"/>
<source>Ctrl+E</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="691"/>
+ <location filename="../IMainWindow.ui" line="693"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="694"/>
+ <location filename="../IMainWindow.ui" line="696"/>
<source>Ctrl+Q</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="706"/>
+ <location filename="../IMainWindow.ui" line="708"/>
<source>Clone Map View</source>
<translation>Kartenansicht klonen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="709"/>
+ <location filename="../IMainWindow.ui" line="711"/>
<source>Ctrl+Shift+T</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="721"/>
+ <location filename="../IMainWindow.ui" line="723"/>
<source>Create Routino Database</source>
<translation>Routino Datenbank erstellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="733"/>
+ <location filename="../IMainWindow.ui" line="735"/>
<source>Save(Print) Map Screenshot</source>
<translation>Kartenausschnitt speichern (drucken)</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="736"/>
+ <location filename="../IMainWindow.ui" line="738"/>
<source>Print a selected area of the map</source>
<translation>Einen ausgewählten Bereich der Karte drucken</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="739"/>
+ <location filename="../IMainWindow.ui" line="741"/>
<source>Ctrl+P</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="751"/>
+ <location filename="../IMainWindow.ui" line="753"/>
<source>Setup Coord. Format</source>
<translation>Koordinatenformat einstellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="754"/>
+ <location filename="../IMainWindow.ui" line="756"/>
<source>Change the format coordinates are displayed</source>
<translation>Ändert das Format der angezeigten Koordinaten</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="766"/>
+ <location filename="../IMainWindow.ui" line="768"/>
<source>Setup Map Background</source>
<translation>Kartenhintergrund einstellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="778"/>
+ <location filename="../IMainWindow.ui" line="780"/>
<source>Setup Waypoint Icons</source>
<translation>Wegpunktsymbole konfigurieren</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="781"/>
+ <location filename="../IMainWindow.ui" line="783"/>
<source>Setup path to custom icons</source>
<translation>Pfad zu individuellen Symbolen einrichten</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="790"/>
+ <location filename="../IMainWindow.ui" line="792"/>
<source>Close Tab</source>
<translation>Reiter schließen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="793"/>
+ <location filename="../IMainWindow.ui" line="795"/>
<source>Ctrl+W</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="496"/>
+ <location filename="../IMainWindow.ui" line="804"/>
+ <source>Quickstart Help</source>
+ <translation>Schnellstartanleitung</translation>
+ </message>
+ <message>
+ <location filename="../IMainWindow.ui" line="498"/>
<source>Load GIS Data</source>
<translation>GIS Daten laden</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="499"/>
+ <location filename="../IMainWindow.ui" line="501"/>
<source>Load projects from file</source>
<translation>Lade Datei als Projekt</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="502"/>
+ <location filename="../IMainWindow.ui" line="504"/>
<source>Ctrl+L</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="514"/>
+ <location filename="../IMainWindow.ui" line="516"/>
<source>Save All GIS Data</source>
<translation>Alle GIS Daten speichern</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="517"/>
+ <location filename="../IMainWindow.ui" line="519"/>
<source>Save all projects in the workspace</source>
<translation>Alle Projekte, die sich auf dem Arbeitsplatz befinden, speichern</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="520"/>
+ <location filename="../IMainWindow.ui" line="522"/>
<source>Ctrl+S</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="532"/>
+ <location filename="../IMainWindow.ui" line="534"/>
<source>Setup Time Zone</source>
<translation>Zeitzone einstellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="544"/>
+ <location filename="../IMainWindow.ui" line="546"/>
<source>Add empty project</source>
<translation>Leeres Projekt hinzufügen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="559"/>
+ <location filename="../IMainWindow.ui" line="561"/>
<source>Search Google</source>
<translation>Mit Google suchen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="571"/>
+ <location filename="../IMainWindow.ui" line="573"/>
<source>Close all projects</source>
<translation>Alle Projekte schließen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="574"/>
+ <location filename="../IMainWindow.ui" line="576"/>
<source>F8</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="586"/>
+ <location filename="../IMainWindow.ui" line="588"/>
<source>Setup Units</source>
<translation>Einheiten einstellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="598"/>
+ <location filename="../IMainWindow.ui" line="600"/>
<source>Setup Workspace</source>
<translation>Arbeitsplatz konfigurieren</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="601"/>
+ <location filename="../IMainWindow.ui" line="603"/>
<source>Setup save on exit.</source>
<translation>Speichert Einstellungen beim Beenden.</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="613"/>
+ <location filename="../IMainWindow.ui" line="615"/>
<source>Import Database from QLandkarte</source>
<translation>Datenbankimport aus QLandkarte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="616"/>
+ <location filename="../IMainWindow.ui" line="618"/>
<source>Import QLandkarte GT database</source>
<translation>QLandkarte GT Datenbank importieren</translation>
</message>
@@ -6321,37 +6946,42 @@ Keine Lust die Anleitung zu lesen!</translation>
<translation><html><head/><body><p>Klicken um die aktuelle Skalierung als maximale Skalierung zu benutzen.</p></body></html></translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="137"/>
+ <location filename="../map/IMapPropSetup.ui" line="139"/>
<source>Areas</source>
<translation>Gebiete</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="144"/>
+ <location filename="../map/IMapPropSetup.ui" line="146"/>
<source>Lines</source>
<translation>Linien</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="151"/>
+ <location filename="../map/IMapPropSetup.ui" line="153"/>
<source>Points</source>
<translation>Punkte</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="233"/>
+ <location filename="../map/IMapPropSetup.ui" line="170"/>
+ <source>Details</source>
+ <translation>Details</translation>
+ </message>
+ <message>
+ <location filename="../map/IMapPropSetup.ui" line="264"/>
<source>-</source>
<translation></translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="240"/>
+ <location filename="../map/IMapPropSetup.ui" line="271"/>
<source>Cache Path</source>
<translation>Speicherpfad</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="196"/>
+ <location filename="../map/IMapPropSetup.ui" line="227"/>
<source>Cache Size (MB)</source>
<translation>Cache (MB)</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="216"/>
+ <location filename="../map/IMapPropSetup.ui" line="247"/>
<source>Expiration (Days)</source>
<translation>Verfallzeit (Tage)</translation>
</message>
@@ -6495,19 +7125,24 @@ Keine Lust die Anleitung zu lesen!</translation>
<translation>Wegpunkt hinzufügen</translation>
</message>
<message>
- <location filename="../plot/IPlot.cpp" line="541"/>
+ <location filename="../plot/IPlot.cpp" line="99"/>
+ <source>Cut...</source>
+ <translation>Teilen...</translation>
+ </message>
+ <message>
+ <location filename="../plot/IPlot.cpp" line="542"/>
<source>Hold CTRL key for vertical zoom, only.
Hold ALT key for horizontal zoom, only.</source>
<translation>Um nur vertikale zu zoomen, STRG Taste gedrückt halten.
Um nur horizontal zu zoomen, ALT Taste gedrückt halten.</translation>
</message>
<message>
- <location filename="../plot/IPlot.cpp" line="696"/>
+ <location filename="../plot/IPlot.cpp" line="697"/>
<source>No or bad data.</source>
<translation>Keine oder schlechte Daten.</translation>
</message>
<message>
- <location filename="../plot/IPlot.cpp" line="1296"/>
+ <location filename="../plot/IPlot.cpp" line="1298"/>
<source>Select output file</source>
<translation>Ausgabedatei auswählen</translation>
</message>
@@ -6678,6 +7313,262 @@ sein</translation>
</message>
</context>
<context>
+ <name>IRouterBRouter</name>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="20"/>
+ <source>Form</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="28"/>
+ <source>Profile</source>
+ <translation>Profil</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="35"/>
+ <source>Alternative</source>
+ <translation>Variante</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="64"/>
+ <source>display selected routing profile</source>
+ <translation>ausgewähltes Profil anzeigen</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="67"/>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="128"/>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="142"/>
+ <source>...</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="87"/>
+ <source>on-the-fly routing</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="111"/>
+ <source>BRouter: </source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="118"/>
+ <source>not running</source>
+ <translation>nicht gestartet</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="125"/>
+ <source>start/stop BRouter</source>
+ <translation>BRouter starten/stoppen</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="139"/>
+ <source>show BRouter console</source>
+ <translation>BRouter Logausgabe anzeigen</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="172"/>
+ <source>Setup</source>
+ <translation>Einrichten</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="181"/>
+ <source>Caution! BRouter is listening on all ports for connections.</source>
+ <translation>Vorsicht! BRouter horcht auf allen verfügbaren Schnittstellen.</translation>
+ </message>
+</context>
+<context>
+ <name>IRouterBRouterInfo</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterInfo.ui" line="14"/>
+ <source>BRouter Profile</source>
+ <translation>BRouter Profil</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterInfo.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation>Bezeichnung</translation>
+ </message>
+</context>
+<context>
+ <name>IRouterBRouterSetupWizard</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="23"/>
+ <source>BRouter Setup</source>
+ <translation>BRouter Einrichtung</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="48"/>
+ <source>choose which BRouter to use</source>
+ <translation>bitte den zu verwendenden BRouters auswählen:</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="54"/>
+ <source>BRouter-Web (online)</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="61"/>
+ <source>local Installation</source>
+ <translation>lokale Installation</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="68"/>
+ <source>Expert Mode</source>
+ <translation>Experten Modus</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="91"/>
+ <source>local BRouter Installation directory:</source>
+ <translation>lokales BRouter Installations-Verzeichnis:</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="103"/>
+ <source>select installation directory</source>
+ <translation>Installationsverzeichnis auswählen</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="106"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="162"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="342"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="356"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="389"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="400"/>
+ <source>...</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="119"/>
+ <source>labelLocalDirResult</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="128"/>
+ <source>create or update installation</source>
+ <translation>Installation neu anlegen oder aktualisieren</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="152"/>
+ <source>Java Executable</source>
+ <translation>ausführbares Java Programm</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="175"/>
+ <source>labelLocalJavaResult</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="184"/>
+ <source>search for installed java</source>
+ <translation>nach installiertem Java-programm suchen</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="241"/>
+ <source>Download and install BRouter Version</source>
+ <translation>BRouter-Version herunterladen und installieren</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="255"/>
+ <source>about:blank</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="263"/>
+ <source>File to install</source>
+ <translation>zu installierende Datei</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="272"/>
+ <source>Download and Install</source>
+ <translation>Herunterladen und Installieren</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="321"/>
+ <source>available Profiles</source>
+ <translation>Verfügbare Profile</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="339"/>
+ <source>install profile</source>
+ <translation>Profil installieren</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="353"/>
+ <source>remove profile</source>
+ <translation>Profil entfernen</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="371"/>
+ <source>installed Profiles</source>
+ <translation>Installierte Profile</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="415"/>
+ <source>content of profile</source>
+ <translation>Profil-Inhalt</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="451"/>
+ <source>BRouter-Web URL:</source>
+ <translation>Adresse (URL) von BRouter-Web</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="501"/>
+ <source>Service-URL</source>
+ <translation>Adresse (URL) des Routing Service</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="511"/>
+ <source>Profile-URL</source>
+ <translation>Adresse (URL) der Profile</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="561"/>
+ <source>Hostname</source>
+ <translation>Servername</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="571"/>
+ <source>Port</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="581"/>
+ <source>Profile directory</source>
+ <translation>Profil-Verzeichnis</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="591"/>
+ <source>Segments directory</source>
+ <translation>Segement-Verzeichnis</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="601"/>
+ <source>Custom Profiles dir</source>
+ <translation>Verzeichnis für angepasste Profile</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="611"/>
+ <source>Max Runtime</source>
+ <translation>Maximale Laufzeit</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="621"/>
+ <source>Number Threads</source>
+ <translation>Anzahl Threads</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="631"/>
+ <source>Java Options</source>
+ <translation>Java Optionen</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="551"/>
+ <source>Profiles Url</source>
+ <translation>Profil-Url</translation>
+ </message>
+</context>
+<context>
<name>IRouterMapQuest</name>
<message>
<location filename="../gis/rte/router/IRouterMapQuest.ui" line="14"/>
@@ -6781,18 +7672,18 @@ sein</translation>
<context>
<name>IRouterRoutinoPathSetup</name>
<message>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="14"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="14"/>
<source>Setup Routino database...</source>
<translation>Routino Datenbank einrichten...</translation>
</message>
<message>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="27"/>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="47"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="27"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="47"/>
<source>...</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="99"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="99"/>
<source>-</source>
<translation></translation>
</message>
@@ -7045,18 +7936,18 @@ sein</translation>
<translation></translation>
</message>
<message>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="20"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="32"/>
<source>Delete all points between the first and last one.</source>
<translation>Alle Punkte zwischen dem ersten und dem letzten Punkt löschen.</translation>
</message>
<message>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="23"/>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="37"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="35"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="49"/>
<source>...</source>
<translation></translation>
</message>
<message>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="34"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="46"/>
<source><html><head/><body><p>Calculate a route between the first and last selected point.</p></body></html></source>
<translation><html><head/><body><p>Eine Route zwischen dem ersten und dem letzten gewählten Punkt berechnen.</p></body></html></translation>
</message>
@@ -7179,12 +8070,13 @@ sein</translation>
<location filename="../mouse/IScrOptSelect.ui" line="82"/>
<location filename="../mouse/IScrOptSelect.ui" line="102"/>
<location filename="../mouse/IScrOptSelect.ui" line="122"/>
- <location filename="../mouse/IScrOptSelect.ui" line="176"/>
- <location filename="../mouse/IScrOptSelect.ui" line="205"/>
- <location filename="../mouse/IScrOptSelect.ui" line="265"/>
- <location filename="../mouse/IScrOptSelect.ui" line="292"/>
- <location filename="../mouse/IScrOptSelect.ui" line="319"/>
- <location filename="../mouse/IScrOptSelect.ui" line="346"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="142"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="196"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="225"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="285"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="312"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="339"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="366"/>
<source>...</source>
<translation></translation>
</message>
@@ -7195,41 +8087,46 @@ sein</translation>
</message>
<message>
<location filename="../mouse/IScrOptSelect.ui" line="99"/>
+ <source>Change the icon of all selected waypoints.</source>
+ <translation>Das Symbol wird für alle ausgewählten Wegpunkte geändert.</translation>
+ </message>
+ <message>
+ <location filename="../mouse/IScrOptSelect.ui" line="119"/>
<source>Combine all selected tracks to a new one.</source>
<translation>Alle ausgewählten Tracks zusammenführen.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="119"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="139"/>
<source>Delete all selected items.</source>
<translation>Löscht alle gewählten Elemente.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="173"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="193"/>
<source>Select all items that intersect the selected area.</source>
<translation>Wählt alle Elemente, die den gewählten Bereich schneiden.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="202"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="222"/>
<source>Select all itmes that are completely inside the selected area.</source>
<translation>Wählt alle Elemente, die vollständig innerhalb des gewählten Bereiches liegen.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="262"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="282"/>
<source>Add tracks to selection.</source>
<translation>Fügt Tracks zur Auswahl hinzu.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="289"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="309"/>
<source>Add waypoints to selection.</source>
<translation>Fügt Wegpunkte zur Auswahl hinzu.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="316"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="336"/>
<source>Add routes to selection.</source>
<translation>Fügt Routen zur Auswahl hinzu.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="343"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="363"/>
<source>Add areas to selection.</source>
<translation>Fügt Gebiete zur Auswahl hinzu.</translation>
</message>
@@ -8098,36 +8995,36 @@ sein</translation>
<context>
<name>IToolShell</name>
<message>
- <location filename="../tool/IToolShell.cpp" line="45"/>
+ <location filename="../tool/IToolShell.cpp" line="46"/>
<source>Execution of external program `%1` failed: </source>
<translation>Ausführen des externen Programms `%1` ist fehlgeschlagen: </translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="49"/>
+ <location filename="../tool/IToolShell.cpp" line="50"/>
<source>Process cannot be started.
</source>
<translation>Der Prozess konnte nicht gestartet werden.</translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="50"/>
+ <location filename="../tool/IToolShell.cpp" line="51"/>
<source>Make sure the required packages are installed, `%1` exists and is executable.
</source>
<translation>Stellen Sie sicher, dass die erforderlichen Pakete installiert sind, `%1` existiert und ist ausführbar.</translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="54"/>
+ <location filename="../tool/IToolShell.cpp" line="55"/>
<source>External process crashed.
</source>
<translation>Der externe Prozess ist abgestürzt.</translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="58"/>
+ <location filename="../tool/IToolShell.cpp" line="59"/>
<source>An unknown error occurred.
</source>
<translation>Ein unbekannter Fehler ist aufgetreten.</translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="149"/>
+ <location filename="../tool/IToolShell.cpp" line="172"/>
<source>!!! failed !!!
</source>
<translation>!!! fehlgeschlagen !!!</translation>
diff --git a/src/locale/qmapshack_es.ts b/src/locale/qmapshack_es.ts
index d8e9564..49783f0 100644
--- a/src/locale/qmapshack_es.ts
+++ b/src/locale/qmapshack_es.ts
@@ -13,6 +13,11 @@
<source>%1 (API V%2)</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../CAbout.cpp" line="49"/>
+ <source>(no DBUS: device detection and handling disabled)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CActivityTrk</name>
@@ -112,12 +117,12 @@
<context>
<name>CCanvas</name>
<message>
- <location filename="../canvas/CCanvas.cpp" line="60"/>
+ <location filename="../canvas/CCanvas.cpp" line="61"/>
<source>View %1</source>
<translation>Vista %1</translation>
</message>
<message>
- <location filename="../canvas/CCanvas.cpp" line="685"/>
+ <location filename="../canvas/CCanvas.cpp" line="693"/>
<source>Setup Map Background</source>
<translation type="unfinished"></translation>
</message>
@@ -262,66 +267,86 @@
<context>
<name>CDBProject</name>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="223"/>
+ <location filename="../gis/db/CDBProject.cpp" line="112"/>
+ <source>Failed to load...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="113"/>
+ <source>Can't load file "%1" . It will be skipped.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="126"/>
+ <source>Project already in database...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="127"/>
+ <source>The project "%1" has already been imported into the database. It will be skipped.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="278"/>
<source>The item %1 has been changed by %2 (%3).
To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="229"/>
+ <location filename="../gis/db/CDBProject.cpp" line="284"/>
<source>Conflict with database...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="230"/>
+ <location filename="../gis/db/CDBProject.cpp" line="285"/>
<source>Clone && Save</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="231"/>
+ <location filename="../gis/db/CDBProject.cpp" line="286"/>
<source>Force Save</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="232"/>
+ <location filename="../gis/db/CDBProject.cpp" line="287"/>
<source>Take remote</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="514"/>
+ <location filename="../gis/db/CDBProject.cpp" line="569"/>
<source>Missing folder...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="515"/>
+ <location filename="../gis/db/CDBProject.cpp" line="570"/>
<source>Failed to save project. The folder has been deleted in the database.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="522"/>
+ <location filename="../gis/db/CDBProject.cpp" line="577"/>
<source>Save ...</source>
<translation type="unfinished">Guardar...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="585"/>
+ <location filename="../gis/db/CDBProject.cpp" line="640"/>
<source>Error</source>
<translation type="unfinished">Error</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="585"/>
+ <location filename="../gis/db/CDBProject.cpp" line="640"/>
<source>There was an unexpected database error:
%1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="700"/>
+ <location filename="../gis/db/CDBProject.cpp" line="755"/>
<source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="701"/>
+ <location filename="../gis/db/CDBProject.cpp" line="756"/>
<source>Save changes?</source>
<translation type="unfinished"></translation>
</message>
@@ -851,78 +876,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="65"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="66"/>
<source>_Clone</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="283"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="284"/>
<source>track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="310"/>
+ <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="316"/>
+ <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="322"/>
+ <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="328"/>
+ <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="346"/>
+ <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="350"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
<source>Length: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="357"/>
- <location filename="../gis/rte/CGisItemRte.cpp" line="599"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="600"/>
<source>Time: %1 %2</source>
<translation type="unfinished">Tiempo: %1 %2</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="361"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
<source>Time: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="371"/>
+ <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="377"/>
+ <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="379"/>
+ <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="601"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="602"/>
<source>Distance: %1 %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="716"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="717"/>
<source>Changed route points.</source>
<translation type="unfinished"></translation>
</message>
@@ -1066,21 +1091,21 @@ 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="1214"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1227"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1283"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1327"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1466"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1223"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1236"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1292"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1336"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1475"/>
<source>track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1418"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1427"/>
<source>Hide point %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1422"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1431"/>
<source>Hide points %1..%2.</source>
<translation type="unfinished"></translation>
</message>
@@ -1176,47 +1201,47 @@ 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="1273"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1282"/>
<source>Permanently removed points %1..%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1451"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1460"/>
<source>Show points.</source>
<translation type="unfinished">Mostrar puntos.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1985"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
<source>Changed name</source>
<translation type="unfinished">Se cambió el nombre</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1991"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
<source>Changed comment</source>
<translation type="unfinished">Se cambió el comentario</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1997"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
<source>Changed description</source>
<translation type="unfinished">Se cambió la descripción</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2003"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2012"/>
<source>Changed links</source>
<translation type="unfinished">Se cambió el enlace</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2014"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2023"/>
<source>Changed elevation of point %1 to %2 %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2038"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2047"/>
<source>Changed activity to '%1' for complete track.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2077"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2086"/>
<source>Changed activity to '%1' for range(%2..%3).</source>
<translation type="unfinished"></translation>
</message>
@@ -1324,62 +1349,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/wpt/CGisItemWpt.cpp" line="272"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="275"/>
<source>Elevation: %1 %2</source>
<translation type="unfinished">Altitud: %1 %2</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="283"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="286"/>
<source>Proximity: %1 %2</source>
<translation type="unfinished">Proximidad: %1 %2</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="355"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="358"/>
<source>Changed name</source>
<translation type="unfinished">Se cambió el nombre</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="365"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="368"/>
<source>Changed position</source>
<translation type="unfinished">Se cambió la posición</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="371"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="374"/>
<source>Changed elevation</source>
<translation type="unfinished">Se cambió la altitud</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="377"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="380"/>
<source>Changed proximity</source>
<translation type="unfinished">Se cambió la proximidad</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="391"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
<source>Changed icon</source>
<translation type="unfinished">Se cambió el icono</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="397"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
<source>Changed comment</source>
<translation type="unfinished">Se cambió el comentario</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="403"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="406"/>
<source>Changed description</source>
<translation type="unfinished">Se cambió la descripción</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="409"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="412"/>
<source>Changed links</source>
<translation type="unfinished">Se cambió el enlace</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="415"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="418"/>
<source>Changed images</source>
<translation type="unfinished">Se cambió la imagen</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="421"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="424"/>
<source>Add image</source>
<translation type="unfinished">Añadir Imagen</translation>
</message>
@@ -1387,139 +1412,149 @@ To solve this conflict you can create and save a clone, force your version or dr
<context>
<name>CGisListDB</name>
<message>
- <location filename="../gis/CGisListDB.cpp" line="83"/>
+ <location filename="../gis/CGisListDB.cpp" line="84"/>
<source>Due to changes in the database system QMapShack forgot about the filename of your database '%1'. You have to select it again in the next step.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="84"/>
+ <location filename="../gis/CGisListDB.cpp" line="85"/>
<source>Select database file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="117"/>
+ <location filename="../gis/CGisListDB.cpp" line="118"/>
<source>Add Database</source>
<translation>Añadir Base de Datos</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="120"/>
+ <location filename="../gis/CGisListDB.cpp" line="121"/>
<source>Add Folder</source>
<translation>Añadir carpeta</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="121"/>
+ <location filename="../gis/CGisListDB.cpp" line="122"/>
<source>Rename Folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="122"/>
+ <location filename="../gis/CGisListDB.cpp" line="123"/>
<source>Copy Folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="123"/>
+ <location filename="../gis/CGisListDB.cpp" line="124"/>
<source>Move Folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="124"/>
+ <location filename="../gis/CGisListDB.cpp" line="125"/>
<source>Delete Folder</source>
<translation>Eliminar Carpeta</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="125"/>
- <source>Export to GPX...</source>
+ <location filename="../gis/CGisListDB.cpp" line="127"/>
+ <source>Import from Files...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gis/CGisListDB.cpp" line="128"/>
- <location filename="../gis/CGisListDB.cpp" line="141"/>
+ <source>Export to GPX...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListDB.cpp" line="131"/>
+ <location filename="../gis/CGisListDB.cpp" line="147"/>
<source>Delete Item</source>
<translation>Eliminar Elemento</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="132"/>
+ <location filename="../gis/CGisListDB.cpp" line="135"/>
<source>Search Database</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="133"/>
+ <location filename="../gis/CGisListDB.cpp" line="136"/>
<source>Sync. with Database</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="134"/>
+ <location filename="../gis/CGisListDB.cpp" line="137"/>
<source>Remove Database</source>
<translation>Quitar Base de Datos</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="138"/>
+ <location filename="../gis/CGisListDB.cpp" line="144"/>
<source>Empty</source>
<translation>Vacío</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="437"/>
+ <location filename="../gis/CGisListDB.cpp" line="444"/>
<source>Remove database...</source>
<translation>Quitar Base de Datos...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="437"/>
+ <location filename="../gis/CGisListDB.cpp" line="444"/>
<source>Do you really want to remove '%1' from the list?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="501"/>
+ <location filename="../gis/CGisListDB.cpp" line="508"/>
<source>Are you sure you want to delete selected folders and all subfolders from the database?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="669"/>
+ <location filename="../gis/CGisListDB.cpp" line="676"/>
<source>Bad operation....</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="669"/>
+ <location filename="../gis/CGisListDB.cpp" line="676"/>
<source>The target folder is a subfolder of the one to move. This will not work.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="728"/>
+ <location filename="../gis/CGisListDB.cpp" line="735"/>
<source>Folder name...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="728"/>
+ <location filename="../gis/CGisListDB.cpp" line="735"/>
<source>Rename folder:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="857"/>
+ <location filename="../gis/CGisListDB.cpp" line="864"/>
<source>Are you sure you want to delete '%1' from folder '%2'?</source>
<translation type="unfinished">¿Desea realmente eleiminar '%1' de la carpeta '%2'?</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="858"/>
+ <location filename="../gis/CGisListDB.cpp" line="865"/>
<source>Delete...</source>
<translation type="unfinished">Borrar...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="501"/>
+ <location filename="../gis/CGisListDB.cpp" line="1055"/>
+ <source>Import GIS Data...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListDB.cpp" line="508"/>
<source>Delete database folder...</source>
<translation>Eliminar Carpeta de la Base de Datos...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="749"/>
- <location filename="../gis/CGisListDB.cpp" line="770"/>
+ <location filename="../gis/CGisListDB.cpp" line="756"/>
+ <location filename="../gis/CGisListDB.cpp" line="777"/>
<source>Remove items...</source>
<translation>Eliminar elementos...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="749"/>
+ <location filename="../gis/CGisListDB.cpp" line="756"/>
<source>Are you sure you want to delete all items from Lost&Found? This will remove them permanently.</source>
<translation>¿Desea realmente eliminar todos los elementos de 'Objetos Perdidos'? Se eliminarán definitivamente.</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="770"/>
+ <location filename="../gis/CGisListDB.cpp" line="777"/>
<source>Are you sure you want to delete all selected items from Lost&Found? This will remove them permanently.</source>
<translation>¿Desea realmente eliminar todos los elementos.seleccionados de 'Objetos Perdidos'? Se eliminarán definitivamente.</translation>
</message>
@@ -1527,201 +1562,206 @@ To solve this conflict you can create and save a clone, force your version or dr
<context>
<name>CGisListWks</name>
<message>
- <location filename="../gis/CGisListWks.cpp" line="112"/>
+ <location filename="../gis/CGisListWks.cpp" line="114"/>
<source>Save</source>
<translation>Guardar</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="99"/>
+ <location filename="../gis/CGisListWks.cpp" line="101"/>
<source>Edit..</source>
<translation>Editar..</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="121"/>
+ <location filename="../gis/CGisListWks.cpp" line="123"/>
<source>Close</source>
<translation>Cerrar</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="130"/>
+ <location filename="../gis/CGisListWks.cpp" line="132"/>
<source>Update Project on Device</source>
<translation>Actualizar Proyecto en Dsipositivo</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="144"/>
+ <location filename="../gis/CGisListWks.cpp" line="146"/>
<source>Edit...</source>
<translation>Editar...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="100"/>
- <location filename="../gis/CGisListWks.cpp" line="145"/>
+ <location filename="../gis/CGisListWks.cpp" line="102"/>
+ <location filename="../gis/CGisListWks.cpp" line="147"/>
<source>Copy to...</source>
<translation>Copiar a...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="113"/>
+ <location filename="../gis/CGisListWks.cpp" line="115"/>
<source>Save as...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="153"/>
+ <location filename="../gis/CGisListWks.cpp" line="155"/>
<source>Copy Track with Waypoints</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="161"/>
+ <location filename="../gis/CGisListWks.cpp" line="163"/>
<source>Show Bubble</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="163"/>
+ <location filename="../gis/CGisListWks.cpp" line="165"/>
<source>Move Waypoint</source>
<translation>Mover Waypoint</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="164"/>
+ <location filename="../gis/CGisListWks.cpp" line="166"/>
<source>Proj. Waypoint...</source>
<translation>Proyectar Waypoint...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="172"/>
+ <location filename="../gis/CGisListWks.cpp" line="174"/>
<source>Route Instructions</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="174"/>
+ <location filename="../gis/CGisListWks.cpp" line="176"/>
<source>Calculate Route</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="175"/>
+ <location filename="../gis/CGisListWks.cpp" line="177"/>
<source>Reset Route</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="176"/>
+ <location filename="../gis/CGisListWks.cpp" line="178"/>
<source>Edit Route</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="177"/>
+ <location filename="../gis/CGisListWks.cpp" line="179"/>
<source>Convert to Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="193"/>
+ <location filename="../gis/CGisListWks.cpp" line="195"/>
<source>Create Route</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="622"/>
+ <location filename="../gis/CGisListWks.cpp" line="196"/>
+ <source>Change Icon (sel. waypt. only)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="627"/>
<source>Drop items...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="647"/>
- <location filename="../gis/CGisListWks.cpp" line="1631"/>
- <location filename="../gis/CGisListWks.cpp" line="1669"/>
+ <location filename="../gis/CGisListWks.cpp" line="652"/>
+ <location filename="../gis/CGisListWks.cpp" line="1650"/>
+ <location filename="../gis/CGisListWks.cpp" line="1688"/>
<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="1178"/>
+ <location filename="../gis/CGisListWks.cpp" line="1197"/>
<source>Delete project...</source>
<translation type="unfinished">Eliminar Proyecto...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1178"/>
+ <location filename="../gis/CGisListWks.cpp" line="1197"/>
<source>Do you really want to delete %1?</source>
<translation type="unfinished">¿Desea realmente eliminar %1?</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="147"/>
+ <location filename="../gis/CGisListWks.cpp" line="149"/>
<source>Track Profile</source>
<translation>Perfil del Track</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="101"/>
+ <location filename="../gis/CGisListWks.cpp" line="103"/>
<source>Show on Map</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="102"/>
+ <location filename="../gis/CGisListWks.cpp" line="104"/>
<source>Hide from Map</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="108"/>
+ <location filename="../gis/CGisListWks.cpp" line="110"/>
<source>Sort by Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="109"/>
+ <location filename="../gis/CGisListWks.cpp" line="111"/>
<source>Sort by Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="114"/>
+ <location filename="../gis/CGisListWks.cpp" line="116"/>
<source>Save as GPX 1.1 w/o ext...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="117"/>
+ <location filename="../gis/CGisListWks.cpp" line="119"/>
<source>Send to Devices</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="118"/>
+ <location filename="../gis/CGisListWks.cpp" line="120"/>
<source>Sync. with Database</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="149"/>
+ <location filename="../gis/CGisListWks.cpp" line="151"/>
<source>Select Range</source>
<translation>Seleccionar Rango</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="150"/>
+ <location filename="../gis/CGisListWks.cpp" line="152"/>
<source>Edit Track Points</source>
<translation>Editar Puntos del Track</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="151"/>
+ <location filename="../gis/CGisListWks.cpp" line="153"/>
<source>Reverse Track</source>
<translation>Invertir Track</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="152"/>
+ <location filename="../gis/CGisListWks.cpp" line="154"/>
<source>Combine Tracks</source>
<translation>Combinar Tracks</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="186"/>
+ <location filename="../gis/CGisListWks.cpp" line="188"/>
<source>Edit Area Points</source>
<translation>Editar Puntos del Área</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="132"/>
- <location filename="../gis/CGisListWks.cpp" line="155"/>
+ <location filename="../gis/CGisListWks.cpp" line="134"/>
+ <location filename="../gis/CGisListWks.cpp" line="157"/>
<source>Delete</source>
<translation>Borrar</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="773"/>
+ <location filename="../gis/CGisListWks.cpp" line="778"/>
<source>Saving workspace. Please wait.</source>
<translation>Guardando espacio de trabajo. Por favor espere.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="819"/>
+ <location filename="../gis/CGisListWks.cpp" line="824"/>
<source>Loading workspace. Please wait.</source>
<translation>Cargando espacio de trabajo. Por favor espere.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1155"/>
+ <location filename="../gis/CGisListWks.cpp" line="1174"/>
<source>Close all projects...</source>
<translation>Cerrar todos los proyectos...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1155"/>
+ <location filename="../gis/CGisListWks.cpp" line="1174"/>
<source>This will remove all projects from the workspace.</source>
<translation>Esto quitará.todos los proyectos.del espacio de trabajo.</translation>
</message>
@@ -1729,27 +1769,27 @@ To solve this conflict you can create and save a clone, force your version or dr
<context>
<name>CGisWidget</name>
<message>
- <location filename="../gis/CGisWidget.cpp" line="139"/>
+ <location filename="../gis/CGisWidget.cpp" line="110"/>
<source>Load project...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="139"/>
+ <location filename="../gis/CGisWidget.cpp" line="110"/>
<source>The project "%1" is already in the workspace.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="544"/>
+ <location filename="../gis/CGisWidget.cpp" line="515"/>
<source>Copy items...</source>
<translation type="unfinished">Copia elementos....</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="672"/>
+ <location filename="../gis/CGisWidget.cpp" line="664"/>
<source>Cut Track...</source>
<translation>Partir Track...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="672"/>
+ <location filename="../gis/CGisWidget.cpp" line="664"/>
<source>Do you want to delete the original track?</source>
<translation>¿Desea borrar el track original?</translation>
</message>
@@ -1936,48 +1976,48 @@ línea %2, columna %3.
<context>
<name>CMainWindow</name>
<message>
- <location filename="../CMainWindow.cpp" line="562"/>
+ <location filename="../CMainWindow.cpp" line="588"/>
<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="690"/>
+ <location filename="../CMainWindow.cpp" line="716"/>
<source>Ele: %1%2</source>
<translation>Alt: %1%2</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="706"/>
+ <location filename="../CMainWindow.cpp" line="732"/>
<source>[Grid: %1]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="841"/>
+ <location filename="../CMainWindow.cpp" line="867"/>
<source>Load GIS Data...</source>
<translation>Cargar Datos GIS...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="875"/>
+ <location filename="../CMainWindow.cpp" line="901"/>
<source>Select output file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="875"/>
<location filename="../CMainWindow.cpp" line="901"/>
+ <location filename="../CMainWindow.cpp" line="927"/>
<source>QMapShack View (*.view)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="901"/>
+ <location filename="../CMainWindow.cpp" line="927"/>
<source>Select file to load</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1080"/>
+ <location filename="../CMainWindow.cpp" line="1106"/>
<source>Fatal...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1081"/>
+ <location filename="../CMainWindow.cpp" line="1107"/>
<source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your distribution to fix it.</source>
<translation type="unfinished"></translation>
</message>
@@ -1985,7 +2025,7 @@ línea %2, columna %3.
<context>
<name>CMapDraw</name>
<message>
- <location filename="../map/CMapDraw.cpp" line="420"/>
+ <location filename="../map/CMapDraw.cpp" line="457"/>
<source>There are no maps right now. QMapShack is no fun without maps. You can install maps by pressing the 'Help! I want maps!' button in the 'Maps' dock window. Or you can press the F1 key to open the online documentation that tells you how to use QMapShack.
If it's no fun, why don't you provide maps? Well to host maps ready for download and installation requires a good server. And this is not a free service. The project lacks the money. Additionally map and DEM data has a copyright. Therefore the copyright holder has to be asked prior to package the data. This is not that easy as it might sound and for some data you have to pay royalties. The project simply lacks resources to do this. And we think installing the stuff yourself is [...]
@@ -1995,625 +2035,625 @@ If it's no fun, why don't you provide maps? Well to host maps ready fo
<context>
<name>CMapIMG</name>
<message>
- <location filename="../map/CMapIMG.cpp" line="145"/>
+ <location filename="../map/CMapIMG.cpp" line="146"/>
<source>Failed ...</source>
<translation>Falló ...</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="156"/>
+ <location filename="../map/CMapIMG.cpp" line="157"/>
<source>Unspecified</source>
<translation>No especificado</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="157"/>
+ <location filename="../map/CMapIMG.cpp" line="158"/>
<source>French</source>
<translation>Francés</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="158"/>
+ <location filename="../map/CMapIMG.cpp" line="159"/>
<source>German</source>
<translation>Alemán</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="159"/>
+ <location filename="../map/CMapIMG.cpp" line="160"/>
<source>Dutch</source>
<translation>Holandés</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="160"/>
+ <location filename="../map/CMapIMG.cpp" line="161"/>
<source>English</source>
<translation>Inglés</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="161"/>
+ <location filename="../map/CMapIMG.cpp" line="162"/>
<source>Italian</source>
<translation>Italiano</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="162"/>
+ <location filename="../map/CMapIMG.cpp" line="163"/>
<source>Finnish</source>
<translation>Finés</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="163"/>
+ <location filename="../map/CMapIMG.cpp" line="164"/>
<source>Swedish</source>
<translation>Sueco</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="164"/>
+ <location filename="../map/CMapIMG.cpp" line="165"/>
<source>Spanish</source>
<translation>Español</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="165"/>
+ <location filename="../map/CMapIMG.cpp" line="166"/>
<source>Basque</source>
<translation>Euskera</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="166"/>
+ <location filename="../map/CMapIMG.cpp" line="167"/>
<source>Catalan</source>
<translation>Catalán</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="167"/>
+ <location filename="../map/CMapIMG.cpp" line="168"/>
<source>Galician</source>
<translation>Gallego</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="168"/>
+ <location filename="../map/CMapIMG.cpp" line="169"/>
<source>Welsh</source>
<translation>Galés</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="169"/>
+ <location filename="../map/CMapIMG.cpp" line="170"/>
<source>Gaelic</source>
<translation>Gaélico</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="170"/>
+ <location filename="../map/CMapIMG.cpp" line="171"/>
<source>Danish</source>
<translation>Danés</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="171"/>
+ <location filename="../map/CMapIMG.cpp" line="172"/>
<source>Norwegian</source>
<translation>Noruego</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="172"/>
+ <location filename="../map/CMapIMG.cpp" line="173"/>
<source>Portuguese</source>
<translation>Portugués</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="173"/>
+ <location filename="../map/CMapIMG.cpp" line="174"/>
<source>Slovak</source>
<translation>Eslovaco</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="174"/>
+ <location filename="../map/CMapIMG.cpp" line="175"/>
<source>Czech</source>
<translation>Checo</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="175"/>
+ <location filename="../map/CMapIMG.cpp" line="176"/>
<source>Croatian</source>
<translation>Croata</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="176"/>
+ <location filename="../map/CMapIMG.cpp" line="177"/>
<source>Hungarian</source>
<translation>Húngaro</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="177"/>
+ <location filename="../map/CMapIMG.cpp" line="178"/>
<source>Polish</source>
<translation>Polaco</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="178"/>
+ <location filename="../map/CMapIMG.cpp" line="179"/>
<source>Turkish</source>
<translation>Turco</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="179"/>
+ <location filename="../map/CMapIMG.cpp" line="180"/>
<source>Greek</source>
<translation>Griego</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="180"/>
+ <location filename="../map/CMapIMG.cpp" line="181"/>
<source>Slovenian</source>
<translation>Esloveno</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="181"/>
+ <location filename="../map/CMapIMG.cpp" line="182"/>
<source>Russian</source>
<translation>Ruso</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="182"/>
+ <location filename="../map/CMapIMG.cpp" line="183"/>
<source>Estonian</source>
<translation>Estonio</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="183"/>
+ <location filename="../map/CMapIMG.cpp" line="184"/>
<source>Latvian</source>
<translation>Letón</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="184"/>
+ <location filename="../map/CMapIMG.cpp" line="185"/>
<source>Romanian</source>
<translation>Rumano</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="185"/>
+ <location filename="../map/CMapIMG.cpp" line="186"/>
<source>Albanian</source>
<translation>Albanés</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="186"/>
+ <location filename="../map/CMapIMG.cpp" line="187"/>
<source>Bosnian</source>
<translation>Bosnio</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="187"/>
+ <location filename="../map/CMapIMG.cpp" line="188"/>
<source>Lithuanian</source>
<translation>Lituano</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="188"/>
+ <location filename="../map/CMapIMG.cpp" line="189"/>
<source>Serbian</source>
<translation>Serbio</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="189"/>
+ <location filename="../map/CMapIMG.cpp" line="190"/>
<source>Macedonian</source>
<translation>Macedonio</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="190"/>
+ <location filename="../map/CMapIMG.cpp" line="191"/>
<source>Bulgarian</source>
<translation>Búlgaro</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="247"/>
+ <location filename="../map/CMapIMG.cpp" line="248"/>
<source>Major highway</source>
<translation>Autovía Primaria</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="248"/>
+ <location filename="../map/CMapIMG.cpp" line="249"/>
<source>Principal highway</source>
<translation>Autovía secundaria</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="249"/>
+ <location filename="../map/CMapIMG.cpp" line="250"/>
<source>Other highway</source>
<translation>Otras autovías</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="250"/>
+ <location filename="../map/CMapIMG.cpp" line="251"/>
<source>Arterial road</source>
<translation>Carretera principal</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="251"/>
+ <location filename="../map/CMapIMG.cpp" line="252"/>
<source>Collector road</source>
<translation>Carretera secundaria</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="252"/>
+ <location filename="../map/CMapIMG.cpp" line="253"/>
<source>Residential street</source>
<translation>Calle residencial</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="253"/>
+ <location filename="../map/CMapIMG.cpp" line="254"/>
<source>Alley/Private road</source>
<translation>Callejón/Carretera privada</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="254"/>
+ <location filename="../map/CMapIMG.cpp" line="255"/>
<source>Highway ramp, low speed</source>
<translation>Acceso a autopista, baja velocidad</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="255"/>
+ <location filename="../map/CMapIMG.cpp" line="256"/>
<source>Highway ramp, high speed</source>
<translation>Acceso a autopista, alta velocidad</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="256"/>
+ <location filename="../map/CMapIMG.cpp" line="257"/>
<source>Unpaved road</source>
<translation>Carretera sin asfaltar</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="257"/>
+ <location filename="../map/CMapIMG.cpp" line="258"/>
<source>Major highway connector</source>
<translation>Conexión con autovía principal</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="258"/>
+ <location filename="../map/CMapIMG.cpp" line="259"/>
<source>Roundabout</source>
<translation>Rotonda</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="259"/>
+ <location filename="../map/CMapIMG.cpp" line="260"/>
<source>Railroad</source>
<translation>Ferrocarril</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="260"/>
+ <location filename="../map/CMapIMG.cpp" line="261"/>
<source>Shoreline</source>
<translation>Línea de costa</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="261"/>
+ <location filename="../map/CMapIMG.cpp" line="262"/>
<source>Trail</source>
<translation>Sendero</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="262"/>
+ <location filename="../map/CMapIMG.cpp" line="263"/>
<source>Stream</source>
<translation>Arroyo</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="263"/>
+ <location filename="../map/CMapIMG.cpp" line="264"/>
<source>Time zone</source>
<translation>Zona horaria</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="264"/>
<location filename="../map/CMapIMG.cpp" line="265"/>
+ <location filename="../map/CMapIMG.cpp" line="266"/>
<source>Ferry</source>
<translation>Ferry</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="266"/>
+ <location filename="../map/CMapIMG.cpp" line="267"/>
<source>State/province border</source>
<translation>Frontera de estado/provincia</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="267"/>
+ <location filename="../map/CMapIMG.cpp" line="268"/>
<source>County/parish border</source>
<translation>Frontera de condado/término municipal</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="268"/>
+ <location filename="../map/CMapIMG.cpp" line="269"/>
<source>International border</source>
<translation>Frontera internacional</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="269"/>
+ <location filename="../map/CMapIMG.cpp" line="270"/>
<source>River</source>
<translation>Río</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="270"/>
+ <location filename="../map/CMapIMG.cpp" line="271"/>
<source>Minor land contour</source>
<translation>Curva altimétrica menor</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="271"/>
+ <location filename="../map/CMapIMG.cpp" line="272"/>
<source>Intermediate land contour</source>
<translation>Curva altimétrica intermedia</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="272"/>
+ <location filename="../map/CMapIMG.cpp" line="273"/>
<source>Major land contour</source>
<translation>Curva altimétrica principal</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="273"/>
+ <location filename="../map/CMapIMG.cpp" line="274"/>
<source>Minor depth contour</source>
<translation>Curva batimétrica menor</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="274"/>
+ <location filename="../map/CMapIMG.cpp" line="275"/>
<source>Intermediate depth contour</source>
<translation>Curva batimétrica intermedia</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="275"/>
+ <location filename="../map/CMapIMG.cpp" line="276"/>
<source>Major depth contour</source>
<translation>Curva batimétrica principal</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="276"/>
+ <location filename="../map/CMapIMG.cpp" line="277"/>
<source>Intermittent stream</source>
<translation>Curso intermitente</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="277"/>
- <location filename="../map/CMapIMG.cpp" line="359"/>
+ <location filename="../map/CMapIMG.cpp" line="278"/>
+ <location filename="../map/CMapIMG.cpp" line="360"/>
<source>Airport runway</source>
<translation>Pista de aterrizaje</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="278"/>
+ <location filename="../map/CMapIMG.cpp" line="279"/>
<source>Pipeline</source>
<translation>Tubería</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="279"/>
+ <location filename="../map/CMapIMG.cpp" line="280"/>
<source>Powerline</source>
<translation>Línea eléctrica</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="280"/>
+ <location filename="../map/CMapIMG.cpp" line="281"/>
<source>Marine boundary</source>
<translation>Límite marítimo</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="281"/>
+ <location filename="../map/CMapIMG.cpp" line="282"/>
<source>Hazard boundary</source>
<translation>Límite de peligro</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="346"/>
+ <location filename="../map/CMapIMG.cpp" line="347"/>
<source>Large urban area (>200K)</source>
<translation>Área urbana grande (>200K)</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="347"/>
+ <location filename="../map/CMapIMG.cpp" line="348"/>
<source>Small urban area (<200K)</source>
<translation>Área urbana pequeña (<200K)</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="348"/>
+ <location filename="../map/CMapIMG.cpp" line="349"/>
<source>Rural housing area</source>
<translation>Área de alojamienos rurales</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="349"/>
+ <location filename="../map/CMapIMG.cpp" line="350"/>
<source>Military base</source>
<translation>Base militar</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="350"/>
+ <location filename="../map/CMapIMG.cpp" line="351"/>
<source>Parking lot</source>
<translation>Aparcamiento</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="351"/>
+ <location filename="../map/CMapIMG.cpp" line="352"/>
<source>Parking garage</source>
<translation>Garaje</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="352"/>
+ <location filename="../map/CMapIMG.cpp" line="353"/>
<source>Airport</source>
<translation>Aeropuerto</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="353"/>
+ <location filename="../map/CMapIMG.cpp" line="354"/>
<source>Shopping center</source>
<translation>Centro comercial</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="354"/>
+ <location filename="../map/CMapIMG.cpp" line="355"/>
<source>Marina</source>
<translation>Puerto deportivo</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="355"/>
+ <location filename="../map/CMapIMG.cpp" line="356"/>
<source>University/College</source>
<translation>Universidad/Facultad</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="356"/>
+ <location filename="../map/CMapIMG.cpp" line="357"/>
<source>Hospital</source>
<translation>Hospital</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="357"/>
+ <location filename="../map/CMapIMG.cpp" line="358"/>
<source>Industrial complex</source>
<translation>Complejo industrial</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="358"/>
+ <location filename="../map/CMapIMG.cpp" line="359"/>
<source>Reservation</source>
<translation>Reserva natural</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="360"/>
+ <location filename="../map/CMapIMG.cpp" line="361"/>
<source>Man-made area</source>
<translation>Área creada por el hombre</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="361"/>
+ <location filename="../map/CMapIMG.cpp" line="362"/>
<source>Sports complex</source>
<translation>Complejo deportivo</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="362"/>
+ <location filename="../map/CMapIMG.cpp" line="363"/>
<source>Golf course</source>
<translation>Recorrido de golf</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="363"/>
+ <location filename="../map/CMapIMG.cpp" line="364"/>
<source>Cemetery</source>
<translation>Cementerio</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="364"/>
<location filename="../map/CMapIMG.cpp" line="365"/>
<location filename="../map/CMapIMG.cpp" line="366"/>
+ <location filename="../map/CMapIMG.cpp" line="367"/>
<source>National park</source>
<translation>Parque nacional</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="367"/>
+ <location filename="../map/CMapIMG.cpp" line="368"/>
<source>City park</source>
<translation>Parque urbano</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="368"/>
<location filename="../map/CMapIMG.cpp" line="369"/>
<location filename="../map/CMapIMG.cpp" line="370"/>
+ <location filename="../map/CMapIMG.cpp" line="371"/>
<source>State park</source>
<translation>Parque regional</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="371"/>
+ <location filename="../map/CMapIMG.cpp" line="372"/>
<source>Forest</source>
<translation>Bosque</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="372"/>
+ <location filename="../map/CMapIMG.cpp" line="373"/>
<source>Ocean</source>
<translation>Océano</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="373"/>
- <location filename="../map/CMapIMG.cpp" line="375"/>
- <location filename="../map/CMapIMG.cpp" line="385"/>
+ <location filename="../map/CMapIMG.cpp" line="374"/>
+ <location filename="../map/CMapIMG.cpp" line="376"/>
+ <location filename="../map/CMapIMG.cpp" line="386"/>
<source>Blue (unknown)</source>
<translation>Azul (desconocido)</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="374"/>
+ <location filename="../map/CMapIMG.cpp" line="375"/>
<source>Sea</source>
<translation>Mar</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="376"/>
<location filename="../map/CMapIMG.cpp" line="377"/>
- <location filename="../map/CMapIMG.cpp" line="384"/>
+ <location filename="../map/CMapIMG.cpp" line="378"/>
+ <location filename="../map/CMapIMG.cpp" line="385"/>
<source>Large lake</source>
<translation>Lago grande</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="378"/>
<location filename="../map/CMapIMG.cpp" line="379"/>
+ <location filename="../map/CMapIMG.cpp" line="380"/>
<source>Medium lake</source>
<translation>Lago mediano</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="380"/>
<location filename="../map/CMapIMG.cpp" line="381"/>
+ <location filename="../map/CMapIMG.cpp" line="382"/>
<source>Small lake</source>
<translation>Lago pequeño</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="382"/>
<location filename="../map/CMapIMG.cpp" line="383"/>
+ <location filename="../map/CMapIMG.cpp" line="384"/>
<source>Major lake</source>
<translation>Lago principal</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="386"/>
+ <location filename="../map/CMapIMG.cpp" line="387"/>
<source>Major River</source>
<translation>Río Principal</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="387"/>
+ <location filename="../map/CMapIMG.cpp" line="388"/>
<source>Large River</source>
<translation>Río Grande</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="388"/>
+ <location filename="../map/CMapIMG.cpp" line="389"/>
<source>Medium River</source>
<translation>Río Mediano</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="389"/>
+ <location filename="../map/CMapIMG.cpp" line="390"/>
<source>Small River</source>
<translation>Río Pequeño</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="392"/>
+ <location filename="../map/CMapIMG.cpp" line="393"/>
<source>Intermittent water</source>
<translation>Agua intermitente</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="393"/>
+ <location filename="../map/CMapIMG.cpp" line="394"/>
<source>Wetland/Swamp</source>
<translation>Marisma/Ciénaga</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="394"/>
+ <location filename="../map/CMapIMG.cpp" line="395"/>
<source>Glacier</source>
<translation>Glaciar</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="395"/>
+ <location filename="../map/CMapIMG.cpp" line="396"/>
<source>Orchard/Plantation</source>
<translation>Invernadero/Plantación</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="396"/>
+ <location filename="../map/CMapIMG.cpp" line="397"/>
<source>Scrub</source>
<translation>Monte bajo</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="397"/>
+ <location filename="../map/CMapIMG.cpp" line="398"/>
<source>Tundra</source>
<translation>Tundra</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="398"/>
+ <location filename="../map/CMapIMG.cpp" line="399"/>
<source>Flat</source>
<translation>Llanura</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="399"/>
+ <location filename="../map/CMapIMG.cpp" line="400"/>
<source>???</source>
<translation></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="435"/>
+ <location filename="../map/CMapIMG.cpp" line="436"/>
<source>Failed to read: </source>
<translation>Fallo al leer: </translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="478"/>
+ <location filename="../map/CMapIMG.cpp" line="479"/>
<source>Failed to open: </source>
<translation>Fallo al abrir: </translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="502"/>
- <location filename="../map/CMapIMG.cpp" line="506"/>
+ <location filename="../map/CMapIMG.cpp" line="503"/>
+ <location filename="../map/CMapIMG.cpp" line="507"/>
<source>Bad file format: </source>
<translation>Formato de archivo incorrecto: </translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="595"/>
+ <location filename="../map/CMapIMG.cpp" line="596"/>
<source>Failed to read file structure: </source>
<translation>Fallo al leer la estructura del archivo: </translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="630"/>
+ <location filename="../map/CMapIMG.cpp" line="631"/>
<source>Loading %1</source>
<translation>Cargando %1</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="636"/>
+ <location filename="../map/CMapIMG.cpp" line="637"/>
<source>User abort: </source>
<translation>Abortado por el usuario: </translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="639"/>
+ <location filename="../map/CMapIMG.cpp" line="640"/>
<source>File is NT format. QMapShack is unable to read map files with NT format: </source>
<translation>El archivo está en formato NT. QMapShack no puede leer archivos en formato NT: </translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="730"/>
+ <location filename="../map/CMapIMG.cpp" line="731"/>
<source>File contains locked / encrypted data. Garmin does not want you to use this file with any other software than the one supplied by Garmin.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2305"/>
- <location filename="../map/CMapIMG.cpp" line="2311"/>
- <location filename="../map/CMapIMG.cpp" line="2315"/>
+ <location filename="../map/CMapIMG.cpp" line="2342"/>
+ <location filename="../map/CMapIMG.cpp" line="2348"/>
+ <location filename="../map/CMapIMG.cpp" line="2352"/>
<source>Point of Interest</source>
<translation>Punto de Interés</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2401"/>
+ <location filename="../map/CMapIMG.cpp" line="2438"/>
<source>Unknown</source>
<translation>Desconocido</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2443"/>
- <location filename="../map/CMapIMG.cpp" line="2451"/>
- <location filename="../map/CMapIMG.cpp" line="2458"/>
+ <location filename="../map/CMapIMG.cpp" line="2480"/>
+ <location filename="../map/CMapIMG.cpp" line="2488"/>
+ <location filename="../map/CMapIMG.cpp" line="2495"/>
<source>Area</source>
<translation>Área</translation>
</message>
@@ -2760,7 +2800,7 @@ línea %2, columna %3.
<location filename="../map/CMapVRT.cpp" line="45"/>
<location filename="../map/CMapVRT.cpp" line="59"/>
<location filename="../map/CMapVRT.cpp" line="88"/>
- <location filename="../map/CMapVRT.cpp" line="126"/>
+ <location filename="../map/CMapVRT.cpp" line="133"/>
<source>Error...</source>
<translation>Error...</translation>
</message>
@@ -2776,7 +2816,7 @@ línea %2, columna %3.
<translation>El archivo debe ser con paleta de 8 bits o escala de grises indexada.</translation>
</message>
<message>
- <location filename="../map/CMapVRT.cpp" line="126"/>
+ <location filename="../map/CMapVRT.cpp" line="133"/>
<source>No georeference information found.</source>
<translation>No se encontró información de georreferenciación.</translation>
</message>
@@ -2784,22 +2824,22 @@ línea %2, columna %3.
<context>
<name>CMapVrtBuilder</name>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="28"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="29"/>
<source>Build GDAL VRT</source>
<translation>Crear GDAL VRT</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="46"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="47"/>
<source>Select files...</source>
<translation>Seleccionar ficheros de origen...</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="70"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="71"/>
<source>Select target file...</source>
<translation>Seleccionar fichero de destino...</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="114"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="115"/>
<source>!!! done !!!
</source>
<translation type="unfinished"></translation>
@@ -2930,36 +2970,41 @@ Estructura desconocida.</translation>
<name>CMouseNormal</name>
<message>
<location filename="../mouse/CMouseNormal.cpp" line="39"/>
+ <source>Add POI as Waypoint</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mouse/CMouseNormal.cpp" line="40"/>
<source>Add Waypoint</source>
<translation>Añadir Waypoint</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="40"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="41"/>
<source>Add Track</source>
<translation>Añadir Track</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="41"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="42"/>
<source>Add Route</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="42"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="43"/>
<source>Add Area</source>
<translation>Añadir Área</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="44"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="45"/>
<source>Select Items On Map</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="46"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="47"/>
<source>Copy position</source>
<translation>Copiar posición</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="47"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="48"/>
<source>Copy position (Grid)</source>
<translation type="unfinished"></translation>
</message>
@@ -2975,7 +3020,7 @@ Estructura desconocida.</translation>
<context>
<name>CMouseRangeTrk</name>
<message>
- <location filename="../mouse/CMouseRangeTrk.cpp" line="227"/>
+ <location filename="../mouse/CMouseRangeTrk.cpp" line="224"/>
<source><b>Select Range</b><br/>Select first track point with left mouse button. And then a second one. Leave range selection with a click of the right mouse button.<br/></source>
<translation type="unfinished"></translation>
</message>
@@ -2983,32 +3028,32 @@ Estructura desconocida.</translation>
<context>
<name>CMouseSelect</name>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="31"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="32"/>
<source><b>Select Items On Map</b><br/>Select a rectangular area on the map. Use the left mouse button and move the mouse. Abort with a right click. Adjust the selection by point-click-move on the corners.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="96"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="98"/>
<source><b>Selected:</b><br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="104"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="106"/>
<source>%1 waypoints<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="99"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="101"/>
<source>%1 tracks<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="109"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="111"/>
<source>%1 routes<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="114"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="116"/>
<source>%1 areas<br/></source>
<translation type="unfinished"></translation>
</message>
@@ -3097,7 +3142,7 @@ y: %4 m/px</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../helpers/CProgressDialog.cpp" line="82"/>
+ <location filename="../helpers/CProgressDialog.cpp" line="86"/>
<source>Elapsed time: %1 seconds.</source>
<translation type="unfinished"></translation>
</message>
@@ -3328,6 +3373,458 @@ no es una definición de sistema de coordenadas válido:
</message>
</context>
<context>
+ <name>CRouterBRouter</name>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="49"/>
+ <source>original</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="50"/>
+ <source>first alternative</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="51"/>
+ <source>second alternative</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="52"/>
+ <source>third alternative</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="147"/>
+ <source>BRouter (offline)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="152"/>
+ <source>BRouter (online)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="180"/>
+ <source>profile: %1, alternative: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="267"/>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="381"/>
+ <source>response is empty</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="304"/>
+ <source>Bad response from server: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="352"/>
+ <source><b>BRouter</b><br/>Routing request sent to server. Please wait...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="246"/>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="355"/>
+ <source>Calculate route with %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="415"/>
+ <source><b>BRouter</b><br/>Bad response from server:<br/>%1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="405"/>
+ <source><br/>Calculation time: %1s</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="509"/>
+ <source>Error</source>
+ <translation type="unfinished">Error</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="561"/>
+ <source>running</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="553"/>
+ <source>starting</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="515"/>
+ <source>QMapShack communicates with BRouter via a network connection. Usually this is done on a special address that can't be reached from outside your device. However BRouter listens for connections on all available interfaces. If you are in your own private network with an active firewall, this is not much of a problem. If you are in a public network every open port is a risk as it can be used by someone else to compromise your system. We do not recommend to use the local [...]
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="542"/>
+ <source>Warning...</source>
+ <translation type="unfinished">Aviso...</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="547"/>
+ <source>I understand the risk. Don't tell me again.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="568"/>
+ <source>stopped</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="579"/>
+ <source>not installed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="590"/>
+ <source>online</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterSetup</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="479"/>
+ <source>%1 not accessible</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="489"/>
+ <source>%1 invalid result</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="533"/>
+ <source>Error parsing online-config:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="538"/>
+ <source>Network error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterSetupWizard</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="38"/>
+ <source>Restore Default Values</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="371"/>
+ <source>Open Directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="378"/>
+ <source>select Java Executable</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="414"/>
+ <source>please select BRouter installation directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="419"/>
+ <source>selected directory does not exist</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="420"/>
+ <source>create directory and install BRouter there</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="427"/>
+ <source>existing BRouter installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="428"/>
+ <source>update existing BRouter installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="433"/>
+ <source>empty directory, create new BRouter installation here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="434"/>
+ <source>create new BRouter installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="442"/>
+ <source>seems to be a valid Java-executable</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="446"/>
+ <source>doesn't seem to be a valid Java-executable</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="451"/>
+ <source>Java Executable not found</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="496"/>
+ <source>Error loading installation-page at %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="505"/>
+ <source>no brouter-version to install selected</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="513"/>
+ <source>selected %1 for download and installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="524"/>
+ <source>Warning...</source>
+ <translation type="unfinished">Aviso...</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="529"/>
+ <source>Download: %1<br/><br/>This will download and install a zip file from a download location that is not secured by any standard at all, using plain HTTP. Usually this should be HTTPS. The risk is someone redirecting the request and sending you a replacement zip with malware. There is no way for QMapShack to detect this. <br/>If you do not understand this or if you are in doubt, do not proceed and abort. Use the Web version of BRouter instead.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="541"/>
+ <source>I understand the risk and wish to proceed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="553"/>
+ <source>download %1 started</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="565"/>
+ <source>Network Error: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="586"/>
+ <source>download %1 finished</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="588"/>
+ <source>unzipping:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="593"/>
+ <source>ready.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="613"/>
+ <source>download of brouter failed: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="623"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="630"/>
+ <source>retrieving available profiles from %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="654"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="736"/>
+ <source>content of profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="729"/>
+ <source>Error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="466"/>
+ <source>Error creating directory %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="571"/>
+ <source>Error directory %1 does not exist</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="578"/>
+ <source>Error creating file %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="582"/>
+ <source>Error writing to file %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterTilesPage</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesPage.cpp" line="82"/>
+ <source>Continue with Setup</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterTilesSelect</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="98"/>
+ <source>available routing-data is being determined.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="108"/>
+ <source>Select outdated</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="109"/>
+ <source>Clear Selection</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="110"/>
+ <source>Delete selection</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="111"/>
+ <source>Download</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="281"/>
+ <source>Error creating segments directory %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="365"/>
+ <source>cannot parse: %1 is not a date</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="390"/>
+ <source>cannot parse: %1 is not a valid size</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="409"/>
+ <source>Error retrieving available routing data from %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="490"/>
+ <source>segments directory does not exist: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="504"/>
+ <source>error creating file %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="536"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="576"/>
+ <source>no valid request for filename %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="541"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="584"/>
+ <source>no open file assigned to request for %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="551"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="594"/>
+ <source>error writing to file %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="602"/>
+ <source>error renaming file %1 to %2: %3</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="685"/>
+ <source>up-to-date: %1 (%2), outdated: %3 (%4), to be downloaded: %5 (%6)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="783"/>
+ <source>being downloaded: %1 of %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="803"/>
+ <source>no local data, online available: %1 (%2)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="789"/>
+ <source>local data outdated (%1, %2 - remote %3, %4)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="190"/>
+ <source>Error removing %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="321"/>
+ <source>Network Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="330"/>
+ <source>invalid result, no files found</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="797"/>
+ <source>local data up to date (%1, %2)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="809"/>
+ <source>no routing-data available</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterToolShell</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="74"/>
+ <source>!!! done !!!
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="79"/>
+ <source>!!! failed !!!
+</source>
+ <translation type="unfinished">!!! fallo !!!</translation>
+ </message>
+</context>
+<context>
<name>CRouterMapQuest</name>
<message>
<location filename="../gis/rte/router/CRouterMapQuest.cpp" line="37"/>
@@ -3650,7 +4147,6 @@ no es una definición de sistema de coordenadas válido:
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="55"/>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="238"/>
<source>Warning...</source>
<translation type="unfinished">Aviso...</translation>
</message>
@@ -3660,18 +4156,13 @@ no es una definición de sistema de coordenadas válido:
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="238"/>
- <source>%1: Due to limitations in the Windows POSIX API Routino can't handle files larger than 4GB.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="338"/>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="425"/>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="332"/>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="419"/>
<source>Calculate route with %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="346"/>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="340"/>
<source><br/>Calculation time: %1s</source>
<translation type="unfinished"></translation>
</message>
@@ -3679,12 +4170,12 @@ no es una definición de sistema de coordenadas válido:
<context>
<name>CRouterRoutinoPathSetup</name>
<message>
- <location filename="../gis/rte/router/CRouterRoutinoPathSetup.cpp" line="40"/>
+ <location filename="../gis/rte/router/routino/CRouterRoutinoPathSetup.cpp" line="40"/>
<source>Add or remove paths containing Routino data. There can be multiple databases in a path but no sub-path is parsed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutinoPathSetup.cpp" line="55"/>
+ <location filename="../gis/rte/router/routino/CRouterRoutinoPathSetup.cpp" line="55"/>
<source>Select routing data file path...</source>
<translation type="unfinished"></translation>
</message>
@@ -3692,35 +4183,40 @@ no es una definición de sistema de coordenadas válido:
<context>
<name>CRouterSetup</name>
<message>
- <location filename="../gis/rte/router/CRouterSetup.cpp" line="36"/>
+ <location filename="../gis/rte/router/CRouterSetup.cpp" line="38"/>
<source>Routino (offline)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterSetup.cpp" line="37"/>
+ <location filename="../gis/rte/router/CRouterSetup.cpp" line="39"/>
<source>MapQuest (online)</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gis/rte/router/CRouterSetup.cpp" line="40"/>
+ <source>BRouter (online)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CRoutinoDatabaseBuilder</name>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="32"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="33"/>
<source>Create Routino Database</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="56"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="57"/>
<source>Select files...</source>
<translation type="unfinished">Seleccionar ficheros de origen...</translation>
</message>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="80"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="81"/>
<source>Select target path...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="141"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="142"/>
<source>!!! done !!!
</source>
<translation type="unfinished"></translation>
@@ -3912,18 +4408,116 @@ línea %2, columna %3.
<context>
<name>CTableTrk</name>
<message>
- <location filename="../gis/trk/CTableTrk.cpp" line="99"/>
- <source>Double click to edit elevation value</source>
+ <location filename="../gis/trk/CTableTrk.cpp" line="99"/>
+ <source>Double click to edit elevation value</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CTableTrk.cpp" line="125"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="133"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="136"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="141"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="155"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="157"/>
+ <source>%1 %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CTcxProject</name>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="51"/>
+ <source>Failed to load file %1...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="73"/>
+ <source>Failed to open %1</source>
+ <translation type="unfinished">Fallo al abrir %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="84"/>
+ <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+ <translation type="unfinished">Fallo al leer: %1
+línea %2, columna %3.
+ %4</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="91"/>
+ <source>Not a TCX file: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="101"/>
+ <source>This TCX file contains at least 1 workout, but neither an activity nor a course. As workouts do not contain position data, they can not be imported to QMapShack.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="106"/>
+ <source>This TCX file does not contain any activity or course: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="275"/>
+ <source>File exists ...</source>
+ <translation type="unfinished">El archivo ya existe ...</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="276"/>
+ <source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file. Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="315"/>
+ <source>The track <b>%1</b> you have selected contains trackpoints with invalid timestamps. Device might not accept the generated TCX course file if left as is. <b>Do you want to apply a filter with constant speed (10 m/s) and continue?</b></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="339"/>
+ <source>Course</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="340"/>
+ <source>Activity</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="341"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="314"/>
+ <source>Track with invalid timestamps...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="334"/>
+ <source>Activity or course?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="335"/>
+ <source>QMapShack does not know how track <b>%1</b> should be saved. <b>Do you want to save it as a course or as an activity? </b>Remember that only waypoints close enough to the track will be saved when saving as a course. Waypoints will not be saved when saving as an activity.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CTableTrk.cpp" line="125"/>
- <location filename="../gis/trk/CTableTrk.cpp" line="133"/>
- <location filename="../gis/trk/CTableTrk.cpp" line="136"/>
- <location filename="../gis/trk/CTableTrk.cpp" line="141"/>
- <location filename="../gis/trk/CTableTrk.cpp" line="155"/>
- <location filename="../gis/trk/CTableTrk.cpp" line="157"/>
- <source>%1 %2</source>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="432"/>
+ <source>Failed to create file '%1'</source>
+ <translation type="unfinished">Fallo al crear el archivo '%1'</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="453"/>
+ <source>Failed to write file '%1'</source>
+ <translation type="unfinished">Fallo al escribir en el archivo '%1'</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="435"/>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="454"/>
+ <source>Saving GIS data failed...</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -4002,137 +4596,148 @@ línea %2, columna %3.
</message>
<message>
<location filename="../IAbout.ui" line="62"/>
- <location filename="../IAbout.ui" line="106"/>
- <location filename="../IAbout.ui" line="120"/>
- <location filename="../IAbout.ui" line="134"/>
- <location filename="../IAbout.ui" line="148"/>
+ <location filename="../IAbout.ui" line="113"/>
+ <location filename="../IAbout.ui" line="127"/>
+ <location filename="../IAbout.ui" line="141"/>
+ <location filename="../IAbout.ui" line="155"/>
<source>TextLabel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="99"/>
+ <location filename="../IAbout.ui" line="106"/>
<source>Qt</source>
<translation>Qt</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="113"/>
+ <location filename="../IAbout.ui" line="120"/>
<source>GDAL</source>
<translation>GDAL</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="127"/>
+ <location filename="../IAbout.ui" line="134"/>
<source>Proj4</source>
<translation>Proj4</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="141"/>
+ <location filename="../IAbout.ui" line="148"/>
<source>Routino</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="172"/>
+ <location filename="../IAbout.ui" line="179"/>
<source>Czech:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="195"/>
+ <location filename="../IAbout.ui" line="202"/>
<source>German:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="218"/>
+ <location filename="../IAbout.ui" line="212"/>
+ <source>Oliver Eichler</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../IAbout.ui" line="225"/>
<source>Dutch:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="241"/>
+ <location filename="../IAbout.ui" line="248"/>
<source>French:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="251"/>
+ <location filename="../IAbout.ui" line="258"/>
<source>Rainer Unseld </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="381"/>
- <source>Christian Eichler (qms at christian-eichler.de)
-Ivo Kronenberg</source>
+ <location filename="../IAbout.ui" line="295"/>
+ <source>Russian:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../IAbout.ui" line="302"/>
+ <source>Wolfgang Thämelt</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../IAbout.ui" line="428"/>
+ <source>© 2017 Oliver Eichler (oliver.eichler at gmx.de)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="182"/>
+ <location filename="../IAbout.ui" line="189"/>
<source>Pavel Fric</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="281"/>
+ <location filename="../IAbout.ui" line="288"/>
<source><b>Translation:</b></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="228"/>
+ <location filename="../IAbout.ui" line="235"/>
<source>Harrie Klomp</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="271"/>
+ <location filename="../IAbout.ui" line="278"/>
<source>Spanish:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="305"/>
+ <location filename="../IAbout.ui" line="326"/>
<source>Win64:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="321"/>
+ <location filename="../IAbout.ui" line="342"/>
<source>OS X:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="345"/>
+ <location filename="../IAbout.ui" line="366"/>
<source><b>Binaries:</b></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="374"/>
+ <location filename="../IAbout.ui" line="395"/>
<source><b>Contributors:</b></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="205"/>
- <source>Josef Latt</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../IAbout.ui" line="258"/>
+ <location filename="../IAbout.ui" line="265"/>
<source>Jose Luis Domingo Lopez</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="338"/>
+ <location filename="../IAbout.ui" line="359"/>
<source>Ivo Kronenberg</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="331"/>
+ <location filename="../IAbout.ui" line="352"/>
<source>Helmut Schmidt</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="354"/>
+ <location filename="../IAbout.ui" line="375"/>
<source>...and thanks to all Linux binary maintainers for doing a great job. Special thanks to Dan Horák and Bas Couwenberg for showing presence on the mailing list to discuss distribution related topics.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="399"/>
- <source>This software is licensed under GPL3 or any later version</source>
+ <location filename="../IAbout.ui" line="402"/>
+ <source>Christian Eichler (qms at christian-eichler.de)
+Ivo Kronenberg
+Norbert Truchsess (norbert.truchsess at t-online.de)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="406"/>
- <source>© 2014 Oliver Eichler (oliver.eichler at gmx.de)</source>
+ <location filename="../IAbout.ui" line="421"/>
+ <source>This software is licensed under GPL3 or any later version</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -4185,13 +4790,23 @@ Ivo Kronenberg</source>
<translation>Combinar Tracks...</translation>
</message>
<message>
- <location filename="../gis/trk/ICombineTrk.ui" line="43"/>
- <location filename="../gis/trk/ICombineTrk.ui" line="70"/>
- <location filename="../gis/trk/ICombineTrk.ui" line="117"/>
- <location filename="../gis/trk/ICombineTrk.ui" line="144"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="24"/>
+ <source>Available Tracks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/ICombineTrk.ui" line="54"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="81"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="139"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="166"/>
<source>...</source>
<translation>...</translation>
</message>
+ <message>
+ <location filename="../gis/trk/ICombineTrk.ui" line="109"/>
+ <source>Combined Tracks</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ICoordFormatSetup</name>
@@ -4243,17 +4858,22 @@ Ivo Kronenberg</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/ICutTrk.ui" line="27"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="30"/>
<source>Keep both parts of the track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/ICutTrk.ui" line="37"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="43"/>
<source>Keep first part of the track and delete second one</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/ICutTrk.ui" line="60"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="55"/>
+ <source>Cut Mode:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/ICutTrk.ui" line="136"/>
<source>Check this to store the result into a new track.
If you keep both parts of the track you have to create new ones.
@@ -4262,7 +4882,7 @@ 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/ICutTrk.ui" line="67"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="143"/>
<source>Create a new track</source>
<translation type="unfinished"></translation>
</message>
@@ -4574,8 +5194,8 @@ If you want to keep just one half you can simply remove the points, or check thi
</message>
<message>
<location filename="../gis/ovl/IDetailsOvlArea.ui" line="132"/>
- <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>
+ <source>The area was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../gis/ovl/IDetailsOvlArea.ui" line="148"/>
@@ -4687,16 +5307,16 @@ If you want to keep just one half you can simply remove the points, or check thi
<translation type="unfinished">Información</translation>
</message>
<message>
+ <location filename="../gis/rte/IDetailsRte.ui" line="154"/>
+ <source>The route was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../gis/rte/IDetailsRte.ui" line="205"/>
<source>-</source>
<translation type="unfinished">-</translation>
</message>
<message>
- <location filename="../gis/rte/IDetailsRte.ui" line="154"/>
- <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/rte/IDetailsRte.ui" line="170"/>
<source>Toggle read only mode. You have to open the lock to edit the item.</source>
<translation type="unfinished"></translation>
@@ -4822,11 +5442,6 @@ If you want to keep just one half you can simply remove the points, or check thi
<translation>...</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="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="387"/>
<source>Style</source>
<translation type="unfinished">Estilo</translation>
@@ -4859,6 +5474,11 @@ 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="265"/>
+ <source>The track was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../gis/trk/IDetailsTrk.ui" line="436"/>
<source>Width</source>
<translation type="unfinished"></translation>
@@ -4972,6 +5592,11 @@ 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/wpt/IDetailsWpt.ui" line="268"/>
+ <source>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../gis/wpt/IDetailsWpt.ui" line="284"/>
<source>Toggle read only mode. You have to open the lock to edit the item.</source>
<translation type="unfinished"></translation>
@@ -5013,11 +5638,6 @@ If you want to keep just one half you can simply remove the points, or check thi
<translation>Proximidad:</translation>
</message>
<message>
- <location filename="../gis/wpt/IDetailsWpt.ui" line="268"/>
- <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>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/wpt/IDetailsWpt.ui" line="413"/>
<source>Hist.</source>
<translation type="unfinished">Historial</translation>
@@ -5598,69 +6218,69 @@ It is either a new item or it has been deleted in the database by someone else.<
<context>
<name>IGisProject</name>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="109"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="155"/>
<source>Save project?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="109"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="155"/>
<source><h3>%1</h3>The project was changed. Save before closing it?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="283"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="329"/>
<source>%1: Correlate tracks and waypoints.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="293"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="339"/>
<source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="294"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="340"/>
<source>Canceled correlation...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="339"/>
- <location filename="../gis/prj/IGisProject.cpp" line="392"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="385"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="442"/>
<source>Save "%1" to...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="477"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="527"/>
<source><br/>
Filename: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="482"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="532"/>
<source>Waypoints: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="486"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="536"/>
<source>Tracks: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="490"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="540"/>
<source>Routes: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="494"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="544"/>
<source>Areas: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="614"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="664"/>
<source>Are you sure you want to delete '%1' from project '%2'?</source>
<translation type="unfinished">¿Desea realmente eleiminar '%1' del proyecto '%2'?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="615"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="665"/>
<source>Delete...</source>
<translation type="unfinished">Borrar...</translation>
</message>
@@ -5673,28 +6293,28 @@ Filename: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="37"/>
+ <location filename="../gis/IGisWidget.ui" line="49"/>
<source>Opacity</source>
<translation type="unfinished">Opacidad</translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="44"/>
+ <location filename="../gis/IGisWidget.ui" line="56"/>
<source>Change the opacity of all GIS Items on the map.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="96"/>
- <location filename="../gis/IGisWidget.ui" line="126"/>
+ <location filename="../gis/IGisWidget.ui" line="108"/>
+ <location filename="../gis/IGisWidget.ui" line="138"/>
<source>Name</source>
<translation>Nombre</translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="131"/>
+ <location filename="../gis/IGisWidget.ui" line="143"/>
<source>Age</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="165"/>
+ <location filename="../gis/IGisWidget.ui" line="177"/>
<source>To add a database do a right click on the database list above.</source>
<translation>Para añadir una base de datos haga click-derecho en el espacio superior. </translation>
</message>
@@ -5796,7 +6416,7 @@ Filename: %1</source>
<context>
<name>ILineOp</name>
<message>
- <location filename="../mouse/line/ILineOp.cpp" line="211"/>
+ <location filename="../mouse/line/ILineOp.cpp" line="212"/>
<source>Routing</source>
<translation type="unfinished"></translation>
</message>
@@ -5853,330 +6473,335 @@ Filename: %1</source>
<translation>Ventana</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="109"/>
+ <location filename="../IMainWindow.ui" line="110"/>
<source>?</source>
<translation>?</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="116"/>
+ <location filename="../IMainWindow.ui" line="118"/>
<source>Project</source>
<translation>Proyecto</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="127"/>
+ <location filename="../IMainWindow.ui" line="129"/>
<source>Tool</source>
<translation>Herramientas</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="152"/>
+ <location filename="../IMainWindow.ui" line="154"/>
<source>Maps</source>
<translation>Mapas</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="195"/>
+ <location filename="../IMainWindow.ui" line="197"/>
<source>Dig. Elev. Model (DEM)</source>
<translation>Modelo Digital del Terreno (DEM)</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="234"/>
+ <location filename="../IMainWindow.ui" line="236"/>
<source>Data</source>
<translation>Datos</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="252"/>
+ <location filename="../IMainWindow.ui" line="254"/>
<source>Route</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="286"/>
- <location filename="../IMainWindow.ui" line="289"/>
+ <location filename="../IMainWindow.ui" line="288"/>
+ <location filename="../IMainWindow.ui" line="291"/>
<source>Add Map View</source>
<translation>Añadir Vista de Mapa</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="292"/>
+ <location filename="../IMainWindow.ui" line="294"/>
<source>Ctrl+T</source>
<translation>Ctrl+T</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="307"/>
+ <location filename="../IMainWindow.ui" line="309"/>
<source>Show Scale</source>
<translation>Mostrar Escala</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="319"/>
+ <location filename="../IMainWindow.ui" line="321"/>
<source>Setup Map Font</source>
<translation>Configurar Fuente del Mapa</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="334"/>
+ <location filename="../IMainWindow.ui" line="336"/>
<source>Show Grid</source>
<translation>Mostrar Malla</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="337"/>
+ <location filename="../IMainWindow.ui" line="339"/>
<source>Ctrl+G</source>
<translation>Ctrl+G</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="349"/>
+ <location filename="../IMainWindow.ui" line="351"/>
<source>Setup Grid</source>
<translation>Configurar Malla</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="352"/>
+ <location filename="../IMainWindow.ui" line="354"/>
<source>Ctrl+Alt+G</source>
<translation>Ctrl+Alt+G</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="367"/>
+ <location filename="../IMainWindow.ui" line="369"/>
<source>Flip Mouse Wheel</source>
<translation>Invertir la Rueda del Ratón</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="379"/>
- <location filename="../IMainWindow.ui" line="382"/>
+ <location filename="../IMainWindow.ui" line="381"/>
+ <location filename="../IMainWindow.ui" line="384"/>
<source>Setup Map Paths</source>
<translation>Configurar Rutas de Mapas</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="397"/>
+ <location filename="../IMainWindow.ui" line="399"/>
<source>POI Text</source>
<translation>Texto del POI</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="412"/>
+ <location filename="../IMainWindow.ui" line="414"/>
<source>Night / Day</source>
<translation>Noche / Día</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="427"/>
+ <location filename="../IMainWindow.ui" line="429"/>
<source>Map Tool Tip</source>
<translation>Mostrar Tooltips en los Mapas</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="430"/>
+ <location filename="../IMainWindow.ui" line="432"/>
<source>Ctrl+I</source>
<translation type="unfinished">Ctrl+I</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="442"/>
+ <location filename="../IMainWindow.ui" line="444"/>
<source>Setup DEM Paths</source>
<translation>Configurar Rutas a los DEM</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="454"/>
+ <location filename="../IMainWindow.ui" line="456"/>
<source>About</source>
<translation>Acerca de</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="466"/>
+ <location filename="../IMainWindow.ui" line="468"/>
<source>Help</source>
<translation>Ayuda</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="469"/>
+ <location filename="../IMainWindow.ui" line="471"/>
<source>F1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="481"/>
- <location filename="../IMainWindow.ui" line="484"/>
+ <location filename="../IMainWindow.ui" line="483"/>
+ <location filename="../IMainWindow.ui" line="486"/>
<source>Setup Map View</source>
<translation>Configurar Vista de Mapa</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="628"/>
+ <location filename="../IMainWindow.ui" line="630"/>
<source>VRT Builder</source>
<translation>Asistente VRT</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="631"/>
+ <location filename="../IMainWindow.ui" line="633"/>
<source>GUI front end to gdalbuildvrt</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="643"/>
+ <location filename="../IMainWindow.ui" line="645"/>
<source>Store Map View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="646"/>
+ <location filename="../IMainWindow.ui" line="648"/>
<source>Write current active map and DEM list including the properties to a file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="658"/>
+ <location filename="../IMainWindow.ui" line="660"/>
<source>Load Map View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="661"/>
+ <location filename="../IMainWindow.ui" line="663"/>
<source>Restore view with active map and DEM list including the properties from a file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="676"/>
+ <location filename="../IMainWindow.ui" line="678"/>
<source>Ext. Profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="679"/>
+ <location filename="../IMainWindow.ui" line="681"/>
<source>Ctrl+E</source>
<translation type="unfinished">Ctrl+E</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="691"/>
+ <location filename="../IMainWindow.ui" line="693"/>
<source>Close</source>
<translation type="unfinished">Cerrar</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="694"/>
+ <location filename="../IMainWindow.ui" line="696"/>
<source>Ctrl+Q</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="706"/>
+ <location filename="../IMainWindow.ui" line="708"/>
<source>Clone Map View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="709"/>
+ <location filename="../IMainWindow.ui" line="711"/>
<source>Ctrl+Shift+T</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="721"/>
+ <location filename="../IMainWindow.ui" line="723"/>
<source>Create Routino Database</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="733"/>
+ <location filename="../IMainWindow.ui" line="735"/>
<source>Save(Print) Map Screenshot</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="736"/>
+ <location filename="../IMainWindow.ui" line="738"/>
<source>Print a selected area of the map</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="739"/>
+ <location filename="../IMainWindow.ui" line="741"/>
<source>Ctrl+P</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="751"/>
+ <location filename="../IMainWindow.ui" line="753"/>
<source>Setup Coord. Format</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="754"/>
+ <location filename="../IMainWindow.ui" line="756"/>
<source>Change the format coordinates are displayed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="766"/>
+ <location filename="../IMainWindow.ui" line="768"/>
<source>Setup Map Background</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="778"/>
+ <location filename="../IMainWindow.ui" line="780"/>
<source>Setup Waypoint Icons</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="781"/>
+ <location filename="../IMainWindow.ui" line="783"/>
<source>Setup path to custom icons</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="790"/>
+ <location filename="../IMainWindow.ui" line="792"/>
<source>Close Tab</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="793"/>
+ <location filename="../IMainWindow.ui" line="795"/>
<source>Ctrl+W</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="496"/>
+ <location filename="../IMainWindow.ui" line="804"/>
+ <source>Quickstart Help</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../IMainWindow.ui" line="498"/>
<source>Load GIS Data</source>
<translation>Cargar Datos GIS</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="499"/>
+ <location filename="../IMainWindow.ui" line="501"/>
<source>Load projects from file</source>
<translation>Cargar proyectos desde archivo</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="502"/>
+ <location filename="../IMainWindow.ui" line="504"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="514"/>
+ <location filename="../IMainWindow.ui" line="516"/>
<source>Save All GIS Data</source>
<translation>Guardar Todos los Datos GIS</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="517"/>
+ <location filename="../IMainWindow.ui" line="519"/>
<source>Save all projects in the workspace</source>
<translation>Guardar todos los proyectos del espacio de trabajo</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="520"/>
+ <location filename="../IMainWindow.ui" line="522"/>
<source>Ctrl+S</source>
<translation>Ctrl+S</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="532"/>
+ <location filename="../IMainWindow.ui" line="534"/>
<source>Setup Time Zone</source>
<translation>Configurar Zona Horaria</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="544"/>
+ <location filename="../IMainWindow.ui" line="546"/>
<source>Add empty project</source>
<translation>Añadir proyecto vacío</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="559"/>
+ <location filename="../IMainWindow.ui" line="561"/>
<source>Search Google</source>
<translation>Buscar en Google</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="571"/>
+ <location filename="../IMainWindow.ui" line="573"/>
<source>Close all projects</source>
<translation>Cerrar todos los proyectos</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="574"/>
+ <location filename="../IMainWindow.ui" line="576"/>
<source>F8</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="586"/>
+ <location filename="../IMainWindow.ui" line="588"/>
<source>Setup Units</source>
<translation>Configurar Unidades</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="598"/>
+ <location filename="../IMainWindow.ui" line="600"/>
<source>Setup Workspace</source>
<translation>Configurar Espacio de trabajo</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="601"/>
+ <location filename="../IMainWindow.ui" line="603"/>
<source>Setup save on exit.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="613"/>
+ <location filename="../IMainWindow.ui" line="615"/>
<source>Import Database from QLandkarte</source>
<translation>Importar base de datos de Qlandkarte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="616"/>
+ <location filename="../IMainWindow.ui" line="618"/>
<source>Import QLandkarte GT database</source>
<translation type="unfinished"></translation>
</message>
@@ -6301,37 +6926,42 @@ I don't want to read the documentation!</source>
<translation><html><head/><body><p>Pulse para usar la escala actual como la escala máxima a la que mostrar el mapa.</p></body></html></translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="137"/>
+ <location filename="../map/IMapPropSetup.ui" line="139"/>
<source>Areas</source>
<translation>Áreas</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="144"/>
+ <location filename="../map/IMapPropSetup.ui" line="146"/>
<source>Lines</source>
<translation>Líneas</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="151"/>
+ <location filename="../map/IMapPropSetup.ui" line="153"/>
<source>Points</source>
<translation>Puntos</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="233"/>
+ <location filename="../map/IMapPropSetup.ui" line="170"/>
+ <source>Details</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../map/IMapPropSetup.ui" line="264"/>
<source>-</source>
<translation>-</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="240"/>
+ <location filename="../map/IMapPropSetup.ui" line="271"/>
<source>Cache Path</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="196"/>
+ <location filename="../map/IMapPropSetup.ui" line="227"/>
<source>Cache Size (MB)</source>
<translation>Tamaño de Caché (MiB)</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="216"/>
+ <location filename="../map/IMapPropSetup.ui" line="247"/>
<source>Expiration (Days)</source>
<translation>Caducidad (Días)</translation>
</message>
@@ -6475,18 +7105,23 @@ I don't want to read the documentation!</source>
<translation type="unfinished">Añadir Waypoint</translation>
</message>
<message>
- <location filename="../plot/IPlot.cpp" line="541"/>
+ <location filename="../plot/IPlot.cpp" line="99"/>
+ <source>Cut...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../plot/IPlot.cpp" line="542"/>
<source>Hold CTRL key for vertical zoom, only.
Hold ALT key for horizontal zoom, only.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../plot/IPlot.cpp" line="696"/>
+ <location filename="../plot/IPlot.cpp" line="697"/>
<source>No or bad data.</source>
<translation>Datos incorrectos o inexistentes.</translation>
</message>
<message>
- <location filename="../plot/IPlot.cpp" line="1296"/>
+ <location filename="../plot/IPlot.cpp" line="1298"/>
<source>Select output file</source>
<translation type="unfinished"></translation>
</message>
@@ -6656,6 +7291,262 @@ o
</message>
</context>
<context>
+ <name>IRouterBRouter</name>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="28"/>
+ <source>Profile</source>
+ <translation type="unfinished">Perfil</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="35"/>
+ <source>Alternative</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="64"/>
+ <source>display selected routing profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="67"/>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="128"/>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="142"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="87"/>
+ <source>on-the-fly routing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="111"/>
+ <source>BRouter: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="118"/>
+ <source>not running</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="125"/>
+ <source>start/stop BRouter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="139"/>
+ <source>show BRouter console</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="172"/>
+ <source>Setup</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="181"/>
+ <source>Caution! BRouter is listening on all ports for connections.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>IRouterBRouterInfo</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterInfo.ui" line="14"/>
+ <source>BRouter Profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterInfo.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>IRouterBRouterSetupWizard</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="23"/>
+ <source>BRouter Setup</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="48"/>
+ <source>choose which BRouter to use</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="54"/>
+ <source>BRouter-Web (online)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="61"/>
+ <source>local Installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="68"/>
+ <source>Expert Mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="91"/>
+ <source>local BRouter Installation directory:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="103"/>
+ <source>select installation directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="106"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="162"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="342"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="356"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="389"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="400"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="119"/>
+ <source>labelLocalDirResult</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="128"/>
+ <source>create or update installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="152"/>
+ <source>Java Executable</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="175"/>
+ <source>labelLocalJavaResult</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="184"/>
+ <source>search for installed java</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="241"/>
+ <source>Download and install BRouter Version</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="255"/>
+ <source>about:blank</source>
+ <translation type="unfinished">about:blank</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="263"/>
+ <source>File to install</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="272"/>
+ <source>Download and Install</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="321"/>
+ <source>available Profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="339"/>
+ <source>install profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="353"/>
+ <source>remove profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="371"/>
+ <source>installed Profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="415"/>
+ <source>content of profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="451"/>
+ <source>BRouter-Web URL:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="501"/>
+ <source>Service-URL</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="511"/>
+ <source>Profile-URL</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="561"/>
+ <source>Hostname</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="571"/>
+ <source>Port</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="581"/>
+ <source>Profile directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="591"/>
+ <source>Segments directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="601"/>
+ <source>Custom Profiles dir</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="611"/>
+ <source>Max Runtime</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="621"/>
+ <source>Number Threads</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="631"/>
+ <source>Java Options</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="551"/>
+ <source>Profiles Url</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>IRouterMapQuest</name>
<message>
<location filename="../gis/rte/router/IRouterMapQuest.ui" line="14"/>
@@ -6759,18 +7650,18 @@ o
<context>
<name>IRouterRoutinoPathSetup</name>
<message>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="14"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="14"/>
<source>Setup Routino database...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="27"/>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="47"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="27"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="47"/>
<source>...</source>
<translation type="unfinished">...</translation>
</message>
<message>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="99"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="99"/>
<source>-</source>
<translation type="unfinished">-</translation>
</message>
@@ -7023,18 +7914,18 @@ o
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="20"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="32"/>
<source>Delete all points between the first and last one.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="23"/>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="37"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="35"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="49"/>
<source>...</source>
<translation type="unfinished">...</translation>
</message>
<message>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="34"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="46"/>
<source><html><head/><body><p>Calculate a route between the first and last selected point.</p></body></html></source>
<translation type="unfinished"></translation>
</message>
@@ -7157,12 +8048,13 @@ o
<location filename="../mouse/IScrOptSelect.ui" line="82"/>
<location filename="../mouse/IScrOptSelect.ui" line="102"/>
<location filename="../mouse/IScrOptSelect.ui" line="122"/>
- <location filename="../mouse/IScrOptSelect.ui" line="176"/>
- <location filename="../mouse/IScrOptSelect.ui" line="205"/>
- <location filename="../mouse/IScrOptSelect.ui" line="265"/>
- <location filename="../mouse/IScrOptSelect.ui" line="292"/>
- <location filename="../mouse/IScrOptSelect.ui" line="319"/>
- <location filename="../mouse/IScrOptSelect.ui" line="346"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="142"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="196"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="225"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="285"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="312"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="339"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="366"/>
<source>...</source>
<translation type="unfinished">...</translation>
</message>
@@ -7173,41 +8065,46 @@ o
</message>
<message>
<location filename="../mouse/IScrOptSelect.ui" line="99"/>
- <source>Combine all selected tracks to a new one.</source>
+ <source>Change the icon of all selected waypoints.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mouse/IScrOptSelect.ui" line="119"/>
+ <source>Combine all selected tracks to a new one.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mouse/IScrOptSelect.ui" line="139"/>
<source>Delete all selected items.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="173"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="193"/>
<source>Select all items that intersect the selected area.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="202"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="222"/>
<source>Select all itmes that are completely inside the selected area.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="262"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="282"/>
<source>Add tracks to selection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="289"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="309"/>
<source>Add waypoints to selection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="316"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="336"/>
<source>Add routes to selection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="343"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="363"/>
<source>Add areas to selection.</source>
<translation type="unfinished"></translation>
</message>
@@ -8070,36 +8967,36 @@ o
<context>
<name>IToolShell</name>
<message>
- <location filename="../tool/IToolShell.cpp" line="45"/>
+ <location filename="../tool/IToolShell.cpp" line="46"/>
<source>Execution of external program `%1` failed: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="49"/>
+ <location filename="../tool/IToolShell.cpp" line="50"/>
<source>Process cannot be started.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="50"/>
+ <location filename="../tool/IToolShell.cpp" line="51"/>
<source>Make sure the required packages are installed, `%1` exists and is executable.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="54"/>
+ <location filename="../tool/IToolShell.cpp" line="55"/>
<source>External process crashed.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="58"/>
+ <location filename="../tool/IToolShell.cpp" line="59"/>
<source>An unknown error occurred.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="149"/>
+ <location filename="../tool/IToolShell.cpp" line="172"/>
<source>!!! failed !!!
</source>
<translation type="unfinished">!!! fallo !!!</translation>
diff --git a/src/locale/qmapshack_fr.ts b/src/locale/qmapshack_fr.ts
index 4fa1db5..32ee656 100644
--- a/src/locale/qmapshack_fr.ts
+++ b/src/locale/qmapshack_fr.ts
@@ -13,6 +13,11 @@
<source>%1 (API V%2)</source>
<translation>%1 (API V%2)</translation>
</message>
+ <message>
+ <location filename="../CAbout.cpp" line="49"/>
+ <source>(no DBUS: device detection and handling disabled)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CActivityTrk</name>
@@ -112,12 +117,12 @@
<context>
<name>CCanvas</name>
<message>
- <location filename="../canvas/CCanvas.cpp" line="60"/>
+ <location filename="../canvas/CCanvas.cpp" line="61"/>
<source>View %1</source>
<translation>Vue %1</translation>
</message>
<message>
- <location filename="../canvas/CCanvas.cpp" line="685"/>
+ <location filename="../canvas/CCanvas.cpp" line="693"/>
<source>Setup Map Background</source>
<translation>Réglage de l'arrière-plan de la carte</translation>
</message>
@@ -262,7 +267,27 @@
<context>
<name>CDBProject</name>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="223"/>
+ <location filename="../gis/db/CDBProject.cpp" line="112"/>
+ <source>Failed to load...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="113"/>
+ <source>Can't load file "%1" . It will be skipped.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="126"/>
+ <source>Project already in database...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="127"/>
+ <source>The project "%1" has already been imported into the database. It will be skipped.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="278"/>
<source>The item %1 has been changed by %2 (%3).
To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
@@ -270,47 +295,47 @@ To solve this conflict you can create and save a clone, force your version or dr
Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer votre version ou abandonner votre version en prenant celle de la base de données</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="229"/>
+ <location filename="../gis/db/CDBProject.cpp" line="284"/>
<source>Conflict with database...</source>
<translation>Confilt avec la base de données...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="230"/>
+ <location filename="../gis/db/CDBProject.cpp" line="285"/>
<source>Clone && Save</source>
<translation>Cloner && Sauvegarder</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="231"/>
+ <location filename="../gis/db/CDBProject.cpp" line="286"/>
<source>Force Save</source>
<translation>Forcer la sauvegarde</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="232"/>
+ <location filename="../gis/db/CDBProject.cpp" line="287"/>
<source>Take remote</source>
<translation>Prendre la version de la base de données</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="514"/>
+ <location filename="../gis/db/CDBProject.cpp" line="569"/>
<source>Missing folder...</source>
<translation>Répertoire manquant...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="515"/>
+ <location filename="../gis/db/CDBProject.cpp" line="570"/>
<source>Failed to save project. The folder has been deleted in the database.</source>
<translation>Echec de la sauvegarde du projet. Le répertoire a été supprimé de la base de données.</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="522"/>
+ <location filename="../gis/db/CDBProject.cpp" line="577"/>
<source>Save ...</source>
<translation>Enregistrer...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="585"/>
+ <location filename="../gis/db/CDBProject.cpp" line="640"/>
<source>Error</source>
<translation>Erreur</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="585"/>
+ <location filename="../gis/db/CDBProject.cpp" line="640"/>
<source>There was an unexpected database error:
%1</source>
@@ -319,12 +344,12 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
%1</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="700"/>
+ <location filename="../gis/db/CDBProject.cpp" line="755"/>
<source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
<translation>Le projet '%1' est sur le point de se mettre à jour depuis la base de données.Néanmoins il y a des modifications non sauvegardées.</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="701"/>
+ <location filename="../gis/db/CDBProject.cpp" line="756"/>
<source>Save changes?</source>
<translation>Enregistrer les modifications ?</translation>
</message>
@@ -347,7 +372,7 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
<message>
<location filename="../dem/CDemPathSetup.cpp" line="41"/>
<source>Add or remove paths containing DEM data. There can be multiple files in a path but no sub-path is parsed. Supported formats are: %1</source>
- <translation>Ajoutez ou retirez des répertoires qui contiennent des données DEM. Il peut y avoir plusieurs fichiers dans un répertoire mais les sous-répertoires ne sont pas prises en compte.</translation>
+ <translation>Ajoutez ou retirez des répertoires qui contiennent des données DEM. Il peut y avoir plusieurs fichiers dans un répertoire mais les sous-répertoires ne sont pas prises en compte. Formats acceptés sont: %1</translation>
</message>
<message>
<location filename="../dem/CDemPathSetup.cpp" line="56"/>
@@ -855,78 +880,78 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
<context>
<name>CGisItemRte</name>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="65"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="66"/>
<source>_Clone</source>
<translation>_Clone</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="283"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="284"/>
<source>track</source>
<translation>trace</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="310"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="311"/>
<source>Changed name.</source>
<translation>Nom modifié.</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="316"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="317"/>
<source>Changed comment</source>
<translation>Commentaire modifié</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="322"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="323"/>
<source>Changed description</source>
<translation>Description modifiée</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="328"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="329"/>
<source>Changed links</source>
<translation>Liens modifiés</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="346"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="347"/>
<source>Length: %1 %2</source>
<translation>Longueur: %1 %2</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="350"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
<source>Length: -</source>
<translation>Longueur: -</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="357"/>
- <location filename="../gis/rte/CGisItemRte.cpp" line="599"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="600"/>
<source>Time: %1 %2</source>
<translation>Durée: %1 %2</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="361"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
<source>Time: -</source>
<translation>Heure : -</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="371"/>
+ <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="377"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="378"/>
<source>Last time routed:<br/>%1</source>
<translation>Date du dernier calcul d'itinéraire : <br/>%1</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="379"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="380"/>
<source>with %1</source>
<translation>avec %1</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="601"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="602"/>
<source>Distance: %1 %2</source>
<translation>Distance: %1 %2</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="716"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="717"/>
<source>Changed route points.</source>
<translation>Points de route modifiés.</translation>
</message>
@@ -1070,21 +1095,21 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
<translation>En déplacement: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1214"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1227"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1283"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1327"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1466"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1223"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1236"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1292"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1336"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1475"/>
<source>track</source>
<translation>trace</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1418"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1427"/>
<source>Hide point %1.</source>
<translation>Cacher les points %1.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1422"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1431"/>
<source>Hide points %1..%2.</source>
<translation>Cacher les points %1..%2.</translation>
</message>
@@ -1180,47 +1205,47 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
<translation>Distance: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1273"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1282"/>
<source>Permanently removed points %1..%2</source>
<translation>Points supprimés de manière permanente %1..%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1451"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1460"/>
<source>Show points.</source>
<translation>Afficher les points.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1985"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
<source>Changed name</source>
<translation>Nom modifié</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1991"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
<source>Changed comment</source>
<translation>Commentaire modifié</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1997"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
<source>Changed description</source>
<translation>Description modifiée</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2003"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2012"/>
<source>Changed links</source>
<translation>Liens modifiés</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2014"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2023"/>
<source>Changed elevation of point %1 to %2 %3</source>
<translation>Altitudes modifiées du point %1 à %2 %3</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2038"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2047"/>
<source>Changed activity to '%1' for complete track.</source>
<translation>Acirvité modifiée pour '%1' pour la trace complète.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2077"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2086"/>
<source>Changed activity to '%1' for range(%2..%3).</source>
<translation>Activité modifiée pur '%1' for la plage (%2..%3).</translation>
</message>
@@ -1328,62 +1353,62 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
<translation>_Clone</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="272"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="275"/>
<source>Elevation: %1 %2</source>
<translation>Altitude: %1 %2</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="283"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="286"/>
<source>Proximity: %1 %2</source>
<translation>Proximité: %1 %2</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="355"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="358"/>
<source>Changed name</source>
<translation>Nom modifié</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="365"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="368"/>
<source>Changed position</source>
<translation>Position modifiée</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="371"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="374"/>
<source>Changed elevation</source>
<translation>Altitude modifiée</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="377"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="380"/>
<source>Changed proximity</source>
<translation>Rayon de proximité modifié</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="391"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
<source>Changed icon</source>
<translation>Icône modifié</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="397"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
<source>Changed comment</source>
<translation>Commentaire modifié</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="403"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="406"/>
<source>Changed description</source>
<translation>Description modifiée</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="409"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="412"/>
<source>Changed links</source>
<translation>Liens modifiés</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="415"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="418"/>
<source>Changed images</source>
<translation>Images modifiées</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="421"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="424"/>
<source>Add image</source>
<translation>Ajouter une image</translation>
</message>
@@ -1391,139 +1416,149 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
<context>
<name>CGisListDB</name>
<message>
- <location filename="../gis/CGisListDB.cpp" line="83"/>
+ <location filename="../gis/CGisListDB.cpp" line="84"/>
<source>Due to changes in the database system QMapShack forgot about the filename of your database '%1'. You have to select it again in the next step.</source>
<translation>A cause d'évolutions de la gestion des bases de données, QMapShack doit de nouveau connaître l'emplacement de votre base de données. '%1'. Indiquez-le à l'étape suivante.</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="84"/>
+ <location filename="../gis/CGisListDB.cpp" line="85"/>
<source>Select database file.</source>
<translation>Sélectionnez un fichier de base de données</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="117"/>
+ <location filename="../gis/CGisListDB.cpp" line="118"/>
<source>Add Database</source>
<translation>Ajouter une base de données</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="120"/>
+ <location filename="../gis/CGisListDB.cpp" line="121"/>
<source>Add Folder</source>
<translation>Ajouter un dossier</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="121"/>
+ <location filename="../gis/CGisListDB.cpp" line="122"/>
<source>Rename Folder</source>
<translation>Renommer dossier</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="122"/>
+ <location filename="../gis/CGisListDB.cpp" line="123"/>
<source>Copy Folder</source>
<translation>Copier dossier</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="123"/>
+ <location filename="../gis/CGisListDB.cpp" line="124"/>
<source>Move Folder</source>
<translation>Déplacer dossier</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="124"/>
+ <location filename="../gis/CGisListDB.cpp" line="125"/>
<source>Delete Folder</source>
<translation>Supprimer le dossier</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="125"/>
- <source>Export to GPX...</source>
+ <location filename="../gis/CGisListDB.cpp" line="127"/>
+ <source>Import from Files...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gis/CGisListDB.cpp" line="128"/>
- <location filename="../gis/CGisListDB.cpp" line="141"/>
+ <source>Export to GPX...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListDB.cpp" line="131"/>
+ <location filename="../gis/CGisListDB.cpp" line="147"/>
<source>Delete Item</source>
<translation>Supprimer un élément</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="132"/>
+ <location filename="../gis/CGisListDB.cpp" line="135"/>
<source>Search Database</source>
<translation>Rechercher dans la base de données</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="133"/>
+ <location filename="../gis/CGisListDB.cpp" line="136"/>
<source>Sync. with Database</source>
<translation>Synchroniser avec la base de données</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="134"/>
+ <location filename="../gis/CGisListDB.cpp" line="137"/>
<source>Remove Database</source>
<translation>Enlever la base de données</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="138"/>
+ <location filename="../gis/CGisListDB.cpp" line="144"/>
<source>Empty</source>
<translation>Vider</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="437"/>
+ <location filename="../gis/CGisListDB.cpp" line="444"/>
<source>Remove database...</source>
<translation>Enlever la base de données</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="437"/>
+ <location filename="../gis/CGisListDB.cpp" line="444"/>
<source>Do you really want to remove '%1' from the list?</source>
<translation>Voulez-vous vraiment supprimere '%1' de la liste ?</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="501"/>
+ <location filename="../gis/CGisListDB.cpp" line="508"/>
<source>Are you sure you want to delete selected folders and all subfolders from the database?</source>
<translation>Etes-vous sûr de vouloir supprimer les dossiers selectionnés ainsi que leur sous-dossiers de la base de données ?</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="669"/>
+ <location filename="../gis/CGisListDB.cpp" line="676"/>
<source>Bad operation....</source>
<translation>Mauvaise opération...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="669"/>
+ <location filename="../gis/CGisListDB.cpp" line="676"/>
<source>The target folder is a subfolder of the one to move. This will not work.</source>
<translation>Le dossier cible est un sous-dossier de celui à déplacer. Cela ne fonctionnera pas.</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="728"/>
+ <location filename="../gis/CGisListDB.cpp" line="735"/>
<source>Folder name...</source>
<translation>Name du dossier...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="728"/>
+ <location filename="../gis/CGisListDB.cpp" line="735"/>
<source>Rename folder:</source>
<translation>Renommer le dossier:</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="857"/>
+ <location filename="../gis/CGisListDB.cpp" line="864"/>
<source>Are you sure you want to delete '%1' from folder '%2'?</source>
<translation>Êtes-vous sûr de vouloir supprimer %1 du dossier %2?</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="858"/>
+ <location filename="../gis/CGisListDB.cpp" line="865"/>
<source>Delete...</source>
<translation>Supprimer...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="501"/>
+ <location filename="../gis/CGisListDB.cpp" line="1055"/>
+ <source>Import GIS Data...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListDB.cpp" line="508"/>
<source>Delete database folder...</source>
<translation>Supprimer la base de données...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="749"/>
- <location filename="../gis/CGisListDB.cpp" line="770"/>
+ <location filename="../gis/CGisListDB.cpp" line="756"/>
+ <location filename="../gis/CGisListDB.cpp" line="777"/>
<source>Remove items...</source>
<translation>Supprimer les éléments...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="749"/>
+ <location filename="../gis/CGisListDB.cpp" line="756"/>
<source>Are you sure you want to delete all items from Lost&Found? This will remove them permanently.</source>
<translation>Êtes-vous sûr de vouloir supprimer tous les éléments dans Perdu & Trouvé ? Les éléments seront supprimés définitivement.</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="770"/>
+ <location filename="../gis/CGisListDB.cpp" line="777"/>
<source>Are you sure you want to delete all selected items from Lost&Found? This will remove them permanently.</source>
<translation>Êtes-vous sûr de vouloir supprimer les éléments sélectionnés dans Perdu & Trouvé ? Les éléments seront supprimés définitivement.</translation>
</message>
@@ -1531,201 +1566,206 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
<context>
<name>CGisListWks</name>
<message>
- <location filename="../gis/CGisListWks.cpp" line="99"/>
+ <location filename="../gis/CGisListWks.cpp" line="101"/>
<source>Edit..</source>
<translation>Éditer..</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="101"/>
+ <location filename="../gis/CGisListWks.cpp" line="103"/>
<source>Show on Map</source>
<translation>Afficher sur la carte</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="102"/>
+ <location filename="../gis/CGisListWks.cpp" line="104"/>
<source>Hide from Map</source>
<translation>Masquer</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="108"/>
+ <location filename="../gis/CGisListWks.cpp" line="110"/>
<source>Sort by Time</source>
<translation>Trier par date</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="109"/>
+ <location filename="../gis/CGisListWks.cpp" line="111"/>
<source>Sort by Name</source>
<translation>Trier par nom</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="112"/>
+ <location filename="../gis/CGisListWks.cpp" line="114"/>
<source>Save</source>
<translation>Enregistrer</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="114"/>
+ <location filename="../gis/CGisListWks.cpp" line="116"/>
<source>Save as GPX 1.1 w/o ext...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="117"/>
+ <location filename="../gis/CGisListWks.cpp" line="119"/>
<source>Send to Devices</source>
<translation>Envoyer vers les appareils</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="118"/>
+ <location filename="../gis/CGisListWks.cpp" line="120"/>
<source>Sync. with Database</source>
<translation>Synchroniser avec la base de données</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="121"/>
+ <location filename="../gis/CGisListWks.cpp" line="123"/>
<source>Close</source>
<translation>Fermer</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="130"/>
+ <location filename="../gis/CGisListWks.cpp" line="132"/>
<source>Update Project on Device</source>
<translation>Mettre à jour le projet sur l'appareil</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="132"/>
- <location filename="../gis/CGisListWks.cpp" line="155"/>
+ <location filename="../gis/CGisListWks.cpp" line="134"/>
+ <location filename="../gis/CGisListWks.cpp" line="157"/>
<source>Delete</source>
<translation>Supprimer</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="144"/>
+ <location filename="../gis/CGisListWks.cpp" line="146"/>
<source>Edit...</source>
<translation>Éditer...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="100"/>
- <location filename="../gis/CGisListWks.cpp" line="145"/>
+ <location filename="../gis/CGisListWks.cpp" line="102"/>
+ <location filename="../gis/CGisListWks.cpp" line="147"/>
<source>Copy to...</source>
<translation>Copier vers...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="113"/>
+ <location filename="../gis/CGisListWks.cpp" line="115"/>
<source>Save as...</source>
<translation>Sauvegarder sous...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="147"/>
+ <location filename="../gis/CGisListWks.cpp" line="149"/>
<source>Track Profile</source>
<translation>Profile de la trace</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="149"/>
+ <location filename="../gis/CGisListWks.cpp" line="151"/>
<source>Select Range</source>
<translation>Sélectionner des points</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="150"/>
+ <location filename="../gis/CGisListWks.cpp" line="152"/>
<source>Edit Track Points</source>
<translation>Éditer les points de la trace</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="151"/>
+ <location filename="../gis/CGisListWks.cpp" line="153"/>
<source>Reverse Track</source>
<translation>Inverser la trace</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="152"/>
+ <location filename="../gis/CGisListWks.cpp" line="154"/>
<source>Combine Tracks</source>
<translation>Joindre des traces</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="153"/>
+ <location filename="../gis/CGisListWks.cpp" line="155"/>
<source>Copy Track with Waypoints</source>
<translation>Copier la trace avec ses waypoints</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="161"/>
+ <location filename="../gis/CGisListWks.cpp" line="163"/>
<source>Show Bubble</source>
<translation>Afficher la bulle</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="163"/>
+ <location filename="../gis/CGisListWks.cpp" line="165"/>
<source>Move Waypoint</source>
<translation>Déplacer le waypoint</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="164"/>
+ <location filename="../gis/CGisListWks.cpp" line="166"/>
<source>Proj. Waypoint...</source>
<translation>Projection du waypoint...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="172"/>
+ <location filename="../gis/CGisListWks.cpp" line="174"/>
<source>Route Instructions</source>
<translation>Instructions de guidage</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="174"/>
+ <location filename="../gis/CGisListWks.cpp" line="176"/>
<source>Calculate Route</source>
<translation>Calculer l'itinéraire</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="175"/>
+ <location filename="../gis/CGisListWks.cpp" line="177"/>
<source>Reset Route</source>
<translation>Réinitialiser la route</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="176"/>
+ <location filename="../gis/CGisListWks.cpp" line="178"/>
<source>Edit Route</source>
<translation>Éditer la route</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="177"/>
+ <location filename="../gis/CGisListWks.cpp" line="179"/>
<source>Convert to Track</source>
<translation>Convertir en trace</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="186"/>
+ <location filename="../gis/CGisListWks.cpp" line="188"/>
<source>Edit Area Points</source>
<translation>Éditer les points de la surface</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="193"/>
+ <location filename="../gis/CGisListWks.cpp" line="195"/>
<source>Create Route</source>
<translation>Créer une route</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="622"/>
+ <location filename="../gis/CGisListWks.cpp" line="196"/>
+ <source>Change Icon (sel. waypt. only)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="627"/>
<source>Drop items...</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="773"/>
+ <location filename="../gis/CGisListWks.cpp" line="778"/>
<source>Saving workspace. Please wait.</source>
<translation>Sauvegarde de l'espace de travail. Patientez.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="819"/>
+ <location filename="../gis/CGisListWks.cpp" line="824"/>
<source>Loading workspace. Please wait.</source>
<translation>Chargement de l'espace de travail. Patientez.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1155"/>
+ <location filename="../gis/CGisListWks.cpp" line="1174"/>
<source>Close all projects...</source>
<translation>Fermer tous les projets...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1155"/>
+ <location filename="../gis/CGisListWks.cpp" line="1174"/>
<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="1178"/>
+ <location filename="../gis/CGisListWks.cpp" line="1197"/>
<source>Delete project...</source>
<translation>Supprimer le projet...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1178"/>
+ <location filename="../gis/CGisListWks.cpp" line="1197"/>
<source>Do you really want to delete %1?</source>
<translation>Êtes-vous sûr de vouloir supprimer %1?</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="647"/>
- <location filename="../gis/CGisListWks.cpp" line="1631"/>
- <location filename="../gis/CGisListWks.cpp" line="1669"/>
+ <location filename="../gis/CGisListWks.cpp" line="652"/>
+ <location filename="../gis/CGisListWks.cpp" line="1650"/>
+ <location filename="../gis/CGisListWks.cpp" line="1688"/>
<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>
@@ -1733,27 +1773,27 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
<context>
<name>CGisWidget</name>
<message>
- <location filename="../gis/CGisWidget.cpp" line="139"/>
+ <location filename="../gis/CGisWidget.cpp" line="110"/>
<source>Load project...</source>
<translation>Charger le projet...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="139"/>
+ <location filename="../gis/CGisWidget.cpp" line="110"/>
<source>The project "%1" is already in the workspace.</source>
<translation>Le projet "%1" est déjà présent dans l'espace de travail.</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="544"/>
+ <location filename="../gis/CGisWidget.cpp" line="515"/>
<source>Copy items...</source>
<translation>Copier les éléments...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="672"/>
+ <location filename="../gis/CGisWidget.cpp" line="664"/>
<source>Cut Track...</source>
<translation>Couper la trace...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="672"/>
+ <location filename="../gis/CGisWidget.cpp" line="664"/>
<source>Do you want to delete the original track?</source>
<translation>Voulez-vous supprimer la trace originale?</translation>
</message>
@@ -1940,48 +1980,48 @@ ligne %2, colonne %3:
<context>
<name>CMainWindow</name>
<message>
- <location filename="../CMainWindow.cpp" line="562"/>
+ <location filename="../CMainWindow.cpp" line="588"/>
<source>Use <b>Menu->View->Add Map View</b> to open a new view. Or <b>Menu->File->Load Map View</b> to restore a saved one. Or click <a href='newview'>here</a>.</source>
<translation>Utilisez <b>Menu->Vue->Add Map View</b> pour ouvrir une nouvelle vue. Ou <b>Menu->Fichier->Charger une vue cartographique</b> pour charger une vue sauvegardée. Ou cliquez <a href='newview'>ici</a>.</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="690"/>
+ <location filename="../CMainWindow.cpp" line="716"/>
<source>Ele: %1%2</source>
<translation>Altitude: %1%2</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="706"/>
+ <location filename="../CMainWindow.cpp" line="732"/>
<source>[Grid: %1]</source>
<translation>[Grille: %1]</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="841"/>
+ <location filename="../CMainWindow.cpp" line="867"/>
<source>Load GIS Data...</source>
<translation>Charger des données SIG...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="875"/>
+ <location filename="../CMainWindow.cpp" line="901"/>
<source>Select output file</source>
<translation>Sélectionner le fichier de sortie</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="875"/>
<location filename="../CMainWindow.cpp" line="901"/>
+ <location filename="../CMainWindow.cpp" line="927"/>
<source>QMapShack View (*.view)</source>
<translation>Vue QMapShack (*.view)</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="901"/>
+ <location filename="../CMainWindow.cpp" line="927"/>
<source>Select file to load</source>
<translation>Sélectionner le fichier à charger</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1080"/>
+ <location filename="../CMainWindow.cpp" line="1106"/>
<source>Fatal...</source>
<translation>Fatal...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1081"/>
+ <location filename="../CMainWindow.cpp" line="1107"/>
<source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your distribution to fix it.</source>
<translation type="unfinished"></translation>
</message>
@@ -1989,7 +2029,7 @@ ligne %2, colonne %3:
<context>
<name>CMapDraw</name>
<message>
- <location filename="../map/CMapDraw.cpp" line="420"/>
+ <location filename="../map/CMapDraw.cpp" line="457"/>
<source>There are no maps right now. QMapShack is no fun without maps. You can install maps by pressing the 'Help! I want maps!' button in the 'Maps' dock window. Or you can press the F1 key to open the online documentation that tells you how to use QMapShack.
If it's no fun, why don't you provide maps? Well to host maps ready for download and installation requires a good server. And this is not a free service. The project lacks the money. Additionally map and DEM data has a copyright. Therefore the copyright holder has to be asked prior to package the data. This is not that easy as it might sound and for some data you have to pay royalties. The project simply lacks resources to do this. And we think installing the stuff yourself is [...]
@@ -1999,625 +2039,625 @@ If it's no fun, why don't you provide maps? Well to host maps ready fo
<context>
<name>CMapIMG</name>
<message>
- <location filename="../map/CMapIMG.cpp" line="145"/>
+ <location filename="../map/CMapIMG.cpp" line="146"/>
<source>Failed ...</source>
<translation>Échec...</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="156"/>
+ <location filename="../map/CMapIMG.cpp" line="157"/>
<source>Unspecified</source>
<translation>Non défini</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="157"/>
+ <location filename="../map/CMapIMG.cpp" line="158"/>
<source>French</source>
<translation>Français</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="158"/>
+ <location filename="../map/CMapIMG.cpp" line="159"/>
<source>German</source>
<translation>Deutsch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="159"/>
+ <location filename="../map/CMapIMG.cpp" line="160"/>
<source>Dutch</source>
<translation>Néerlandais</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="160"/>
+ <location filename="../map/CMapIMG.cpp" line="161"/>
<source>English</source>
<translation>Anglais</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="161"/>
+ <location filename="../map/CMapIMG.cpp" line="162"/>
<source>Italian</source>
<translation>Italien</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="162"/>
+ <location filename="../map/CMapIMG.cpp" line="163"/>
<source>Finnish</source>
<translation>Finlandais</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="163"/>
+ <location filename="../map/CMapIMG.cpp" line="164"/>
<source>Swedish</source>
<translation>Suédois</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="164"/>
+ <location filename="../map/CMapIMG.cpp" line="165"/>
<source>Spanish</source>
<translation>Espagnol</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="165"/>
+ <location filename="../map/CMapIMG.cpp" line="166"/>
<source>Basque</source>
<translation></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="166"/>
+ <location filename="../map/CMapIMG.cpp" line="167"/>
<source>Catalan</source>
<translation>Catalan</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="167"/>
+ <location filename="../map/CMapIMG.cpp" line="168"/>
<source>Galician</source>
<translation>Galicien</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="168"/>
+ <location filename="../map/CMapIMG.cpp" line="169"/>
<source>Welsh</source>
<translation>Gallois</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="169"/>
+ <location filename="../map/CMapIMG.cpp" line="170"/>
<source>Gaelic</source>
<translation>Gaëlic</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="170"/>
+ <location filename="../map/CMapIMG.cpp" line="171"/>
<source>Danish</source>
<translation>Danois</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="171"/>
+ <location filename="../map/CMapIMG.cpp" line="172"/>
<source>Norwegian</source>
<translation>Norvégien</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="172"/>
+ <location filename="../map/CMapIMG.cpp" line="173"/>
<source>Portuguese</source>
<translation>Portugais</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="173"/>
+ <location filename="../map/CMapIMG.cpp" line="174"/>
<source>Slovak</source>
<translation>Slovaque</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="174"/>
+ <location filename="../map/CMapIMG.cpp" line="175"/>
<source>Czech</source>
<translation>Tchèque</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="175"/>
+ <location filename="../map/CMapIMG.cpp" line="176"/>
<source>Croatian</source>
<translation>Croate</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="176"/>
+ <location filename="../map/CMapIMG.cpp" line="177"/>
<source>Hungarian</source>
<translation>Hongrois</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="177"/>
+ <location filename="../map/CMapIMG.cpp" line="178"/>
<source>Polish</source>
<translation>Polonais</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="178"/>
+ <location filename="../map/CMapIMG.cpp" line="179"/>
<source>Turkish</source>
<translation>Turque</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="179"/>
+ <location filename="../map/CMapIMG.cpp" line="180"/>
<source>Greek</source>
<translation>Grèc</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="180"/>
+ <location filename="../map/CMapIMG.cpp" line="181"/>
<source>Slovenian</source>
<translation>Slovène</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="181"/>
+ <location filename="../map/CMapIMG.cpp" line="182"/>
<source>Russian</source>
<translation>Russe</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="182"/>
+ <location filename="../map/CMapIMG.cpp" line="183"/>
<source>Estonian</source>
<translation>Estonien</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="183"/>
+ <location filename="../map/CMapIMG.cpp" line="184"/>
<source>Latvian</source>
<translation>Letton</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="184"/>
+ <location filename="../map/CMapIMG.cpp" line="185"/>
<source>Romanian</source>
<translation>Roumain</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="185"/>
+ <location filename="../map/CMapIMG.cpp" line="186"/>
<source>Albanian</source>
<translation>Albanais</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="186"/>
+ <location filename="../map/CMapIMG.cpp" line="187"/>
<source>Bosnian</source>
<translation>Bosnien</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="187"/>
+ <location filename="../map/CMapIMG.cpp" line="188"/>
<source>Lithuanian</source>
<translation>Lituanien</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="188"/>
+ <location filename="../map/CMapIMG.cpp" line="189"/>
<source>Serbian</source>
<translation>Serbe</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="189"/>
+ <location filename="../map/CMapIMG.cpp" line="190"/>
<source>Macedonian</source>
<translation>Macédonien</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="190"/>
+ <location filename="../map/CMapIMG.cpp" line="191"/>
<source>Bulgarian</source>
<translation>Bulgare</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="247"/>
+ <location filename="../map/CMapIMG.cpp" line="248"/>
<source>Major highway</source>
<translation>Route majeure</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="248"/>
+ <location filename="../map/CMapIMG.cpp" line="249"/>
<source>Principal highway</source>
<translation>Route principale</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="249"/>
+ <location filename="../map/CMapIMG.cpp" line="250"/>
<source>Other highway</source>
<translation>Autre route</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="250"/>
+ <location filename="../map/CMapIMG.cpp" line="251"/>
<source>Arterial road</source>
<translation>Artère urbaine</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="251"/>
+ <location filename="../map/CMapIMG.cpp" line="252"/>
<source>Collector road</source>
<translation>Rue principale</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="252"/>
+ <location filename="../map/CMapIMG.cpp" line="253"/>
<source>Residential street</source>
<translation>Rue résidentielle</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="253"/>
+ <location filename="../map/CMapIMG.cpp" line="254"/>
<source>Alley/Private road</source>
<translation>Ruelle/Route privée</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="254"/>
+ <location filename="../map/CMapIMG.cpp" line="255"/>
<source>Highway ramp, low speed</source>
<translation>Bretelle d'accès, basse vitesse</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="255"/>
+ <location filename="../map/CMapIMG.cpp" line="256"/>
<source>Highway ramp, high speed</source>
<translation>Bretelle d'accès, grande vitesse</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="256"/>
+ <location filename="../map/CMapIMG.cpp" line="257"/>
<source>Unpaved road</source>
<translation>Route non bitumé</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="257"/>
+ <location filename="../map/CMapIMG.cpp" line="258"/>
<source>Major highway connector</source>
<translation>Bretelle majeure</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="258"/>
+ <location filename="../map/CMapIMG.cpp" line="259"/>
<source>Roundabout</source>
<translation>Rond-point</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="259"/>
+ <location filename="../map/CMapIMG.cpp" line="260"/>
<source>Railroad</source>
<translation>Voie ferrée</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="260"/>
+ <location filename="../map/CMapIMG.cpp" line="261"/>
<source>Shoreline</source>
<translation>Ligne côtière</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="261"/>
+ <location filename="../map/CMapIMG.cpp" line="262"/>
<source>Trail</source>
<translation>Sentier</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="262"/>
+ <location filename="../map/CMapIMG.cpp" line="263"/>
<source>Stream</source>
<translation>Ruisseau</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="263"/>
+ <location filename="../map/CMapIMG.cpp" line="264"/>
<source>Time zone</source>
<translation>Fuseau horaire</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="264"/>
<location filename="../map/CMapIMG.cpp" line="265"/>
+ <location filename="../map/CMapIMG.cpp" line="266"/>
<source>Ferry</source>
<translation>Bac</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="266"/>
+ <location filename="../map/CMapIMG.cpp" line="267"/>
<source>State/province border</source>
<translation>Frontière de province</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="267"/>
+ <location filename="../map/CMapIMG.cpp" line="268"/>
<source>County/parish border</source>
<translation>Frontière de canton</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="268"/>
+ <location filename="../map/CMapIMG.cpp" line="269"/>
<source>International border</source>
<translation>Frontière internationale</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="269"/>
+ <location filename="../map/CMapIMG.cpp" line="270"/>
<source>River</source>
<translation>Rivière</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="270"/>
+ <location filename="../map/CMapIMG.cpp" line="271"/>
<source>Minor land contour</source>
<translation>Courbe de niveau mineure</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="271"/>
+ <location filename="../map/CMapIMG.cpp" line="272"/>
<source>Intermediate land contour</source>
<translation>Courbe de niveau intermédiaire</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="272"/>
+ <location filename="../map/CMapIMG.cpp" line="273"/>
<source>Major land contour</source>
<translation>Courbe de niveau majeure</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="273"/>
+ <location filename="../map/CMapIMG.cpp" line="274"/>
<source>Minor depth contour</source>
<translation>Courbe isobathe mineure</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="274"/>
+ <location filename="../map/CMapIMG.cpp" line="275"/>
<source>Intermediate depth contour</source>
<translation>Courbe isobathe intermédiaire</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="275"/>
+ <location filename="../map/CMapIMG.cpp" line="276"/>
<source>Major depth contour</source>
<translation>Courbe isobathe majeure</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="276"/>
+ <location filename="../map/CMapIMG.cpp" line="277"/>
<source>Intermittent stream</source>
<translation>Ruisseau intermittent</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="277"/>
- <location filename="../map/CMapIMG.cpp" line="359"/>
+ <location filename="../map/CMapIMG.cpp" line="278"/>
+ <location filename="../map/CMapIMG.cpp" line="360"/>
<source>Airport runway</source>
<translation>Tarmac</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="278"/>
+ <location filename="../map/CMapIMG.cpp" line="279"/>
<source>Pipeline</source>
<translation>Oléoduc</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="279"/>
+ <location filename="../map/CMapIMG.cpp" line="280"/>
<source>Powerline</source>
<translation>Ligne à haute tension</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="280"/>
+ <location filename="../map/CMapIMG.cpp" line="281"/>
<source>Marine boundary</source>
<translation>Frontière maritime</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="281"/>
+ <location filename="../map/CMapIMG.cpp" line="282"/>
<source>Hazard boundary</source>
<translation>Limite de zone à risque</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="346"/>
+ <location filename="../map/CMapIMG.cpp" line="347"/>
<source>Large urban area (>200K)</source>
<translation>Grande agglomération urbaine (>200K)</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="347"/>
+ <location filename="../map/CMapIMG.cpp" line="348"/>
<source>Small urban area (<200K)</source>
<translation>Petite agglomération urbaine (<200K)</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="348"/>
+ <location filename="../map/CMapIMG.cpp" line="349"/>
<source>Rural housing area</source>
<translation>Zone résidentielle rurale</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="349"/>
+ <location filename="../map/CMapIMG.cpp" line="350"/>
<source>Military base</source>
<translation>Base militaire</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="350"/>
+ <location filename="../map/CMapIMG.cpp" line="351"/>
<source>Parking lot</source>
<translation>Parking</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="351"/>
+ <location filename="../map/CMapIMG.cpp" line="352"/>
<source>Parking garage</source>
<translation>Parking couvert</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="352"/>
+ <location filename="../map/CMapIMG.cpp" line="353"/>
<source>Airport</source>
<translation>Aéroport</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="353"/>
+ <location filename="../map/CMapIMG.cpp" line="354"/>
<source>Shopping center</source>
<translation>Centre commercial</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="354"/>
+ <location filename="../map/CMapIMG.cpp" line="355"/>
<source>Marina</source>
<translation>Marina</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="355"/>
+ <location filename="../map/CMapIMG.cpp" line="356"/>
<source>University/College</source>
<translation>Université</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="356"/>
+ <location filename="../map/CMapIMG.cpp" line="357"/>
<source>Hospital</source>
<translation>Hôpital</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="357"/>
+ <location filename="../map/CMapIMG.cpp" line="358"/>
<source>Industrial complex</source>
<translation>Complexe industriel</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="358"/>
+ <location filename="../map/CMapIMG.cpp" line="359"/>
<source>Reservation</source>
<translation>Reserve naturelle</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="360"/>
+ <location filename="../map/CMapIMG.cpp" line="361"/>
<source>Man-made area</source>
<translation>Zone industrielle</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="361"/>
+ <location filename="../map/CMapIMG.cpp" line="362"/>
<source>Sports complex</source>
<translation>Complexe sportif</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="362"/>
+ <location filename="../map/CMapIMG.cpp" line="363"/>
<source>Golf course</source>
<translation>Golf</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="363"/>
+ <location filename="../map/CMapIMG.cpp" line="364"/>
<source>Cemetery</source>
<translation>Cimetière</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="364"/>
<location filename="../map/CMapIMG.cpp" line="365"/>
<location filename="../map/CMapIMG.cpp" line="366"/>
+ <location filename="../map/CMapIMG.cpp" line="367"/>
<source>National park</source>
<translation>Parc national</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="367"/>
+ <location filename="../map/CMapIMG.cpp" line="368"/>
<source>City park</source>
<translation>Parc urbain</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="368"/>
<location filename="../map/CMapIMG.cpp" line="369"/>
<location filename="../map/CMapIMG.cpp" line="370"/>
+ <location filename="../map/CMapIMG.cpp" line="371"/>
<source>State park</source>
<translation>Parc régional</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="371"/>
+ <location filename="../map/CMapIMG.cpp" line="372"/>
<source>Forest</source>
<translation>Forêt</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="372"/>
+ <location filename="../map/CMapIMG.cpp" line="373"/>
<source>Ocean</source>
<translation>Océan</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="373"/>
- <location filename="../map/CMapIMG.cpp" line="375"/>
- <location filename="../map/CMapIMG.cpp" line="385"/>
+ <location filename="../map/CMapIMG.cpp" line="374"/>
+ <location filename="../map/CMapIMG.cpp" line="376"/>
+ <location filename="../map/CMapIMG.cpp" line="386"/>
<source>Blue (unknown)</source>
<translation></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="374"/>
+ <location filename="../map/CMapIMG.cpp" line="375"/>
<source>Sea</source>
<translation>Mer</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="376"/>
<location filename="../map/CMapIMG.cpp" line="377"/>
- <location filename="../map/CMapIMG.cpp" line="384"/>
+ <location filename="../map/CMapIMG.cpp" line="378"/>
+ <location filename="../map/CMapIMG.cpp" line="385"/>
<source>Large lake</source>
<translation>Grand lac</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="378"/>
<location filename="../map/CMapIMG.cpp" line="379"/>
+ <location filename="../map/CMapIMG.cpp" line="380"/>
<source>Medium lake</source>
<translation>Lac moyen</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="380"/>
<location filename="../map/CMapIMG.cpp" line="381"/>
+ <location filename="../map/CMapIMG.cpp" line="382"/>
<source>Small lake</source>
<translation>Petit lac</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="382"/>
<location filename="../map/CMapIMG.cpp" line="383"/>
+ <location filename="../map/CMapIMG.cpp" line="384"/>
<source>Major lake</source>
<translation>Lac majeur</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="386"/>
+ <location filename="../map/CMapIMG.cpp" line="387"/>
<source>Major River</source>
<translation>Rivière majeure</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="387"/>
+ <location filename="../map/CMapIMG.cpp" line="388"/>
<source>Large River</source>
<translation>Grande rivière</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="388"/>
+ <location filename="../map/CMapIMG.cpp" line="389"/>
<source>Medium River</source>
<translation>Rivière moyenne</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="389"/>
+ <location filename="../map/CMapIMG.cpp" line="390"/>
<source>Small River</source>
<translation>Petite rivière</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="392"/>
+ <location filename="../map/CMapIMG.cpp" line="393"/>
<source>Intermittent water</source>
<translation>Cours d'eau intermittent</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="393"/>
+ <location filename="../map/CMapIMG.cpp" line="394"/>
<source>Wetland/Swamp</source>
<translation>Marais</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="394"/>
+ <location filename="../map/CMapIMG.cpp" line="395"/>
<source>Glacier</source>
<translation>Glacier</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="395"/>
+ <location filename="../map/CMapIMG.cpp" line="396"/>
<source>Orchard/Plantation</source>
<translation>Verger</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="396"/>
+ <location filename="../map/CMapIMG.cpp" line="397"/>
<source>Scrub</source>
<translation>Broussaille</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="397"/>
+ <location filename="../map/CMapIMG.cpp" line="398"/>
<source>Tundra</source>
<translation>Tundra</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="398"/>
+ <location filename="../map/CMapIMG.cpp" line="399"/>
<source>Flat</source>
<translation>Plaine</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="399"/>
+ <location filename="../map/CMapIMG.cpp" line="400"/>
<source>???</source>
<translation></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="435"/>
+ <location filename="../map/CMapIMG.cpp" line="436"/>
<source>Failed to read: </source>
<translation>Erreur de lecture : </translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="478"/>
+ <location filename="../map/CMapIMG.cpp" line="479"/>
<source>Failed to open: </source>
<translation>Échec d'ouverture : </translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="502"/>
- <location filename="../map/CMapIMG.cpp" line="506"/>
+ <location filename="../map/CMapIMG.cpp" line="503"/>
+ <location filename="../map/CMapIMG.cpp" line="507"/>
<source>Bad file format: </source>
<translation>Format de fichier invalide : </translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="595"/>
+ <location filename="../map/CMapIMG.cpp" line="596"/>
<source>Failed to read file structure: </source>
<translation>Erreur de lecture de la structure du fichier : </translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="630"/>
+ <location filename="../map/CMapIMG.cpp" line="631"/>
<source>Loading %1</source>
<translation>Chargement de %1</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="636"/>
+ <location filename="../map/CMapIMG.cpp" line="637"/>
<source>User abort: </source>
<translation>Interruption par l'utilisateur : </translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="639"/>
+ <location filename="../map/CMapIMG.cpp" line="640"/>
<source>File is NT format. QMapShack is unable to read map files with NT format: </source>
<translation>Le fichier est au format NT. QMapShack ne peut pas lire des fichiers au format NT : </translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="730"/>
+ <location filename="../map/CMapIMG.cpp" line="731"/>
<source>File contains locked / encrypted data. Garmin does not want you to use this file with any other software than the one supplied by Garmin.</source>
<translation>Le fichier contient des données verrouillées / cryptées. Garmin ne vous autorise pas à utiliser ce fichier avec un logiciel non fourni par Garmin.</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2305"/>
- <location filename="../map/CMapIMG.cpp" line="2311"/>
- <location filename="../map/CMapIMG.cpp" line="2315"/>
+ <location filename="../map/CMapIMG.cpp" line="2342"/>
+ <location filename="../map/CMapIMG.cpp" line="2348"/>
+ <location filename="../map/CMapIMG.cpp" line="2352"/>
<source>Point of Interest</source>
<translation>Point d'intérêt</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2401"/>
+ <location filename="../map/CMapIMG.cpp" line="2438"/>
<source>Unknown</source>
<translation>Inconnu</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2443"/>
- <location filename="../map/CMapIMG.cpp" line="2451"/>
- <location filename="../map/CMapIMG.cpp" line="2458"/>
+ <location filename="../map/CMapIMG.cpp" line="2480"/>
+ <location filename="../map/CMapIMG.cpp" line="2488"/>
+ <location filename="../map/CMapIMG.cpp" line="2495"/>
<source>Area</source>
<translation>Surface</translation>
</message>
@@ -2731,7 +2771,7 @@ If it's no fun, why don't you provide maps? Well to host maps ready fo
<message>
<location filename="../map/CMapTMS.cpp" line="67"/>
<source>Failed to open %1</source>
- <translation>Impossible d'ouvrir : </translation>
+ <translation>Impossible d'ouvrir: %1 </translation>
</message>
<message>
<location filename="../map/CMapTMS.cpp" line="77"/>
@@ -2764,7 +2804,7 @@ ligne %2, colonne %3:
<location filename="../map/CMapVRT.cpp" line="45"/>
<location filename="../map/CMapVRT.cpp" line="59"/>
<location filename="../map/CMapVRT.cpp" line="88"/>
- <location filename="../map/CMapVRT.cpp" line="126"/>
+ <location filename="../map/CMapVRT.cpp" line="133"/>
<source>Error...</source>
<translation>Erreur...</translation>
</message>
@@ -2780,7 +2820,7 @@ ligne %2, colonne %3:
<translation>Le fichier doit avoir une palette à 8 bits ou être en niveaux de gris.</translation>
</message>
<message>
- <location filename="../map/CMapVRT.cpp" line="126"/>
+ <location filename="../map/CMapVRT.cpp" line="133"/>
<source>No georeference information found.</source>
<translation>Aucune information de géoréférencement trouvé</translation>
</message>
@@ -2788,22 +2828,22 @@ ligne %2, colonne %3:
<context>
<name>CMapVrtBuilder</name>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="28"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="29"/>
<source>Build GDAL VRT</source>
<translation>Générer le VRT GDAL</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="46"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="47"/>
<source>Select files...</source>
<translation>Sélectionnez les fichiers...</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="70"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="71"/>
<source>Select target file...</source>
<translation>Sélectionnez le fichier à créer...</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="114"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="115"/>
<source>!!! done !!!
</source>
<translation>!!! fait !!!</translation>
@@ -2934,36 +2974,41 @@ Structure inconnue.</translation>
<name>CMouseNormal</name>
<message>
<location filename="../mouse/CMouseNormal.cpp" line="39"/>
+ <source>Add POI as Waypoint</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mouse/CMouseNormal.cpp" line="40"/>
<source>Add Waypoint</source>
<translation>Ajouter un waypoint</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="40"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="41"/>
<source>Add Track</source>
<translation>Ajouter une trace</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="41"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="42"/>
<source>Add Route</source>
<translation>Ajouter une route</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="42"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="43"/>
<source>Add Area</source>
<translation>Ajouter une surface</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="44"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="45"/>
<source>Select Items On Map</source>
<translation>Selectionner des objets sur la carte</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="46"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="47"/>
<source>Copy position</source>
<translation>Copier la position</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="47"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="48"/>
<source>Copy position (Grid)</source>
<translation>Copier la position (grille)</translation>
</message>
@@ -2979,7 +3024,7 @@ Structure inconnue.</translation>
<context>
<name>CMouseRangeTrk</name>
<message>
- <location filename="../mouse/CMouseRangeTrk.cpp" line="227"/>
+ <location filename="../mouse/CMouseRangeTrk.cpp" line="224"/>
<source><b>Select Range</b><br/>Select first track point with left mouse button. And then a second one. Leave range selection with a click of the right mouse button.<br/></source>
<translation type="unfinished"></translation>
</message>
@@ -2987,32 +3032,32 @@ Structure inconnue.</translation>
<context>
<name>CMouseSelect</name>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="31"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="32"/>
<source><b>Select Items On Map</b><br/>Select a rectangular area on the map. Use the left mouse button and move the mouse. Abort with a right click. Adjust the selection by point-click-move on the corners.</source>
<translation><b>Sélectionner des objets sur la carte</b><br/>Sélectionnez une surface rectangulaire sur la carte. Utilisez le bouton gauche de la souris et déplacez la souris. Clic droit pour annuler. Ajustez la sélection en déplaçant les coins.</translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="96"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="98"/>
<source><b>Selected:</b><br/></source>
<translation><b>Sélectionné::</b><br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="104"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="106"/>
<source>%1 waypoints<br/></source>
<translation>%1 points<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="99"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="101"/>
<source>%1 tracks<br/></source>
<translation>%1 traces<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="109"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="111"/>
<source>%1 routes<br/></source>
<translation>%1 routes<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="114"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="116"/>
<source>%1 areas<br/></source>
<translation>%1 surfaces<br/></translation>
</message>
@@ -3105,7 +3150,7 @@ y: %4 m/px</translation>
<translation>Temps écoulé : %1</translation>
</message>
<message>
- <location filename="../helpers/CProgressDialog.cpp" line="82"/>
+ <location filename="../helpers/CProgressDialog.cpp" line="86"/>
<source>Elapsed time: %1 seconds.</source>
<translation>Temps écoulé : %1 secondes</translation>
</message>
@@ -3336,6 +3381,458 @@ n'est pas une définition de système de coordonnées:
</message>
</context>
<context>
+ <name>CRouterBRouter</name>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="49"/>
+ <source>original</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="50"/>
+ <source>first alternative</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="51"/>
+ <source>second alternative</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="52"/>
+ <source>third alternative</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="147"/>
+ <source>BRouter (offline)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="152"/>
+ <source>BRouter (online)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="180"/>
+ <source>profile: %1, alternative: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="267"/>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="381"/>
+ <source>response is empty</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="304"/>
+ <source>Bad response from server: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="352"/>
+ <source><b>BRouter</b><br/>Routing request sent to server. Please wait...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="246"/>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="355"/>
+ <source>Calculate route with %1</source>
+ <translation type="unfinished">Calculer l'itinéraire avec %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="415"/>
+ <source><b>BRouter</b><br/>Bad response from server:<br/>%1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="405"/>
+ <source><br/>Calculation time: %1s</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="509"/>
+ <source>Error</source>
+ <translation type="unfinished">Erreur</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="561"/>
+ <source>running</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="553"/>
+ <source>starting</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="515"/>
+ <source>QMapShack communicates with BRouter via a network connection. Usually this is done on a special address that can't be reached from outside your device. However BRouter listens for connections on all available interfaces. If you are in your own private network with an active firewall, this is not much of a problem. If you are in a public network every open port is a risk as it can be used by someone else to compromise your system. We do not recommend to use the local [...]
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="542"/>
+ <source>Warning...</source>
+ <translation type="unfinished">Avertissement...</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="547"/>
+ <source>I understand the risk. Don't tell me again.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="568"/>
+ <source>stopped</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="579"/>
+ <source>not installed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="590"/>
+ <source>online</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterSetup</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="479"/>
+ <source>%1 not accessible</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="489"/>
+ <source>%1 invalid result</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="533"/>
+ <source>Error parsing online-config:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="538"/>
+ <source>Network error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterSetupWizard</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="38"/>
+ <source>Restore Default Values</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="371"/>
+ <source>Open Directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="378"/>
+ <source>select Java Executable</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="414"/>
+ <source>please select BRouter installation directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="419"/>
+ <source>selected directory does not exist</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="420"/>
+ <source>create directory and install BRouter there</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="427"/>
+ <source>existing BRouter installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="428"/>
+ <source>update existing BRouter installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="433"/>
+ <source>empty directory, create new BRouter installation here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="434"/>
+ <source>create new BRouter installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="442"/>
+ <source>seems to be a valid Java-executable</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="446"/>
+ <source>doesn't seem to be a valid Java-executable</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="451"/>
+ <source>Java Executable not found</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="496"/>
+ <source>Error loading installation-page at %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="505"/>
+ <source>no brouter-version to install selected</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="513"/>
+ <source>selected %1 for download and installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="524"/>
+ <source>Warning...</source>
+ <translation type="unfinished">Avertissement...</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="529"/>
+ <source>Download: %1<br/><br/>This will download and install a zip file from a download location that is not secured by any standard at all, using plain HTTP. Usually this should be HTTPS. The risk is someone redirecting the request and sending you a replacement zip with malware. There is no way for QMapShack to detect this. <br/>If you do not understand this or if you are in doubt, do not proceed and abort. Use the Web version of BRouter instead.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="541"/>
+ <source>I understand the risk and wish to proceed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="553"/>
+ <source>download %1 started</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="565"/>
+ <source>Network Error: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="586"/>
+ <source>download %1 finished</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="588"/>
+ <source>unzipping:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="593"/>
+ <source>ready.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="613"/>
+ <source>download of brouter failed: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="623"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="630"/>
+ <source>retrieving available profiles from %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="654"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="736"/>
+ <source>content of profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="729"/>
+ <source>Error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="466"/>
+ <source>Error creating directory %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="571"/>
+ <source>Error directory %1 does not exist</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="578"/>
+ <source>Error creating file %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="582"/>
+ <source>Error writing to file %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterTilesPage</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesPage.cpp" line="82"/>
+ <source>Continue with Setup</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterTilesSelect</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="98"/>
+ <source>available routing-data is being determined.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="108"/>
+ <source>Select outdated</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="109"/>
+ <source>Clear Selection</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="110"/>
+ <source>Delete selection</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="111"/>
+ <source>Download</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="281"/>
+ <source>Error creating segments directory %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="365"/>
+ <source>cannot parse: %1 is not a date</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="390"/>
+ <source>cannot parse: %1 is not a valid size</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="409"/>
+ <source>Error retrieving available routing data from %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="490"/>
+ <source>segments directory does not exist: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="504"/>
+ <source>error creating file %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="536"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="576"/>
+ <source>no valid request for filename %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="541"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="584"/>
+ <source>no open file assigned to request for %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="551"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="594"/>
+ <source>error writing to file %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="602"/>
+ <source>error renaming file %1 to %2: %3</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="685"/>
+ <source>up-to-date: %1 (%2), outdated: %3 (%4), to be downloaded: %5 (%6)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="783"/>
+ <source>being downloaded: %1 of %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="803"/>
+ <source>no local data, online available: %1 (%2)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="789"/>
+ <source>local data outdated (%1, %2 - remote %3, %4)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="190"/>
+ <source>Error removing %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="321"/>
+ <source>Network Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="330"/>
+ <source>invalid result, no files found</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="797"/>
+ <source>local data up to date (%1, %2)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="809"/>
+ <source>no routing-data available</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterToolShell</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="74"/>
+ <source>!!! done !!!
+</source>
+ <translation type="unfinished">!!! fait !!!</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="79"/>
+ <source>!!! failed !!!
+</source>
+ <translation type="unfinished">!!! échec !!!</translation>
+ </message>
+</context>
+<context>
<name>CRouterMapQuest</name>
<message>
<location filename="../gis/rte/router/CRouterMapQuest.cpp" line="37"/>
@@ -3639,7 +4136,7 @@ n'est pas une définition de système de coordonnées:
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="185"/>
<source>A route could not be found to waypoint %1.</source>
- <translation>Aucune route vers le waypoint 1 n'a été trouvée</translation>
+ <translation>Aucune route vers le waypoint %1 n'a été trouvée</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="188"/>
@@ -3658,7 +4155,6 @@ n'est pas une définition de système de coordonnées:
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="55"/>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="238"/>
<source>Warning...</source>
<translation>Avertissement...</translation>
</message>
@@ -3668,18 +4164,13 @@ n'est pas une définition de système de coordonnées:
<translation>La base de donnée de routage ne contient aucune voie à cet endroit</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="238"/>
- <source>%1: Due to limitations in the Windows POSIX API Routino can't handle files larger than 4GB.</source>
- <translation>%1 : A cause de limitation de l'API POSIX Routino ne peut gérer de fichiers de plus de 4 Go</translation>
- </message>
- <message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="338"/>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="425"/>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="332"/>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="419"/>
<source>Calculate route with %1</source>
<translation>Calculer l'itinéraire avec %1</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="346"/>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="340"/>
<source><br/>Calculation time: %1s</source>
<translation><br/>Temps de calcul : %1s</translation>
</message>
@@ -3687,12 +4178,12 @@ n'est pas une définition de système de coordonnées:
<context>
<name>CRouterRoutinoPathSetup</name>
<message>
- <location filename="../gis/rte/router/CRouterRoutinoPathSetup.cpp" line="40"/>
+ <location filename="../gis/rte/router/routino/CRouterRoutinoPathSetup.cpp" line="40"/>
<source>Add or remove paths containing Routino data. There can be multiple databases in a path but no sub-path is parsed.</source>
<translation>Ajouter ou enlever des répertoires contenant des données Routino. Il peut y avoir plusieurs bases de données dans un répertoire mais les sous-répertoires ne sont pas pris en compte.</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutinoPathSetup.cpp" line="55"/>
+ <location filename="../gis/rte/router/routino/CRouterRoutinoPathSetup.cpp" line="55"/>
<source>Select routing data file path...</source>
<translation>Sélectionner un répertoire de données de calcul d'itinéraire...</translation>
</message>
@@ -3700,35 +4191,40 @@ n'est pas une définition de système de coordonnées:
<context>
<name>CRouterSetup</name>
<message>
- <location filename="../gis/rte/router/CRouterSetup.cpp" line="36"/>
+ <location filename="../gis/rte/router/CRouterSetup.cpp" line="38"/>
<source>Routino (offline)</source>
<translation>Routino (hors ligne)</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterSetup.cpp" line="37"/>
+ <location filename="../gis/rte/router/CRouterSetup.cpp" line="39"/>
<source>MapQuest (online)</source>
<translation>MapQuest (en ligne)</translation>
</message>
+ <message>
+ <location filename="../gis/rte/router/CRouterSetup.cpp" line="40"/>
+ <source>BRouter (online)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CRoutinoDatabaseBuilder</name>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="32"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="33"/>
<source>Create Routino Database</source>
<translation>Créer une base de données Routino</translation>
</message>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="56"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="57"/>
<source>Select files...</source>
<translation>Sélectionnez les fichiers...</translation>
</message>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="80"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="81"/>
<source>Select target path...</source>
<translation>Sélectionnez le répertoire cible...</translation>
</message>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="141"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="142"/>
<source>!!! done !!!
</source>
<translation>!!! fait !!!</translation>
@@ -3920,19 +4416,117 @@ ligne %2, colonne %3:
<context>
<name>CTableTrk</name>
<message>
- <location filename="../gis/trk/CTableTrk.cpp" line="99"/>
- <source>Double click to edit elevation value</source>
- <translation>Double-clic pour éditer l'altitude</translation>
+ <location filename="../gis/trk/CTableTrk.cpp" line="99"/>
+ <source>Double click to edit elevation value</source>
+ <translation>Double-clic pour éditer l'altitude</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CTableTrk.cpp" line="125"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="133"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="136"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="141"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="155"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="157"/>
+ <source>%1 %2</source>
+ <translation>%1 %2</translation>
+ </message>
+</context>
+<context>
+ <name>CTcxProject</name>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="51"/>
+ <source>Failed to load file %1...</source>
+ <translation>Impossible de charger le fichier %1...</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="73"/>
+ <source>Failed to open %1</source>
+ <translation>Impossible d'ouvrir %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="84"/>
+ <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+ <translation>Erreur de lecture: %1
+ligne %2, colonne %3:
+ %4</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="91"/>
+ <source>Not a TCX file: %1</source>
+ <translation>Ceci n'est pas un fichier TCX : %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="101"/>
+ <source>This TCX file contains at least 1 workout, but neither an activity nor a course. As workouts do not contain position data, they can not be imported to QMapShack.</source>
+ <translation>Ce fichier TCX contient au moins 1 entraînement, mais aucune activité ni course. Comme les entraînements ne contiennent pas de données de position, ils ne peuvent pas être importés dans QMapShack.</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="106"/>
+ <source>This TCX file does not contain any activity or course: %1</source>
+ <translation>Ce fichier TCX ne contient ni activité ni course : %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="275"/>
+ <source>File exists ...</source>
+ <translation>Le fichier existe...</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="276"/>
+ <source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file. Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
+ <translation>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 TCX 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/tcx/CTcxProject.cpp" line="315"/>
+ <source>The track <b>%1</b> you have selected contains trackpoints with invalid timestamps. Device might not accept the generated TCX course file if left as is. <b>Do you want to apply a filter with constant speed (10 m/s) and continue?</b></source>
+ <translation>La trace <b>%1</b> que vous avez selectionnée contient des points à l'horodatage invalide. L'appareil risque de ne pas accepter le fichier TCX généré si la trace est laissée telle quelle. <b>Voulez-vous appliquer un filtre vitesse arbitraire (10 m/s) et continuer ?</b></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="339"/>
+ <source>Course</source>
+ <translation>Course</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="340"/>
+ <source>Activity</source>
+ <translation>Activité</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="341"/>
+ <source>Cancel</source>
+ <translation>Annuler</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="314"/>
+ <source>Track with invalid timestamps...</source>
+ <translation>Trace à l'horodatage invalide...</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="334"/>
+ <source>Activity or course?</source>
+ <translation>Activité ou course ?</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="335"/>
+ <source>QMapShack does not know how track <b>%1</b> should be saved. <b>Do you want to save it as a course or as an activity? </b>Remember that only waypoints close enough to the track will be saved when saving as a course. Waypoints will not be saved when saving as an activity.</source>
+ <translation type="unfinished">QMapShack ne sait pas comment la trace <b>%1</b> doit être sauvegardée. <b>Voulez-vous la sauvegarder comme une activité ou comme une course ?</b> Seuls les waypoints proches de la trace seront inclus si "course" est choisi. Si "activité" est choisi aucun waypoint ne sera inclus.</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="432"/>
+ <source>Failed to create file '%1'</source>
+ <translation>Impossible de créer le fichier: '%1'</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="453"/>
+ <source>Failed to write file '%1'</source>
+ <translation>Impossible d'écrire le fichier: '%1'</translation>
</message>
<message>
- <location filename="../gis/trk/CTableTrk.cpp" line="125"/>
- <location filename="../gis/trk/CTableTrk.cpp" line="133"/>
- <location filename="../gis/trk/CTableTrk.cpp" line="136"/>
- <location filename="../gis/trk/CTableTrk.cpp" line="141"/>
- <location filename="../gis/trk/CTableTrk.cpp" line="155"/>
- <location filename="../gis/trk/CTableTrk.cpp" line="157"/>
- <source>%1 %2</source>
- <translation>%1 %2</translation>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="435"/>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="454"/>
+ <source>Saving GIS data failed...</source>
+ <translation>Impossible de sauvegarder les données SIG</translation>
</message>
</context>
<context>
@@ -4010,139 +4604,149 @@ ligne %2, colonne %3:
</message>
<message>
<location filename="../IAbout.ui" line="62"/>
- <location filename="../IAbout.ui" line="106"/>
- <location filename="../IAbout.ui" line="120"/>
- <location filename="../IAbout.ui" line="134"/>
- <location filename="../IAbout.ui" line="148"/>
+ <location filename="../IAbout.ui" line="113"/>
+ <location filename="../IAbout.ui" line="127"/>
+ <location filename="../IAbout.ui" line="141"/>
+ <location filename="../IAbout.ui" line="155"/>
<source>TextLabel</source>
<translation>Libellé</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="99"/>
+ <location filename="../IAbout.ui" line="106"/>
<source>Qt</source>
<translation></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="113"/>
+ <location filename="../IAbout.ui" line="120"/>
<source>GDAL</source>
<translation></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="127"/>
+ <location filename="../IAbout.ui" line="134"/>
<source>Proj4</source>
<translation></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="141"/>
+ <location filename="../IAbout.ui" line="148"/>
<source>Routino</source>
<translation>Routino</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="172"/>
+ <location filename="../IAbout.ui" line="179"/>
<source>Czech:</source>
<translation>Tchèque:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="195"/>
+ <location filename="../IAbout.ui" line="202"/>
<source>German:</source>
<translation>Allemand:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="218"/>
+ <location filename="../IAbout.ui" line="212"/>
+ <source>Oliver Eichler</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../IAbout.ui" line="225"/>
<source>Dutch:</source>
<translation>Néerlandais:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="241"/>
+ <location filename="../IAbout.ui" line="248"/>
<source>French:</source>
<translation>Français:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="251"/>
+ <location filename="../IAbout.ui" line="258"/>
<source>Rainer Unseld </source>
<translation></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="381"/>
- <source>Christian Eichler (qms at christian-eichler.de)
-Ivo Kronenberg</source>
- <translation>Christian Eichler (qms at christian-eichler.de)
-Ivo Kronenberg</translation>
+ <location filename="../IAbout.ui" line="295"/>
+ <source>Russian:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../IAbout.ui" line="302"/>
+ <source>Wolfgang Thämelt</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../IAbout.ui" line="428"/>
+ <source>© 2017 Oliver Eichler (oliver.eichler at gmx.de)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="182"/>
+ <location filename="../IAbout.ui" line="189"/>
<source>Pavel Fric</source>
<translation></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="281"/>
+ <location filename="../IAbout.ui" line="288"/>
<source><b>Translation:</b></source>
<translation><b>Traduction:</b></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="228"/>
+ <location filename="../IAbout.ui" line="235"/>
<source>Harrie Klomp</source>
<translation>Harrie Klomp</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="271"/>
+ <location filename="../IAbout.ui" line="278"/>
<source>Spanish:</source>
<translation>Espagnol:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="305"/>
+ <location filename="../IAbout.ui" line="326"/>
<source>Win64:</source>
<translation>Win64:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="321"/>
+ <location filename="../IAbout.ui" line="342"/>
<source>OS X:</source>
<translation>OS X:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="345"/>
+ <location filename="../IAbout.ui" line="366"/>
<source><b>Binaries:</b></source>
<translation><b>Fichiers binaires:</b></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="374"/>
+ <location filename="../IAbout.ui" line="395"/>
<source><b>Contributors:</b></source>
<translation><b>Contributeurs:</b></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="205"/>
- <source>Josef Latt</source>
- <translation></translation>
- </message>
- <message>
- <location filename="../IAbout.ui" line="258"/>
+ <location filename="../IAbout.ui" line="265"/>
<source>Jose Luis Domingo Lopez</source>
<translation></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="338"/>
+ <location filename="../IAbout.ui" line="359"/>
<source>Ivo Kronenberg</source>
<translation>Ivo Kronenberg</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="331"/>
+ <location filename="../IAbout.ui" line="352"/>
<source>Helmut Schmidt</source>
<translation>Helmut Schmidt</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="354"/>
+ <location filename="../IAbout.ui" line="375"/>
<source>...and thanks to all Linux binary maintainers for doing a great job. Special thanks to Dan Horák and Bas Couwenberg for showing presence on the mailing list to discuss distribution related topics.</source>
<translation>... et merci à tous les gestionnaires de binaires Linux pour leur travail admirable. Remerciements particuliers à Dan Horák et Bas Couwenberg pour leur présence sur les mailing lists relatives aux distributions.</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="399"/>
- <source>This software is licensed under GPL3 or any later version</source>
- <translation>Ce logiciel est distribué sous les termes de la licence GPL3 ou toute version utérieure</translation>
+ <location filename="../IAbout.ui" line="402"/>
+ <source>Christian Eichler (qms at christian-eichler.de)
+Ivo Kronenberg
+Norbert Truchsess (norbert.truchsess at t-online.de)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="406"/>
- <source>© 2014 Oliver Eichler (oliver.eichler at gmx.de)</source>
- <translation></translation>
+ <location filename="../IAbout.ui" line="421"/>
+ <source>This software is licensed under GPL3 or any later version</source>
+ <translation>Ce logiciel est distribué sous les termes de la licence GPL3 ou toute version utérieure</translation>
</message>
</context>
<context>
@@ -4194,13 +4798,23 @@ Ivo Kronenberg</translation>
<translation>Joindre des traces</translation>
</message>
<message>
- <location filename="../gis/trk/ICombineTrk.ui" line="43"/>
- <location filename="../gis/trk/ICombineTrk.ui" line="70"/>
- <location filename="../gis/trk/ICombineTrk.ui" line="117"/>
- <location filename="../gis/trk/ICombineTrk.ui" line="144"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="24"/>
+ <source>Available Tracks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/ICombineTrk.ui" line="54"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="81"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="139"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="166"/>
<source>...</source>
<translation></translation>
</message>
+ <message>
+ <location filename="../gis/trk/ICombineTrk.ui" line="109"/>
+ <source>Combined Tracks</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ICoordFormatSetup</name>
@@ -4252,17 +4866,22 @@ Ivo Kronenberg</translation>
<translation>Supprimer le début de la trace</translation>
</message>
<message>
- <location filename="../gis/trk/ICutTrk.ui" line="27"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="30"/>
<source>Keep both parts of the track</source>
<translation>Séparer la trace en 2</translation>
</message>
<message>
- <location filename="../gis/trk/ICutTrk.ui" line="37"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="43"/>
<source>Keep first part of the track and delete second one</source>
<translation>Supprimer la fin de la trace</translation>
</message>
<message>
- <location filename="../gis/trk/ICutTrk.ui" line="60"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="55"/>
+ <source>Cut Mode:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/ICutTrk.ui" line="136"/>
<source>Check this to store the result into a new track.
If you keep both parts of the track you have to create new ones.
@@ -4275,7 +4894,7 @@ Si vous voulez conserver les 2 parties de la trace vous devez en créer de nouve
Si vous voulez conserver seulement une moitié vous pouvez simplement enlever les points, ou cochez la case pour créer une nouvelle trace.</translation>
</message>
<message>
- <location filename="../gis/trk/ICutTrk.ui" line="67"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="143"/>
<source>Create a new track</source>
<translation>Créer une nouvelle trace</translation>
</message>
@@ -4587,8 +5206,8 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
</message>
<message>
<location filename="../gis/ovl/IDetailsOvlArea.ui" line="132"/>
- <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>
+ <source>The area was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../gis/ovl/IDetailsOvlArea.ui" line="148"/>
@@ -4700,16 +5319,16 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
<translation>Information</translation>
</message>
<message>
+ <location filename="../gis/rte/IDetailsRte.ui" line="154"/>
+ <source>The route was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../gis/rte/IDetailsRte.ui" line="205"/>
<source>-</source>
<translation>-</translation>
</message>
<message>
- <location filename="../gis/rte/IDetailsRte.ui" line="154"/>
- <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/rte/IDetailsRte.ui" line="170"/>
<source>Toggle read only mode. You have to open the lock to edit the item.</source>
<translation>Dés/activer le mode lecture seule. Ouvrez le cadenas pour pouvoir éditer l'objet.</translation>
@@ -4781,11 +5400,6 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
<translation>Inverser le mode lecture seule. Ouvrez le cadenas pour pouvoir éditer l'objet.</translation>
</message>
<message>
- <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="316"/>
<source>-</source>
<translation></translation>
@@ -4882,6 +5496,11 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
-</translation>
</message>
<message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="265"/>
+ <source>The track was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+ <translation 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"/>
@@ -5014,6 +5633,11 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
<translation>Proximité:</translation>
</message>
<message>
+ <location filename="../gis/wpt/IDetailsWpt.ui" line="268"/>
+ <source>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../gis/wpt/IDetailsWpt.ui" line="321"/>
<source>Date/Time:</source>
<translation>Date/heure</translation>
@@ -5024,11 +5648,6 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
<translation>Hist.</translation>
</message>
<message>
- <location filename="../gis/wpt/IDetailsWpt.ui" line="268"/>
- <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/wpt/IDetailsWpt.ui" line="284"/>
<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>
@@ -5612,70 +6231,70 @@ It is either a new item or it has been deleted in the database by someone else.<
<context>
<name>IGisProject</name>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="109"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="155"/>
<source>Save project?</source>
<translation>Enregistrer le projet ?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="109"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="155"/>
<source><h3>%1</h3>The project was changed. Save before closing it?</source>
<translation><h3>%1</h3>Le projet a été modifié. Sauvegarder avant de quitter ?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="283"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="329"/>
<source>%1: Correlate tracks and waypoints.</source>
<translation>%1: Corréler les traces et les waypoints.</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="293"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="339"/>
<source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
<translation><h3>%1</h3>Etait-ce trop long ? Voulez-vous ne pas faire la corrélation des traces et waypoints la prochaine fois pour ce projet ?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="294"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="340"/>
<source>Canceled correlation...</source>
<translation>Corrélation annulée...</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="339"/>
- <location filename="../gis/prj/IGisProject.cpp" line="392"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="385"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="442"/>
<source>Save "%1" to...</source>
<translation>Sauvegarder"%1" dans ...</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="477"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="527"/>
<source><br/>
Filename: %1</source>
<translation><br/>
Nom de fichier: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="482"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="532"/>
<source>Waypoints: %1</source>
<translation>Waypoints: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="486"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="536"/>
<source>Tracks: %1</source>
<translation>Traces: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="490"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="540"/>
<source>Routes: %1</source>
<translation>Routes: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="494"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="544"/>
<source>Areas: %1</source>
<translation>Surfaces: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="614"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="664"/>
<source>Are you sure you want to delete '%1' from project '%2'?</source>
<translation>Êtes-vous sûr de vouloir supprimer %1 du projet '%2'?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="615"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="665"/>
<source>Delete...</source>
<translation>Supprimer...</translation>
</message>
@@ -5688,28 +6307,28 @@ Nom de fichier: %1</translation>
<translation></translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="37"/>
+ <location filename="../gis/IGisWidget.ui" line="49"/>
<source>Opacity</source>
<translation>Opacité</translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="44"/>
+ <location filename="../gis/IGisWidget.ui" line="56"/>
<source>Change the opacity of all GIS Items on the map.</source>
<translation>Modifier l'opacité de tous les objets SIG sur la carte</translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="96"/>
- <location filename="../gis/IGisWidget.ui" line="126"/>
+ <location filename="../gis/IGisWidget.ui" line="108"/>
+ <location filename="../gis/IGisWidget.ui" line="138"/>
<source>Name</source>
<translation>Nom</translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="131"/>
+ <location filename="../gis/IGisWidget.ui" line="143"/>
<source>Age</source>
<translation>Age</translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="165"/>
+ <location filename="../gis/IGisWidget.ui" line="177"/>
<source>To add a database do a right click on the database list above.</source>
<translation>Pour ajouter une base de données cliquez droit sur la liste ci-dessus</translation>
</message>
@@ -5811,7 +6430,7 @@ Nom de fichier: %1</translation>
<context>
<name>ILineOp</name>
<message>
- <location filename="../mouse/line/ILineOp.cpp" line="211"/>
+ <location filename="../mouse/line/ILineOp.cpp" line="212"/>
<source>Routing</source>
<translation>Routage</translation>
</message>
@@ -5868,333 +6487,338 @@ Nom de fichier: %1</translation>
<translation>Fenêtre</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="109"/>
+ <location filename="../IMainWindow.ui" line="110"/>
<source>?</source>
<translation>?</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="116"/>
+ <location filename="../IMainWindow.ui" line="118"/>
<source>Project</source>
<translation>Projet</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="127"/>
+ <location filename="../IMainWindow.ui" line="129"/>
<source>Tool</source>
<translation>Outils</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="152"/>
+ <location filename="../IMainWindow.ui" line="154"/>
<source>Maps</source>
<translation>Cartes</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="195"/>
+ <location filename="../IMainWindow.ui" line="197"/>
<source>Dig. Elev. Model (DEM)</source>
<translation>Modèle numérique de terrain (DEM)</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="234"/>
+ <location filename="../IMainWindow.ui" line="236"/>
<source>Data</source>
<translation>Données</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="252"/>
+ <location filename="../IMainWindow.ui" line="254"/>
<source>Route</source>
<translation>Calcul d'itinéraire</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="286"/>
- <location filename="../IMainWindow.ui" line="289"/>
+ <location filename="../IMainWindow.ui" line="288"/>
+ <location filename="../IMainWindow.ui" line="291"/>
<source>Add Map View</source>
<translation>Ajouter une vue cartographique</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="292"/>
+ <location filename="../IMainWindow.ui" line="294"/>
<source>Ctrl+T</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="307"/>
+ <location filename="../IMainWindow.ui" line="309"/>
<source>Show Scale</source>
<translation>Afficher l'échelle</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="319"/>
+ <location filename="../IMainWindow.ui" line="321"/>
<source>Setup Map Font</source>
<translation>Configurer la police de la carte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="334"/>
+ <location filename="../IMainWindow.ui" line="336"/>
<source>Show Grid</source>
<translation>Afficher la grille</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="337"/>
+ <location filename="../IMainWindow.ui" line="339"/>
<source>Ctrl+G</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="349"/>
+ <location filename="../IMainWindow.ui" line="351"/>
<source>Setup Grid</source>
<translation>Configurer la grille</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="352"/>
+ <location filename="../IMainWindow.ui" line="354"/>
<source>Ctrl+Alt+G</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="367"/>
+ <location filename="../IMainWindow.ui" line="369"/>
<source>Flip Mouse Wheel</source>
<translation>Inverser le sens de la molette de souris</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="379"/>
- <location filename="../IMainWindow.ui" line="382"/>
+ <location filename="../IMainWindow.ui" line="381"/>
+ <location filename="../IMainWindow.ui" line="384"/>
<source>Setup Map Paths</source>
<translation>Configurer les répertoires des cartes</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="397"/>
+ <location filename="../IMainWindow.ui" line="399"/>
<source>POI Text</source>
<translation>Libellés des points d'interêt</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="412"/>
+ <location filename="../IMainWindow.ui" line="414"/>
<source>Night / Day</source>
<translation>Jour / Nuit</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="427"/>
+ <location filename="../IMainWindow.ui" line="429"/>
<source>Map Tool Tip</source>
<translation>Infobulles sur la carte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="430"/>
+ <location filename="../IMainWindow.ui" line="432"/>
<source>Ctrl+I</source>
<translation>CTRL + I</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="442"/>
+ <location filename="../IMainWindow.ui" line="444"/>
<source>Setup DEM Paths</source>
<translation>Configurer les répertoires DEM</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="454"/>
+ <location filename="../IMainWindow.ui" line="456"/>
<source>About</source>
<translation>À propos</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="466"/>
+ <location filename="../IMainWindow.ui" line="468"/>
<source>Help</source>
<translation>Aide</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="469"/>
+ <location filename="../IMainWindow.ui" line="471"/>
<source>F1</source>
<translation>F1</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="481"/>
- <location filename="../IMainWindow.ui" line="484"/>
+ <location filename="../IMainWindow.ui" line="483"/>
+ <location filename="../IMainWindow.ui" line="486"/>
<source>Setup Map View</source>
<translation>Configurer la vue cartographique</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="496"/>
+ <location filename="../IMainWindow.ui" line="498"/>
<source>Load GIS Data</source>
<translation>Charger des données SIG...</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="499"/>
+ <location filename="../IMainWindow.ui" line="501"/>
<source>Load projects from file</source>
<translation>Charger un fichier projet</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="502"/>
+ <location filename="../IMainWindow.ui" line="504"/>
<source>Ctrl+L</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="514"/>
+ <location filename="../IMainWindow.ui" line="516"/>
<source>Save All GIS Data</source>
<translation>Enregistrer toutes les données SIG</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="517"/>
+ <location filename="../IMainWindow.ui" line="519"/>
<source>Save all projects in the workspace</source>
<translation>Enregistrer tous les projets de l'espace de travail</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="520"/>
+ <location filename="../IMainWindow.ui" line="522"/>
<source>Ctrl+S</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="532"/>
+ <location filename="../IMainWindow.ui" line="534"/>
<source>Setup Time Zone</source>
<translation>Configurer le fuseau horaire</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="544"/>
+ <location filename="../IMainWindow.ui" line="546"/>
<source>Add empty project</source>
<translation>Ajouter un projet vide</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="559"/>
+ <location filename="../IMainWindow.ui" line="561"/>
<source>Search Google</source>
<translation>Recherche Google</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="571"/>
+ <location filename="../IMainWindow.ui" line="573"/>
<source>Close all projects</source>
<translation>Fermer tous les projets</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="574"/>
+ <location filename="../IMainWindow.ui" line="576"/>
<source>F8</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="586"/>
+ <location filename="../IMainWindow.ui" line="588"/>
<source>Setup Units</source>
<translation>Configurer les unités</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="598"/>
+ <location filename="../IMainWindow.ui" line="600"/>
<source>Setup Workspace</source>
<translation>Configurer l'espace de travail</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="601"/>
+ <location filename="../IMainWindow.ui" line="603"/>
<source>Setup save on exit.</source>
<translation>Sauvegarde de la configuration en quittant</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="613"/>
+ <location filename="../IMainWindow.ui" line="615"/>
<source>Import Database from QLandkarte</source>
<translation>Importer une base de données QLandkarte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="616"/>
+ <location filename="../IMainWindow.ui" line="618"/>
<source>Import QLandkarte GT database</source>
<translation>Importer une base de données QLandkarte GT</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="628"/>
+ <location filename="../IMainWindow.ui" line="630"/>
<source>VRT Builder</source>
<translation>Générateur de VRT</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="631"/>
+ <location filename="../IMainWindow.ui" line="633"/>
<source>GUI front end to gdalbuildvrt</source>
<translation>Interface utilisateur pour gdalbuildvrt</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="643"/>
+ <location filename="../IMainWindow.ui" line="645"/>
<source>Store Map View</source>
<translation>Enregistrer une vue cartographique</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="646"/>
+ <location filename="../IMainWindow.ui" line="648"/>
<source>Write current active map and DEM list including the properties to a file</source>
<translation>Sauvegarder les cartes et calques DEM actives et leurs paramètres dans un fichier</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="658"/>
+ <location filename="../IMainWindow.ui" line="660"/>
<source>Load Map View</source>
<translation>Charger une vue cartographique</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="661"/>
+ <location filename="../IMainWindow.ui" line="663"/>
<source>Restore view with active map and DEM list including the properties from a file</source>
<translation>Rétablir une vue avec les cartes et calques DEM et leurs paramètres à partir d'un fichier</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="676"/>
+ <location filename="../IMainWindow.ui" line="678"/>
<source>Ext. Profile</source>
<translation>Profile externe</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="679"/>
+ <location filename="../IMainWindow.ui" line="681"/>
<source>Ctrl+E</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="691"/>
+ <location filename="../IMainWindow.ui" line="693"/>
<source>Close</source>
<translation>Fermer</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="694"/>
+ <location filename="../IMainWindow.ui" line="696"/>
<source>Ctrl+Q</source>
<translation>CTRL + Q</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="706"/>
+ <location filename="../IMainWindow.ui" line="708"/>
<source>Clone Map View</source>
<translation>Dupliquer une vue cartographique</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="709"/>
+ <location filename="../IMainWindow.ui" line="711"/>
<source>Ctrl+Shift+T</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="721"/>
+ <location filename="../IMainWindow.ui" line="723"/>
<source>Create Routino Database</source>
<translation>Créer une base de données Routino</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="733"/>
+ <location filename="../IMainWindow.ui" line="735"/>
<source>Save(Print) Map Screenshot</source>
<translation>Sauvegarder (Imprimer) une capture d'écran de la carte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="736"/>
+ <location filename="../IMainWindow.ui" line="738"/>
<source>Print a selected area of the map</source>
<translation>Imprimer une zone sélectionnée de la carte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="739"/>
+ <location filename="../IMainWindow.ui" line="741"/>
<source>Ctrl+P</source>
<translation>CTRL + P</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="751"/>
+ <location filename="../IMainWindow.ui" line="753"/>
<source>Setup Coord. Format</source>
<translation>Choisir le format de coordonnées</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="754"/>
+ <location filename="../IMainWindow.ui" line="756"/>
<source>Change the format coordinates are displayed</source>
<translation>Modifier le format des coordonnées affichées</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="766"/>
+ <location filename="../IMainWindow.ui" line="768"/>
<source>Setup Map Background</source>
<translation>Modifier l'arrière-plan de la carte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="778"/>
+ <location filename="../IMainWindow.ui" line="780"/>
<source>Setup Waypoint Icons</source>
<translation>Modifer les icônes des waypoints</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="781"/>
+ <location filename="../IMainWindow.ui" line="783"/>
<source>Setup path to custom icons</source>
<translation>Modifier le chemin des icônes personnalisés</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="790"/>
+ <location filename="../IMainWindow.ui" line="792"/>
<source>Close Tab</source>
<translation>Fermer l'onglet</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="793"/>
+ <location filename="../IMainWindow.ui" line="795"/>
<source>Ctrl+W</source>
<translation>CTRL + W</translation>
</message>
+ <message>
+ <location filename="../IMainWindow.ui" line="804"/>
+ <source>Quickstart Help</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>IMapList</name>
@@ -6318,37 +6942,42 @@ Je n'ai pas envie de lire la documentation !</translation>
<translation><html><head/><body><p>Cliquez pour utilser l'échelle courante comme échelle maximale d'affichage de la carte.</p></body></html></translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="137"/>
+ <location filename="../map/IMapPropSetup.ui" line="139"/>
<source>Areas</source>
<translation>Surfaces</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="144"/>
+ <location filename="../map/IMapPropSetup.ui" line="146"/>
<source>Lines</source>
<translation>Lignes</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="151"/>
+ <location filename="../map/IMapPropSetup.ui" line="153"/>
<source>Points</source>
<translation>Points</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="233"/>
+ <location filename="../map/IMapPropSetup.ui" line="170"/>
+ <source>Details</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../map/IMapPropSetup.ui" line="264"/>
<source>-</source>
<translation>-</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="240"/>
+ <location filename="../map/IMapPropSetup.ui" line="271"/>
<source>Cache Path</source>
<translation>Répertoire du cache</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="196"/>
+ <location filename="../map/IMapPropSetup.ui" line="227"/>
<source>Cache Size (MB)</source>
<translation>Taille du cache (MO)</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="216"/>
+ <location filename="../map/IMapPropSetup.ui" line="247"/>
<source>Expiration (Days)</source>
<translation>Durée du cache (jours)</translation>
</message>
@@ -6493,19 +7122,24 @@ Je n'ai pas envie de lire la documentation !</translation>
<translation>Ajouter un waypoint</translation>
</message>
<message>
- <location filename="../plot/IPlot.cpp" line="541"/>
+ <location filename="../plot/IPlot.cpp" line="99"/>
+ <source>Cut...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../plot/IPlot.cpp" line="542"/>
<source>Hold CTRL key for vertical zoom, only.
Hold ALT key for horizontal zoom, only.</source>
<translation>Enfoncez CTRL pour zoomer uniquement sur l'axe vertical.
Enfoncez ALT pour zoomer uniquement sur l'axe horizontal.</translation>
</message>
<message>
- <location filename="../plot/IPlot.cpp" line="696"/>
+ <location filename="../plot/IPlot.cpp" line="697"/>
<source>No or bad data.</source>
<translation>Aucune donnée ou données invalides.</translation>
</message>
<message>
- <location filename="../plot/IPlot.cpp" line="1296"/>
+ <location filename="../plot/IPlot.cpp" line="1298"/>
<source>Select output file</source>
<translation>Sélectionner le fichier de sortie</translation>
</message>
@@ -6672,6 +7306,262 @@ or
</message>
</context>
<context>
+ <name>IRouterBRouter</name>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished">Formulaire</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="28"/>
+ <source>Profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="35"/>
+ <source>Alternative</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="64"/>
+ <source>display selected routing profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="67"/>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="128"/>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="142"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="87"/>
+ <source>on-the-fly routing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="111"/>
+ <source>BRouter: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="118"/>
+ <source>not running</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="125"/>
+ <source>start/stop BRouter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="139"/>
+ <source>show BRouter console</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="172"/>
+ <source>Setup</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="181"/>
+ <source>Caution! BRouter is listening on all ports for connections.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>IRouterBRouterInfo</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterInfo.ui" line="14"/>
+ <source>BRouter Profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterInfo.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation type="unfinished">Libellé</translation>
+ </message>
+</context>
+<context>
+ <name>IRouterBRouterSetupWizard</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="23"/>
+ <source>BRouter Setup</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="48"/>
+ <source>choose which BRouter to use</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="54"/>
+ <source>BRouter-Web (online)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="61"/>
+ <source>local Installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="68"/>
+ <source>Expert Mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="91"/>
+ <source>local BRouter Installation directory:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="103"/>
+ <source>select installation directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="106"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="162"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="342"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="356"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="389"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="400"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="119"/>
+ <source>labelLocalDirResult</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="128"/>
+ <source>create or update installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="152"/>
+ <source>Java Executable</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="175"/>
+ <source>labelLocalJavaResult</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="184"/>
+ <source>search for installed java</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="241"/>
+ <source>Download and install BRouter Version</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="255"/>
+ <source>about:blank</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="263"/>
+ <source>File to install</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="272"/>
+ <source>Download and Install</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="321"/>
+ <source>available Profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="339"/>
+ <source>install profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="353"/>
+ <source>remove profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="371"/>
+ <source>installed Profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="415"/>
+ <source>content of profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="451"/>
+ <source>BRouter-Web URL:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="501"/>
+ <source>Service-URL</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="511"/>
+ <source>Profile-URL</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="561"/>
+ <source>Hostname</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="571"/>
+ <source>Port</source>
+ <translation type="unfinished">Port</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="581"/>
+ <source>Profile directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="591"/>
+ <source>Segments directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="601"/>
+ <source>Custom Profiles dir</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="611"/>
+ <source>Max Runtime</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="621"/>
+ <source>Number Threads</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="631"/>
+ <source>Java Options</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="551"/>
+ <source>Profiles Url</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>IRouterMapQuest</name>
<message>
<location filename="../gis/rte/router/IRouterMapQuest.ui" line="14"/>
@@ -6775,18 +7665,18 @@ or
<context>
<name>IRouterRoutinoPathSetup</name>
<message>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="14"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="14"/>
<source>Setup Routino database...</source>
<translation>Configurez la base de données Routino...</translation>
</message>
<message>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="27"/>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="47"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="27"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="47"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="99"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="99"/>
<source>-</source>
<translation>-</translation>
</message>
@@ -7039,18 +7929,18 @@ or
<translation></translation>
</message>
<message>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="20"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="32"/>
<source>Delete all points between the first and last one.</source>
<translation>Supprimer tous les points entre le premier et le dernier point.</translation>
</message>
<message>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="23"/>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="37"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="35"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="49"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="34"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="46"/>
<source><html><head/><body><p>Calculate a route between the first and last selected point.</p></body></html></source>
<translation><html><head/><body><p>Calculer un itinéraire entre le premier et le dernier point sélectionné.</p></body></html></translation>
</message>
@@ -7173,12 +8063,13 @@ or
<location filename="../mouse/IScrOptSelect.ui" line="82"/>
<location filename="../mouse/IScrOptSelect.ui" line="102"/>
<location filename="../mouse/IScrOptSelect.ui" line="122"/>
- <location filename="../mouse/IScrOptSelect.ui" line="176"/>
- <location filename="../mouse/IScrOptSelect.ui" line="205"/>
- <location filename="../mouse/IScrOptSelect.ui" line="265"/>
- <location filename="../mouse/IScrOptSelect.ui" line="292"/>
- <location filename="../mouse/IScrOptSelect.ui" line="319"/>
- <location filename="../mouse/IScrOptSelect.ui" line="346"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="142"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="196"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="225"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="285"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="312"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="339"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="366"/>
<source>...</source>
<translation>...</translation>
</message>
@@ -7189,41 +8080,46 @@ or
</message>
<message>
<location filename="../mouse/IScrOptSelect.ui" line="99"/>
+ <source>Change the icon of all selected waypoints.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mouse/IScrOptSelect.ui" line="119"/>
<source>Combine all selected tracks to a new one.</source>
<translation>Combiner toutes les trcaes sélectionnées dans une seule nouvelle</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="119"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="139"/>
<source>Delete all selected items.</source>
<translation>Supprimer tous les objets sélectionnés</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="173"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="193"/>
<source>Select all items that intersect the selected area.</source>
<translation>Sélectionner tous les objets dont au moins une partie est présente dans la zone sélectionnée</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="202"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="222"/>
<source>Select all itmes that are completely inside the selected area.</source>
<translation>Sélectionner tous les objets qui sont totalement inclus dans la zone sélectionnée</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="262"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="282"/>
<source>Add tracks to selection.</source>
<translation>Ajouter des traces à la sélection</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="289"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="309"/>
<source>Add waypoints to selection.</source>
<translation>Ajouter des waypoints à la sélection</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="316"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="336"/>
<source>Add routes to selection.</source>
<translation>Ajouter des routes à la sélection</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="343"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="363"/>
<source>Add areas to selection.</source>
<translation>Ajouter des surfaces à la sélection</translation>
</message>
@@ -8090,38 +8986,38 @@ or
<context>
<name>IToolShell</name>
<message>
- <location filename="../tool/IToolShell.cpp" line="45"/>
+ <location filename="../tool/IToolShell.cpp" line="46"/>
<source>Execution of external program `%1` failed: </source>
<translation>Echec de l'execution du programme externe %1: </translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="49"/>
+ <location filename="../tool/IToolShell.cpp" line="50"/>
<source>Process cannot be started.
</source>
<translation>Le process ne peut être démarré</translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="50"/>
+ <location filename="../tool/IToolShell.cpp" line="51"/>
<source>Make sure the required packages are installed, `%1` exists and is executable.
</source>
<translation>Assurez-vous que les paquets requis sont installés, '%1' existe et est exécutable.
</translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="54"/>
+ <location filename="../tool/IToolShell.cpp" line="55"/>
<source>External process crashed.
</source>
<translation>Process externe planté.</translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="58"/>
+ <location filename="../tool/IToolShell.cpp" line="59"/>
<source>An unknown error occurred.
</source>
<translation>Une erreur inconnue a eu lieu.
</translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="149"/>
+ <location filename="../tool/IToolShell.cpp" line="172"/>
<source>!!! failed !!!
</source>
<translation>!!! échec !!!</translation>
diff --git a/src/locale/qmapshack_nl.ts b/src/locale/qmapshack_nl.ts
index ef55539..cc19000 100644
--- a/src/locale/qmapshack_nl.ts
+++ b/src/locale/qmapshack_nl.ts
@@ -13,6 +13,11 @@
<source>%1 (API V%2)</source>
<translation>%1 (API V%2)</translation>
</message>
+ <message>
+ <location filename="../CAbout.cpp" line="49"/>
+ <source>(no DBUS: device detection and handling disabled)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CActivityTrk</name>
@@ -112,12 +117,12 @@
<context>
<name>CCanvas</name>
<message>
- <location filename="../canvas/CCanvas.cpp" line="60"/>
+ <location filename="../canvas/CCanvas.cpp" line="61"/>
<source>View %1</source>
<translation>Venster %1</translation>
</message>
<message>
- <location filename="../canvas/CCanvas.cpp" line="685"/>
+ <location filename="../canvas/CCanvas.cpp" line="693"/>
<source>Setup Map Background</source>
<translation type="unfinished"></translation>
</message>
@@ -262,7 +267,27 @@
<context>
<name>CDBProject</name>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="223"/>
+ <location filename="../gis/db/CDBProject.cpp" line="112"/>
+ <source>Failed to load...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="113"/>
+ <source>Can't load file "%1" . It will be skipped.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="126"/>
+ <source>Project already in database...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="127"/>
+ <source>The project "%1" has already been imported into the database. It will be skipped.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="278"/>
<source>The item %1 has been changed by %2 (%3).
To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
@@ -271,47 +296,47 @@ To solve this conflict you can create and save a clone, force your version or dr
Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer huidige versie of verwijder deze versie en kies een ander uit de database</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="229"/>
+ <location filename="../gis/db/CDBProject.cpp" line="284"/>
<source>Conflict with database...</source>
<translation>Conflict met database...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="230"/>
+ <location filename="../gis/db/CDBProject.cpp" line="285"/>
<source>Clone && Save</source>
<translation>Kloon && Opslaan</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="231"/>
+ <location filename="../gis/db/CDBProject.cpp" line="286"/>
<source>Force Save</source>
<translation>Forceer opslaan</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="232"/>
+ <location filename="../gis/db/CDBProject.cpp" line="287"/>
<source>Take remote</source>
<translation>Neem huidige</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="514"/>
+ <location filename="../gis/db/CDBProject.cpp" line="569"/>
<source>Missing folder...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="515"/>
+ <location filename="../gis/db/CDBProject.cpp" line="570"/>
<source>Failed to save project. The folder has been deleted in the database.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="522"/>
+ <location filename="../gis/db/CDBProject.cpp" line="577"/>
<source>Save ...</source>
<translation>Opslaan...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="585"/>
+ <location filename="../gis/db/CDBProject.cpp" line="640"/>
<source>Error</source>
<translation>Fout</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="585"/>
+ <location filename="../gis/db/CDBProject.cpp" line="640"/>
<source>There was an unexpected database error:
%1</source>
@@ -320,12 +345,12 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
%1</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="700"/>
+ <location filename="../gis/db/CDBProject.cpp" line="755"/>
<source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
<translation>Het project '%1' zal geupdated worden met de database.Er zijn nog veranderingen niet opgeslagen.</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="701"/>
+ <location filename="../gis/db/CDBProject.cpp" line="756"/>
<source>Save changes?</source>
<translation>Veranderingen opslaan?</translation>
</message>
@@ -855,78 +880,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="65"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="66"/>
<source>_Clone</source>
<translation>_Kloon</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="283"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="284"/>
<source>track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="310"/>
+ <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="316"/>
+ <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="322"/>
+ <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="328"/>
+ <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="346"/>
+ <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="350"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
<source>Length: -</source>
<translation>Lengte: -</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="357"/>
- <location filename="../gis/rte/CGisItemRte.cpp" line="599"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="600"/>
<source>Time: %1 %2</source>
<translation>Tijd: %1 %2</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="361"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
<source>Time: -</source>
<translation>Tijd: -</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="371"/>
+ <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="377"/>
+ <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="379"/>
+ <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="601"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="602"/>
<source>Distance: %1 %2</source>
<translation>Afstand: %1 %2</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="716"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="717"/>
<source>Changed route points.</source>
<translation>Routepunten aangepast.</translation>
</message>
@@ -1070,21 +1095,21 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1214"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1227"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1283"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1327"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1466"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1223"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1236"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1292"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1336"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1475"/>
<source>track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1418"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1427"/>
<source>Hide point %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1422"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1431"/>
<source>Hide points %1..%2.</source>
<translation type="unfinished"></translation>
</message>
@@ -1180,47 +1205,47 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<translation type="unfinished">Afstand: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1273"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1282"/>
<source>Permanently removed points %1..%2</source>
<translation>Permanent verwijderde punten %1..%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1451"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1460"/>
<source>Show points.</source>
<translation>Toon punten.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1985"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
<source>Changed name</source>
<translation>Naam aangepast</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1991"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
<source>Changed comment</source>
<translation>Notitie aangepast</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1997"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
<source>Changed description</source>
<translation>Beschrijving aangepast</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2003"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2012"/>
<source>Changed links</source>
<translation>Link aangepast</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2014"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2023"/>
<source>Changed elevation of point %1 to %2 %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2038"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2047"/>
<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="2077"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2086"/>
<source>Changed activity to '%1' for range(%2..%3).</source>
<translation>Activiteit aangepast naar '%1' voor bereik(%2..%3).</translation>
</message>
@@ -1328,62 +1353,62 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<translation>_Kloon</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="272"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="275"/>
<source>Elevation: %1 %2</source>
<translation>Hoogte: %1 %2</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="283"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="286"/>
<source>Proximity: %1 %2</source>
<translation>Nabijheid: %1 %2</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="355"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="358"/>
<source>Changed name</source>
<translation>Naam aangepast</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="365"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="368"/>
<source>Changed position</source>
<translation>Positie aangepast</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="371"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="374"/>
<source>Changed elevation</source>
<translation>Hoogte aangepast</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="377"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="380"/>
<source>Changed proximity</source>
<translation>Nabijheid aangepast</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="391"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
<source>Changed icon</source>
<translation>Pictogram aangepast</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="397"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
<source>Changed comment</source>
<translation>Notitie aangepast</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="403"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="406"/>
<source>Changed description</source>
<translation>Beschrijving aangepast</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="409"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="412"/>
<source>Changed links</source>
<translation>Link aangepast</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="415"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="418"/>
<source>Changed images</source>
<translation>Afbeelding aangepast</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="421"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="424"/>
<source>Add image</source>
<translation>Afbeelding toevoegen</translation>
</message>
@@ -1391,341 +1416,356 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<context>
<name>CGisListDB</name>
<message>
- <location filename="../gis/CGisListDB.cpp" line="83"/>
+ <location filename="../gis/CGisListDB.cpp" line="84"/>
<source>Due to changes in the database system QMapShack forgot about the filename of your database '%1'. You have to select it again in the next step.</source>
<translation>Door een aanpassing in het database systeem is QMapShack de bestandnaam van database ''%1' vergeten. Selecteer dit weer in de volgende stap.</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="84"/>
+ <location filename="../gis/CGisListDB.cpp" line="85"/>
<source>Select database file.</source>
<translation>Selecteer database bestand.</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="117"/>
+ <location filename="../gis/CGisListDB.cpp" line="118"/>
<source>Add Database</source>
<translation>Database toevoegen</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="120"/>
+ <location filename="../gis/CGisListDB.cpp" line="121"/>
<source>Add Folder</source>
<translation>Map toevoegen</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="121"/>
+ <location filename="../gis/CGisListDB.cpp" line="122"/>
<source>Rename Folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="122"/>
+ <location filename="../gis/CGisListDB.cpp" line="123"/>
<source>Copy Folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="123"/>
+ <location filename="../gis/CGisListDB.cpp" line="124"/>
<source>Move Folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="124"/>
+ <location filename="../gis/CGisListDB.cpp" line="125"/>
<source>Delete Folder</source>
<translation>Map verwijderen</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="125"/>
- <source>Export to GPX...</source>
+ <location filename="../gis/CGisListDB.cpp" line="127"/>
+ <source>Import from Files...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gis/CGisListDB.cpp" line="128"/>
- <location filename="../gis/CGisListDB.cpp" line="141"/>
+ <source>Export to GPX...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListDB.cpp" line="131"/>
+ <location filename="../gis/CGisListDB.cpp" line="147"/>
<source>Delete Item</source>
<translation>Element verwijderen</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="132"/>
+ <location filename="../gis/CGisListDB.cpp" line="135"/>
<source>Search Database</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="133"/>
+ <location filename="../gis/CGisListDB.cpp" line="136"/>
<source>Sync. with Database</source>
<translation>Syngroniseren met database</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="134"/>
+ <location filename="../gis/CGisListDB.cpp" line="137"/>
<source>Remove Database</source>
<translation>Database verwijderen</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="138"/>
+ <location filename="../gis/CGisListDB.cpp" line="144"/>
<source>Empty</source>
<translation>Leeg</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="437"/>
+ <location filename="../gis/CGisListDB.cpp" line="444"/>
<source>Remove database...</source>
<translation>Database verwijderen...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="437"/>
+ <location filename="../gis/CGisListDB.cpp" line="444"/>
<source>Do you really want to remove '%1' from the list?</source>
<translation>Moet '%1' werkelijk uit de lijst verwijderd worden?</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="501"/>
+ <location filename="../gis/CGisListDB.cpp" line="508"/>
<source>Delete database folder...</source>
<translation>Verwijder database map...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="501"/>
+ <location filename="../gis/CGisListDB.cpp" line="508"/>
<source>Are you sure you want to delete selected folders and all subfolders from the database?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="669"/>
+ <location filename="../gis/CGisListDB.cpp" line="676"/>
<source>Bad operation....</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="669"/>
+ <location filename="../gis/CGisListDB.cpp" line="676"/>
<source>The target folder is a subfolder of the one to move. This will not work.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="728"/>
+ <location filename="../gis/CGisListDB.cpp" line="735"/>
<source>Folder name...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="728"/>
+ <location filename="../gis/CGisListDB.cpp" line="735"/>
<source>Rename folder:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="749"/>
- <location filename="../gis/CGisListDB.cpp" line="770"/>
+ <location filename="../gis/CGisListDB.cpp" line="756"/>
+ <location filename="../gis/CGisListDB.cpp" line="777"/>
<source>Remove items...</source>
<translation>Elementen verwijderen...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="749"/>
+ <location filename="../gis/CGisListDB.cpp" line="756"/>
<source>Are you sure you want to delete all items from Lost&Found? This will remove them permanently.</source>
<translation>Moeten alle elementen worden verwijderd uit Verloren & Gevonden? Dit zal pemanent zijn.</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="770"/>
+ <location filename="../gis/CGisListDB.cpp" line="777"/>
<source>Are you sure you want to delete all selected items from Lost&Found? This will remove them permanently.</source>
<translation>Moeten alle geselecteerde elementen worden verwijderd uit Verloren & Gevonden? Dit zal pemanent zijn.</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="857"/>
+ <location filename="../gis/CGisListDB.cpp" line="864"/>
<source>Are you sure you want to delete '%1' from folder '%2'?</source>
<translation>Moet '%1' uit map '%2' verwijderd worden?</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="858"/>
+ <location filename="../gis/CGisListDB.cpp" line="865"/>
<source>Delete...</source>
<translation>Verwijderen...</translation>
</message>
+ <message>
+ <location filename="../gis/CGisListDB.cpp" line="1055"/>
+ <source>Import GIS Data...</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CGisListWks</name>
<message>
- <location filename="../gis/CGisListWks.cpp" line="99"/>
+ <location filename="../gis/CGisListWks.cpp" line="101"/>
<source>Edit..</source>
<translation>Bewerken..</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="101"/>
+ <location filename="../gis/CGisListWks.cpp" line="103"/>
<source>Show on Map</source>
<translation>Toon op kaart</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="102"/>
+ <location filename="../gis/CGisListWks.cpp" line="104"/>
<source>Hide from Map</source>
<translation>Toon niet op kaart</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="108"/>
+ <location filename="../gis/CGisListWks.cpp" line="110"/>
<source>Sort by Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="109"/>
+ <location filename="../gis/CGisListWks.cpp" line="111"/>
<source>Sort by Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="112"/>
+ <location filename="../gis/CGisListWks.cpp" line="114"/>
<source>Save</source>
<translation>Opslaan</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="114"/>
+ <location filename="../gis/CGisListWks.cpp" line="116"/>
<source>Save as GPX 1.1 w/o ext...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="117"/>
+ <location filename="../gis/CGisListWks.cpp" line="119"/>
<source>Send to Devices</source>
<translation>Verzend naar GPS</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="118"/>
+ <location filename="../gis/CGisListWks.cpp" line="120"/>
<source>Sync. with Database</source>
<translation>Syngroniseren met database</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="121"/>
+ <location filename="../gis/CGisListWks.cpp" line="123"/>
<source>Close</source>
<translation>Sluiten</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="130"/>
+ <location filename="../gis/CGisListWks.cpp" line="132"/>
<source>Update Project on Device</source>
<translation>Update project op GPS</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="132"/>
- <location filename="../gis/CGisListWks.cpp" line="155"/>
+ <location filename="../gis/CGisListWks.cpp" line="134"/>
+ <location filename="../gis/CGisListWks.cpp" line="157"/>
<source>Delete</source>
<translation>Verwijder</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="144"/>
+ <location filename="../gis/CGisListWks.cpp" line="146"/>
<source>Edit...</source>
<translation>Bewerken...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="100"/>
- <location filename="../gis/CGisListWks.cpp" line="145"/>
+ <location filename="../gis/CGisListWks.cpp" line="102"/>
+ <location filename="../gis/CGisListWks.cpp" line="147"/>
<source>Copy to...</source>
<translation>Kopieer naar...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="113"/>
+ <location filename="../gis/CGisListWks.cpp" line="115"/>
<source>Save as...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="147"/>
+ <location filename="../gis/CGisListWks.cpp" line="149"/>
<source>Track Profile</source>
<translation>Track profiel</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="149"/>
+ <location filename="../gis/CGisListWks.cpp" line="151"/>
<source>Select Range</source>
<translation>Selecteer afstand</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="150"/>
+ <location filename="../gis/CGisListWks.cpp" line="152"/>
<source>Edit Track Points</source>
<translation>Trackpunten bewerken</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="151"/>
+ <location filename="../gis/CGisListWks.cpp" line="153"/>
<source>Reverse Track</source>
<translation>Track omdraaien</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="152"/>
+ <location filename="../gis/CGisListWks.cpp" line="154"/>
<source>Combine Tracks</source>
<translation>Combineer tracks</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="153"/>
+ <location filename="../gis/CGisListWks.cpp" line="155"/>
<source>Copy Track with Waypoints</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="161"/>
+ <location filename="../gis/CGisListWks.cpp" line="163"/>
<source>Show Bubble</source>
<translation>Toon ballon</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="163"/>
+ <location filename="../gis/CGisListWks.cpp" line="165"/>
<source>Move Waypoint</source>
<translation>Verplaats waypoint</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="164"/>
+ <location filename="../gis/CGisListWks.cpp" line="166"/>
<source>Proj. Waypoint...</source>
<translation>Projecteer waypoint...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="172"/>
+ <location filename="../gis/CGisListWks.cpp" line="174"/>
<source>Route Instructions</source>
<translation>Route instructies</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="174"/>
+ <location filename="../gis/CGisListWks.cpp" line="176"/>
<source>Calculate Route</source>
<translation>Route berekenen</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="175"/>
+ <location filename="../gis/CGisListWks.cpp" line="177"/>
<source>Reset Route</source>
<translation>Route omkeren</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="176"/>
+ <location filename="../gis/CGisListWks.cpp" line="178"/>
<source>Edit Route</source>
<translation>Bewerk route</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="177"/>
+ <location filename="../gis/CGisListWks.cpp" line="179"/>
<source>Convert to Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="186"/>
+ <location filename="../gis/CGisListWks.cpp" line="188"/>
<source>Edit Area Points</source>
<translation>Bewerk gebied punten</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="193"/>
+ <location filename="../gis/CGisListWks.cpp" line="195"/>
<source>Create Route</source>
<translation>Maak route</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="622"/>
+ <location filename="../gis/CGisListWks.cpp" line="196"/>
+ <source>Change Icon (sel. waypt. only)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="627"/>
<source>Drop items...</source>
<translation>Elementen wissen...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="647"/>
- <location filename="../gis/CGisListWks.cpp" line="1631"/>
- <location filename="../gis/CGisListWks.cpp" line="1669"/>
+ <location filename="../gis/CGisListWks.cpp" line="652"/>
+ <location filename="../gis/CGisListWks.cpp" line="1650"/>
+ <location filename="../gis/CGisListWks.cpp" line="1688"/>
<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="773"/>
+ <location filename="../gis/CGisListWks.cpp" line="778"/>
<source>Saving workspace. Please wait.</source>
<translation>Werkruimte opslaan. Moment geduld.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="819"/>
+ <location filename="../gis/CGisListWks.cpp" line="824"/>
<source>Loading workspace. Please wait.</source>
<translation>Laden werkruimte. Moment geduld.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1155"/>
+ <location filename="../gis/CGisListWks.cpp" line="1174"/>
<source>Close all projects...</source>
<translation>Sluit alle projecten...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1155"/>
+ <location filename="../gis/CGisListWks.cpp" line="1174"/>
<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="1178"/>
+ <location filename="../gis/CGisListWks.cpp" line="1197"/>
<source>Delete project...</source>
<translation>Project verwijderen...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1178"/>
+ <location filename="../gis/CGisListWks.cpp" line="1197"/>
<source>Do you really want to delete %1?</source>
<translation>Moet %1 werkelijk verwijderd worden?</translation>
</message>
@@ -1733,27 +1773,27 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<context>
<name>CGisWidget</name>
<message>
- <location filename="../gis/CGisWidget.cpp" line="139"/>
+ <location filename="../gis/CGisWidget.cpp" line="110"/>
<source>Load project...</source>
<translation>Project laden...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="139"/>
+ <location filename="../gis/CGisWidget.cpp" line="110"/>
<source>The project "%1" is already in the workspace.</source>
<translation>Het project "%1" is al geopend.</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="544"/>
+ <location filename="../gis/CGisWidget.cpp" line="515"/>
<source>Copy items...</source>
<translation type="unfinished">Kopieer elementen...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="672"/>
+ <location filename="../gis/CGisWidget.cpp" line="664"/>
<source>Cut Track...</source>
<translation>Track knippen...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="672"/>
+ <location filename="../gis/CGisWidget.cpp" line="664"/>
<source>Do you want to delete the original track?</source>
<translation>Moet de orginele track verwijderd worden?</translation>
</message>
@@ -1940,48 +1980,48 @@ lijn %2, kolom %3:
<context>
<name>CMainWindow</name>
<message>
- <location filename="../CMainWindow.cpp" line="562"/>
+ <location filename="../CMainWindow.cpp" line="588"/>
<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="690"/>
+ <location filename="../CMainWindow.cpp" line="716"/>
<source>Ele: %1%2</source>
<translation>Hoogte: %1%2</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="706"/>
+ <location filename="../CMainWindow.cpp" line="732"/>
<source>[Grid: %1]</source>
<translation>[Raster: %1]</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="841"/>
+ <location filename="../CMainWindow.cpp" line="867"/>
<source>Load GIS Data...</source>
<translation>GIS gegevens laden...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="875"/>
+ <location filename="../CMainWindow.cpp" line="901"/>
<source>Select output file</source>
<translation>Selecteer bestand</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="875"/>
<location filename="../CMainWindow.cpp" line="901"/>
+ <location filename="../CMainWindow.cpp" line="927"/>
<source>QMapShack View (*.view)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="901"/>
+ <location filename="../CMainWindow.cpp" line="927"/>
<source>Select file to load</source>
<translation>Selecteer bestand</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1080"/>
+ <location filename="../CMainWindow.cpp" line="1106"/>
<source>Fatal...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1081"/>
+ <location filename="../CMainWindow.cpp" line="1107"/>
<source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your distribution to fix it.</source>
<translation type="unfinished"></translation>
</message>
@@ -1989,7 +2029,7 @@ lijn %2, kolom %3:
<context>
<name>CMapDraw</name>
<message>
- <location filename="../map/CMapDraw.cpp" line="420"/>
+ <location filename="../map/CMapDraw.cpp" line="457"/>
<source>There are no maps right now. QMapShack is no fun without maps. You can install maps by pressing the 'Help! I want maps!' button in the 'Maps' dock window. Or you can press the F1 key to open the online documentation that tells you how to use QMapShack.
If it's no fun, why don't you provide maps? Well to host maps ready for download and installation requires a good server. And this is not a free service. The project lacks the money. Additionally map and DEM data has a copyright. Therefore the copyright holder has to be asked prior to package the data. This is not that easy as it might sound and for some data you have to pay royalties. The project simply lacks resources to do this. And we think installing the stuff yourself is [...]
@@ -1999,625 +2039,625 @@ If it's no fun, why don't you provide maps? Well to host maps ready fo
<context>
<name>CMapIMG</name>
<message>
- <location filename="../map/CMapIMG.cpp" line="145"/>
+ <location filename="../map/CMapIMG.cpp" line="146"/>
<source>Failed ...</source>
<translation>Mislukt...</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="156"/>
+ <location filename="../map/CMapIMG.cpp" line="157"/>
<source>Unspecified</source>
<translation>Ongespecificeerd</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="157"/>
+ <location filename="../map/CMapIMG.cpp" line="158"/>
<source>French</source>
<translation>Frans</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="158"/>
+ <location filename="../map/CMapIMG.cpp" line="159"/>
<source>German</source>
<translation>Duits</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="159"/>
+ <location filename="../map/CMapIMG.cpp" line="160"/>
<source>Dutch</source>
<translation>Nederlands</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="160"/>
+ <location filename="../map/CMapIMG.cpp" line="161"/>
<source>English</source>
<translation>Engels</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="161"/>
+ <location filename="../map/CMapIMG.cpp" line="162"/>
<source>Italian</source>
<translation>Italiaans</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="162"/>
+ <location filename="../map/CMapIMG.cpp" line="163"/>
<source>Finnish</source>
<translation>Fins</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="163"/>
+ <location filename="../map/CMapIMG.cpp" line="164"/>
<source>Swedish</source>
<translation>Zweeds</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="164"/>
+ <location filename="../map/CMapIMG.cpp" line="165"/>
<source>Spanish</source>
<translation>Spaans</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="165"/>
+ <location filename="../map/CMapIMG.cpp" line="166"/>
<source>Basque</source>
<translation>Baskisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="166"/>
+ <location filename="../map/CMapIMG.cpp" line="167"/>
<source>Catalan</source>
<translation>Catalaans</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="167"/>
+ <location filename="../map/CMapIMG.cpp" line="168"/>
<source>Galician</source>
<translation>Galicisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="168"/>
+ <location filename="../map/CMapIMG.cpp" line="169"/>
<source>Welsh</source>
<translation>Wels</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="169"/>
+ <location filename="../map/CMapIMG.cpp" line="170"/>
<source>Gaelic</source>
<translation>Gaelisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="170"/>
+ <location filename="../map/CMapIMG.cpp" line="171"/>
<source>Danish</source>
<translation>Deens</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="171"/>
+ <location filename="../map/CMapIMG.cpp" line="172"/>
<source>Norwegian</source>
<translation>Noors</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="172"/>
+ <location filename="../map/CMapIMG.cpp" line="173"/>
<source>Portuguese</source>
<translation>Portugees</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="173"/>
+ <location filename="../map/CMapIMG.cpp" line="174"/>
<source>Slovak</source>
<translation>Slowaaks</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="174"/>
+ <location filename="../map/CMapIMG.cpp" line="175"/>
<source>Czech</source>
<translation>Tsjechisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="175"/>
+ <location filename="../map/CMapIMG.cpp" line="176"/>
<source>Croatian</source>
<translation>Kroatisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="176"/>
+ <location filename="../map/CMapIMG.cpp" line="177"/>
<source>Hungarian</source>
<translation>Hongaars</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="177"/>
+ <location filename="../map/CMapIMG.cpp" line="178"/>
<source>Polish</source>
<translation>Pools</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="178"/>
+ <location filename="../map/CMapIMG.cpp" line="179"/>
<source>Turkish</source>
<translation>Turks</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="179"/>
+ <location filename="../map/CMapIMG.cpp" line="180"/>
<source>Greek</source>
<translation>Grieks</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="180"/>
+ <location filename="../map/CMapIMG.cpp" line="181"/>
<source>Slovenian</source>
<translation>Sloveens</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="181"/>
+ <location filename="../map/CMapIMG.cpp" line="182"/>
<source>Russian</source>
<translation>Russisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="182"/>
+ <location filename="../map/CMapIMG.cpp" line="183"/>
<source>Estonian</source>
<translation>Ests</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="183"/>
+ <location filename="../map/CMapIMG.cpp" line="184"/>
<source>Latvian</source>
<translation>Lets</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="184"/>
+ <location filename="../map/CMapIMG.cpp" line="185"/>
<source>Romanian</source>
<translation>Roemeens</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="185"/>
+ <location filename="../map/CMapIMG.cpp" line="186"/>
<source>Albanian</source>
<translation>Albanisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="186"/>
+ <location filename="../map/CMapIMG.cpp" line="187"/>
<source>Bosnian</source>
<translation>Bosnisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="187"/>
+ <location filename="../map/CMapIMG.cpp" line="188"/>
<source>Lithuanian</source>
<translation>Litouws</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="188"/>
+ <location filename="../map/CMapIMG.cpp" line="189"/>
<source>Serbian</source>
<translation>Servisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="189"/>
+ <location filename="../map/CMapIMG.cpp" line="190"/>
<source>Macedonian</source>
<translation>Macedonisch</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="190"/>
+ <location filename="../map/CMapIMG.cpp" line="191"/>
<source>Bulgarian</source>
<translation>Bulgaars</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="247"/>
+ <location filename="../map/CMapIMG.cpp" line="248"/>
<source>Major highway</source>
<translation>Belangrijke snelweg</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="248"/>
+ <location filename="../map/CMapIMG.cpp" line="249"/>
<source>Principal highway</source>
<translation>Gewone snelweg</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="249"/>
+ <location filename="../map/CMapIMG.cpp" line="250"/>
<source>Other highway</source>
<translation>Andere snelweg</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="250"/>
+ <location filename="../map/CMapIMG.cpp" line="251"/>
<source>Arterial road</source>
<translation>Uitvalsweg</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="251"/>
+ <location filename="../map/CMapIMG.cpp" line="252"/>
<source>Collector road</source>
<translation>Verzamelweg</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="252"/>
+ <location filename="../map/CMapIMG.cpp" line="253"/>
<source>Residential street</source>
<translation>Woonstraat</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="253"/>
+ <location filename="../map/CMapIMG.cpp" line="254"/>
<source>Alley/Private road</source>
<translation>Laan/privéweg</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="254"/>
+ <location filename="../map/CMapIMG.cpp" line="255"/>
<source>Highway ramp, low speed</source>
<translation>Snelweg oprit, langzame snelheid</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="255"/>
+ <location filename="../map/CMapIMG.cpp" line="256"/>
<source>Highway ramp, high speed</source>
<translation>Snelweg oprit, hoge snelheid</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="256"/>
+ <location filename="../map/CMapIMG.cpp" line="257"/>
<source>Unpaved road</source>
<translation>Onverharde weg</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="257"/>
+ <location filename="../map/CMapIMG.cpp" line="258"/>
<source>Major highway connector</source>
<translation>Belangrijke snelwegknooppunt</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="258"/>
+ <location filename="../map/CMapIMG.cpp" line="259"/>
<source>Roundabout</source>
<translation>Rotonde</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="259"/>
+ <location filename="../map/CMapIMG.cpp" line="260"/>
<source>Railroad</source>
<translation>Spoorlijn</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="260"/>
+ <location filename="../map/CMapIMG.cpp" line="261"/>
<source>Shoreline</source>
<translation>Kustlijn</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="261"/>
+ <location filename="../map/CMapIMG.cpp" line="262"/>
<source>Trail</source>
<translation>Pad</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="262"/>
+ <location filename="../map/CMapIMG.cpp" line="263"/>
<source>Stream</source>
<translation>Stroom</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="263"/>
+ <location filename="../map/CMapIMG.cpp" line="264"/>
<source>Time zone</source>
<translation>Tijdzone</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="264"/>
<location filename="../map/CMapIMG.cpp" line="265"/>
+ <location filename="../map/CMapIMG.cpp" line="266"/>
<source>Ferry</source>
<translation>Veerdienst</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="266"/>
+ <location filename="../map/CMapIMG.cpp" line="267"/>
<source>State/province border</source>
<translation>Staat/provinciegrens</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="267"/>
+ <location filename="../map/CMapIMG.cpp" line="268"/>
<source>County/parish border</source>
<translation>Provincie/gemeentegrens</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="268"/>
+ <location filename="../map/CMapIMG.cpp" line="269"/>
<source>International border</source>
<translation>Internationale grens</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="269"/>
+ <location filename="../map/CMapIMG.cpp" line="270"/>
<source>River</source>
<translation>Rivier</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="270"/>
+ <location filename="../map/CMapIMG.cpp" line="271"/>
<source>Minor land contour</source>
<translation>Klein hoogteverschil</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="271"/>
+ <location filename="../map/CMapIMG.cpp" line="272"/>
<source>Intermediate land contour</source>
<translation>Gemiddeld hoogteverschil</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="272"/>
+ <location filename="../map/CMapIMG.cpp" line="273"/>
<source>Major land contour</source>
<translation>Groot hoogteverschil</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="273"/>
+ <location filename="../map/CMapIMG.cpp" line="274"/>
<source>Minor depth contour</source>
<translation>Klein diepteverschil</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="274"/>
+ <location filename="../map/CMapIMG.cpp" line="275"/>
<source>Intermediate depth contour</source>
<translation>Gemiddeld diepteverschil</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="275"/>
+ <location filename="../map/CMapIMG.cpp" line="276"/>
<source>Major depth contour</source>
<translation>Groot diepteverschil</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="276"/>
+ <location filename="../map/CMapIMG.cpp" line="277"/>
<source>Intermittent stream</source>
<translation>Intermitterende beek</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="277"/>
- <location filename="../map/CMapIMG.cpp" line="359"/>
+ <location filename="../map/CMapIMG.cpp" line="278"/>
+ <location filename="../map/CMapIMG.cpp" line="360"/>
<source>Airport runway</source>
<translation>Landingsbaan</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="278"/>
+ <location filename="../map/CMapIMG.cpp" line="279"/>
<source>Pipeline</source>
<translation>Pijplijn</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="279"/>
+ <location filename="../map/CMapIMG.cpp" line="280"/>
<source>Powerline</source>
<translation>Hoogspanningsleiding</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="280"/>
+ <location filename="../map/CMapIMG.cpp" line="281"/>
<source>Marine boundary</source>
<translation>Zeegrens</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="281"/>
+ <location filename="../map/CMapIMG.cpp" line="282"/>
<source>Hazard boundary</source>
<translation>Gevaarlijke grens</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="346"/>
+ <location filename="../map/CMapIMG.cpp" line="347"/>
<source>Large urban area (>200K)</source>
<translation>Groot bevolkt gebied (>200K)</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="347"/>
+ <location filename="../map/CMapIMG.cpp" line="348"/>
<source>Small urban area (<200K)</source>
<translation>Klein bevolt gebied (<200K)</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="348"/>
+ <location filename="../map/CMapIMG.cpp" line="349"/>
<source>Rural housing area</source>
<translation>Landelijk woongebied</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="349"/>
+ <location filename="../map/CMapIMG.cpp" line="350"/>
<source>Military base</source>
<translation>Militaire basis</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="350"/>
+ <location filename="../map/CMapIMG.cpp" line="351"/>
<source>Parking lot</source>
<translation>Parkeerterrein</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="351"/>
+ <location filename="../map/CMapIMG.cpp" line="352"/>
<source>Parking garage</source>
<translation>Parkeergarage</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="352"/>
+ <location filename="../map/CMapIMG.cpp" line="353"/>
<source>Airport</source>
<translation>Vliegveld</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="353"/>
+ <location filename="../map/CMapIMG.cpp" line="354"/>
<source>Shopping center</source>
<translation>Winkelcentrum</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="354"/>
+ <location filename="../map/CMapIMG.cpp" line="355"/>
<source>Marina</source>
<translation>Jachthaven</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="355"/>
+ <location filename="../map/CMapIMG.cpp" line="356"/>
<source>University/College</source>
<translation>Universiteit/College</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="356"/>
+ <location filename="../map/CMapIMG.cpp" line="357"/>
<source>Hospital</source>
<translation>Ziekenhuis</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="357"/>
+ <location filename="../map/CMapIMG.cpp" line="358"/>
<source>Industrial complex</source>
<translation>Industrie</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="358"/>
+ <location filename="../map/CMapIMG.cpp" line="359"/>
<source>Reservation</source>
<translation>Reservaat</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="360"/>
+ <location filename="../map/CMapIMG.cpp" line="361"/>
<source>Man-made area</source>
<translation>Gemaakt gebied</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="361"/>
+ <location filename="../map/CMapIMG.cpp" line="362"/>
<source>Sports complex</source>
<translation>Sprtcomplex</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="362"/>
+ <location filename="../map/CMapIMG.cpp" line="363"/>
<source>Golf course</source>
<translation>Golfbaan</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="363"/>
+ <location filename="../map/CMapIMG.cpp" line="364"/>
<source>Cemetery</source>
<translation>Begraafplaats</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="364"/>
<location filename="../map/CMapIMG.cpp" line="365"/>
<location filename="../map/CMapIMG.cpp" line="366"/>
+ <location filename="../map/CMapIMG.cpp" line="367"/>
<source>National park</source>
<translation>Nationaal park</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="367"/>
+ <location filename="../map/CMapIMG.cpp" line="368"/>
<source>City park</source>
<translation>Stadspark</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="368"/>
<location filename="../map/CMapIMG.cpp" line="369"/>
<location filename="../map/CMapIMG.cpp" line="370"/>
+ <location filename="../map/CMapIMG.cpp" line="371"/>
<source>State park</source>
<translation>Staatspark</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="371"/>
+ <location filename="../map/CMapIMG.cpp" line="372"/>
<source>Forest</source>
<translation>Bos</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="372"/>
+ <location filename="../map/CMapIMG.cpp" line="373"/>
<source>Ocean</source>
<translation>Oceaan</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="373"/>
- <location filename="../map/CMapIMG.cpp" line="375"/>
- <location filename="../map/CMapIMG.cpp" line="385"/>
+ <location filename="../map/CMapIMG.cpp" line="374"/>
+ <location filename="../map/CMapIMG.cpp" line="376"/>
+ <location filename="../map/CMapIMG.cpp" line="386"/>
<source>Blue (unknown)</source>
<translation>Blauw (onbekend</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="374"/>
+ <location filename="../map/CMapIMG.cpp" line="375"/>
<source>Sea</source>
<translation>Zee</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="376"/>
<location filename="../map/CMapIMG.cpp" line="377"/>
- <location filename="../map/CMapIMG.cpp" line="384"/>
+ <location filename="../map/CMapIMG.cpp" line="378"/>
+ <location filename="../map/CMapIMG.cpp" line="385"/>
<source>Large lake</source>
<translation>Groot meer</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="378"/>
<location filename="../map/CMapIMG.cpp" line="379"/>
+ <location filename="../map/CMapIMG.cpp" line="380"/>
<source>Medium lake</source>
<translation>Middelmatig meer</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="380"/>
<location filename="../map/CMapIMG.cpp" line="381"/>
+ <location filename="../map/CMapIMG.cpp" line="382"/>
<source>Small lake</source>
<translation>Klein meer</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="382"/>
<location filename="../map/CMapIMG.cpp" line="383"/>
+ <location filename="../map/CMapIMG.cpp" line="384"/>
<source>Major lake</source>
<translation>Belangrijk meer</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="386"/>
+ <location filename="../map/CMapIMG.cpp" line="387"/>
<source>Major River</source>
<translation>Belangrijke rivier</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="387"/>
+ <location filename="../map/CMapIMG.cpp" line="388"/>
<source>Large River</source>
<translation>Groot rivier</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="388"/>
+ <location filename="../map/CMapIMG.cpp" line="389"/>
<source>Medium River</source>
<translation>Middelmatig rivier</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="389"/>
+ <location filename="../map/CMapIMG.cpp" line="390"/>
<source>Small River</source>
<translation>Klein rivier</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="392"/>
+ <location filename="../map/CMapIMG.cpp" line="393"/>
<source>Intermittent water</source>
<translation>Intermitterende water</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="393"/>
+ <location filename="../map/CMapIMG.cpp" line="394"/>
<source>Wetland/Swamp</source>
<translation>Moeras</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="394"/>
+ <location filename="../map/CMapIMG.cpp" line="395"/>
<source>Glacier</source>
<translation>Gletsjer</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="395"/>
+ <location filename="../map/CMapIMG.cpp" line="396"/>
<source>Orchard/Plantation</source>
<translation>Boomgaard/Plantage</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="396"/>
+ <location filename="../map/CMapIMG.cpp" line="397"/>
<source>Scrub</source>
<translation>Struikgewas</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="397"/>
+ <location filename="../map/CMapIMG.cpp" line="398"/>
<source>Tundra</source>
<translation>Toendra</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="398"/>
+ <location filename="../map/CMapIMG.cpp" line="399"/>
<source>Flat</source>
<translation>Vlak</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="399"/>
+ <location filename="../map/CMapIMG.cpp" line="400"/>
<source>???</source>
<translation>???</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="435"/>
+ <location filename="../map/CMapIMG.cpp" line="436"/>
<source>Failed to read: </source>
<translation>Lezen mislukt:</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="478"/>
+ <location filename="../map/CMapIMG.cpp" line="479"/>
<source>Failed to open: </source>
<translation>Openen mislukt:</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="502"/>
- <location filename="../map/CMapIMG.cpp" line="506"/>
+ <location filename="../map/CMapIMG.cpp" line="503"/>
+ <location filename="../map/CMapIMG.cpp" line="507"/>
<source>Bad file format: </source>
<translation>Verkeerd bestandsformaat:</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="595"/>
+ <location filename="../map/CMapIMG.cpp" line="596"/>
<source>Failed to read file structure: </source>
<translation>Lezen bestandsstructuur mislukt:</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="630"/>
+ <location filename="../map/CMapIMG.cpp" line="631"/>
<source>Loading %1</source>
<translation>Laden %1</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="636"/>
+ <location filename="../map/CMapIMG.cpp" line="637"/>
<source>User abort: </source>
<translation>Afgebroken door gebruiker: </translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="639"/>
+ <location filename="../map/CMapIMG.cpp" line="640"/>
<source>File is NT format. QMapShack is unable to read map files with NT format: </source>
<translation>Bestand is in NT formaat. QMapShack kan geen kaarten lezen met NT formaat:</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="730"/>
+ <location filename="../map/CMapIMG.cpp" line="731"/>
<source>File contains locked / encrypted data. Garmin does not want you to use this file with any other software than the one supplied by Garmin.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2305"/>
- <location filename="../map/CMapIMG.cpp" line="2311"/>
- <location filename="../map/CMapIMG.cpp" line="2315"/>
+ <location filename="../map/CMapIMG.cpp" line="2342"/>
+ <location filename="../map/CMapIMG.cpp" line="2348"/>
+ <location filename="../map/CMapIMG.cpp" line="2352"/>
<source>Point of Interest</source>
<translation>Interessant punt</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2401"/>
+ <location filename="../map/CMapIMG.cpp" line="2438"/>
<source>Unknown</source>
<translation>Onbekend</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2443"/>
- <location filename="../map/CMapIMG.cpp" line="2451"/>
- <location filename="../map/CMapIMG.cpp" line="2458"/>
+ <location filename="../map/CMapIMG.cpp" line="2480"/>
+ <location filename="../map/CMapIMG.cpp" line="2488"/>
+ <location filename="../map/CMapIMG.cpp" line="2495"/>
<source>Area</source>
<translation>Gebied</translation>
</message>
@@ -2764,7 +2804,7 @@ lijn %2, kolom %3:
<location filename="../map/CMapVRT.cpp" line="45"/>
<location filename="../map/CMapVRT.cpp" line="59"/>
<location filename="../map/CMapVRT.cpp" line="88"/>
- <location filename="../map/CMapVRT.cpp" line="126"/>
+ <location filename="../map/CMapVRT.cpp" line="133"/>
<source>Error...</source>
<translation>Fout...</translation>
</message>
@@ -2780,7 +2820,7 @@ lijn %2, kolom %3:
<translation>Bestand moet 8 bit kleur of grijs geindexeerd zijn.</translation>
</message>
<message>
- <location filename="../map/CMapVRT.cpp" line="126"/>
+ <location filename="../map/CMapVRT.cpp" line="133"/>
<source>No georeference information found.</source>
<translation>Geen geografische gegevens gevonden.</translation>
</message>
@@ -2788,22 +2828,22 @@ lijn %2, kolom %3:
<context>
<name>CMapVrtBuilder</name>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="28"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="29"/>
<source>Build GDAL VRT</source>
<translation>GDAL VRT maken</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="46"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="47"/>
<source>Select files...</source>
<translation>Selecteer bestanden...</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="70"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="71"/>
<source>Select target file...</source>
<translation>Selecteer doel bestand...</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="114"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="115"/>
<source>!!! done !!!
</source>
<translation>!!! klaar !!!
@@ -2935,36 +2975,41 @@ Onbekende structuur.</translation>
<name>CMouseNormal</name>
<message>
<location filename="../mouse/CMouseNormal.cpp" line="39"/>
+ <source>Add POI as Waypoint</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mouse/CMouseNormal.cpp" line="40"/>
<source>Add Waypoint</source>
<translation>Maak waypoint</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="40"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="41"/>
<source>Add Track</source>
<translation>Maak track</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="41"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="42"/>
<source>Add Route</source>
<translation>Maak route</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="42"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="43"/>
<source>Add Area</source>
<translation>Maak gebied</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="44"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="45"/>
<source>Select Items On Map</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="46"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="47"/>
<source>Copy position</source>
<translation>Kopieer positie</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="47"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="48"/>
<source>Copy position (Grid)</source>
<translation>Kopieer positie (Raster)</translation>
</message>
@@ -2980,7 +3025,7 @@ Onbekende structuur.</translation>
<context>
<name>CMouseRangeTrk</name>
<message>
- <location filename="../mouse/CMouseRangeTrk.cpp" line="227"/>
+ <location filename="../mouse/CMouseRangeTrk.cpp" line="224"/>
<source><b>Select Range</b><br/>Select first track point with left mouse button. And then a second one. Leave range selection with a click of the right mouse button.<br/></source>
<translation type="unfinished"></translation>
</message>
@@ -2988,32 +3033,32 @@ Onbekende structuur.</translation>
<context>
<name>CMouseSelect</name>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="31"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="32"/>
<source><b>Select Items On Map</b><br/>Select a rectangular area on the map. Use the left mouse button and move the mouse. Abort with a right click. Adjust the selection by point-click-move on the corners.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="96"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="98"/>
<source><b>Selected:</b><br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="104"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="106"/>
<source>%1 waypoints<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="99"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="101"/>
<source>%1 tracks<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="109"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="111"/>
<source>%1 routes<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="114"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="116"/>
<source>%1 areas<br/></source>
<translation type="unfinished"></translation>
</message>
@@ -3106,7 +3151,7 @@ y: %4 m/px</translation>
<translation>Verstreken tijd: %1</translation>
</message>
<message>
- <location filename="../helpers/CProgressDialog.cpp" line="82"/>
+ <location filename="../helpers/CProgressDialog.cpp" line="86"/>
<source>Elapsed time: %1 seconds.</source>
<translation>Verstreken tijd: %1 seconden.</translation>
</message>
@@ -3337,6 +3382,460 @@ is geen geldig coordinaat definitie:
</message>
</context>
<context>
+ <name>CRouterBRouter</name>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="49"/>
+ <source>original</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="50"/>
+ <source>first alternative</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="51"/>
+ <source>second alternative</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="52"/>
+ <source>third alternative</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="147"/>
+ <source>BRouter (offline)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="152"/>
+ <source>BRouter (online)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="180"/>
+ <source>profile: %1, alternative: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="267"/>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="381"/>
+ <source>response is empty</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="304"/>
+ <source>Bad response from server: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="352"/>
+ <source><b>BRouter</b><br/>Routing request sent to server. Please wait...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="246"/>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="355"/>
+ <source>Calculate route with %1</source>
+ <translation type="unfinished">Bereken route met %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="415"/>
+ <source><b>BRouter</b><br/>Bad response from server:<br/>%1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="405"/>
+ <source><br/>Calculation time: %1s</source>
+ <translation type="unfinished"><br/>Berekenen tijd: %1s</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="509"/>
+ <source>Error</source>
+ <translation type="unfinished">Fout</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="561"/>
+ <source>running</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="553"/>
+ <source>starting</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="515"/>
+ <source>QMapShack communicates with BRouter via a network connection. Usually this is done on a special address that can't be reached from outside your device. However BRouter listens for connections on all available interfaces. If you are in your own private network with an active firewall, this is not much of a problem. If you are in a public network every open port is a risk as it can be used by someone else to compromise your system. We do not recommend to use the local [...]
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="542"/>
+ <source>Warning...</source>
+ <translation type="unfinished">Waarschuwing...</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="547"/>
+ <source>I understand the risk. Don't tell me again.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="568"/>
+ <source>stopped</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="579"/>
+ <source>not installed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="590"/>
+ <source>online</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterSetup</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="479"/>
+ <source>%1 not accessible</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="489"/>
+ <source>%1 invalid result</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="533"/>
+ <source>Error parsing online-config:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="538"/>
+ <source>Network error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterSetupWizard</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="38"/>
+ <source>Restore Default Values</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="371"/>
+ <source>Open Directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="378"/>
+ <source>select Java Executable</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="414"/>
+ <source>please select BRouter installation directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="419"/>
+ <source>selected directory does not exist</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="420"/>
+ <source>create directory and install BRouter there</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="427"/>
+ <source>existing BRouter installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="428"/>
+ <source>update existing BRouter installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="433"/>
+ <source>empty directory, create new BRouter installation here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="434"/>
+ <source>create new BRouter installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="442"/>
+ <source>seems to be a valid Java-executable</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="446"/>
+ <source>doesn't seem to be a valid Java-executable</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="451"/>
+ <source>Java Executable not found</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="496"/>
+ <source>Error loading installation-page at %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="505"/>
+ <source>no brouter-version to install selected</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="513"/>
+ <source>selected %1 for download and installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="524"/>
+ <source>Warning...</source>
+ <translation type="unfinished">Waarschuwing...</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="529"/>
+ <source>Download: %1<br/><br/>This will download and install a zip file from a download location that is not secured by any standard at all, using plain HTTP. Usually this should be HTTPS. The risk is someone redirecting the request and sending you a replacement zip with malware. There is no way for QMapShack to detect this. <br/>If you do not understand this or if you are in doubt, do not proceed and abort. Use the Web version of BRouter instead.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="541"/>
+ <source>I understand the risk and wish to proceed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="553"/>
+ <source>download %1 started</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="565"/>
+ <source>Network Error: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="586"/>
+ <source>download %1 finished</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="588"/>
+ <source>unzipping:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="593"/>
+ <source>ready.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="613"/>
+ <source>download of brouter failed: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="623"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="630"/>
+ <source>retrieving available profiles from %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="654"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="736"/>
+ <source>content of profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="729"/>
+ <source>Error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="466"/>
+ <source>Error creating directory %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="571"/>
+ <source>Error directory %1 does not exist</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="578"/>
+ <source>Error creating file %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="582"/>
+ <source>Error writing to file %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterTilesPage</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesPage.cpp" line="82"/>
+ <source>Continue with Setup</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterTilesSelect</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="98"/>
+ <source>available routing-data is being determined.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="108"/>
+ <source>Select outdated</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="109"/>
+ <source>Clear Selection</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="110"/>
+ <source>Delete selection</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="111"/>
+ <source>Download</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="281"/>
+ <source>Error creating segments directory %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="365"/>
+ <source>cannot parse: %1 is not a date</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="390"/>
+ <source>cannot parse: %1 is not a valid size</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="409"/>
+ <source>Error retrieving available routing data from %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="490"/>
+ <source>segments directory does not exist: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="504"/>
+ <source>error creating file %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="536"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="576"/>
+ <source>no valid request for filename %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="541"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="584"/>
+ <source>no open file assigned to request for %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="551"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="594"/>
+ <source>error writing to file %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="602"/>
+ <source>error renaming file %1 to %2: %3</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="685"/>
+ <source>up-to-date: %1 (%2), outdated: %3 (%4), to be downloaded: %5 (%6)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="783"/>
+ <source>being downloaded: %1 of %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="803"/>
+ <source>no local data, online available: %1 (%2)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="789"/>
+ <source>local data outdated (%1, %2 - remote %3, %4)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="190"/>
+ <source>Error removing %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="321"/>
+ <source>Network Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="330"/>
+ <source>invalid result, no files found</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="797"/>
+ <source>local data up to date (%1, %2)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="809"/>
+ <source>no routing-data available</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterToolShell</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="74"/>
+ <source>!!! done !!!
+</source>
+ <translation type="unfinished">!!! klaar !!!
+</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="79"/>
+ <source>!!! failed !!!
+</source>
+ <translation type="unfinished">!!! Mislukt !!!
+</translation>
+ </message>
+</context>
+<context>
<name>CRouterMapQuest</name>
<message>
<location filename="../gis/rte/router/CRouterMapQuest.cpp" line="37"/>
@@ -3464,7 +3963,6 @@ is geen geldig coordinaat definitie:
<name>CRouterRoutino</name>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="55"/>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="238"/>
<source>Warning...</source>
<translation>Waarschuwing...</translation>
</message>
@@ -3669,18 +4167,13 @@ is geen geldig coordinaat definitie:
<translation>, modus "%1"</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="238"/>
- <source>%1: Due to limitations in the Windows POSIX API Routino can't handle files larger than 4GB.</source>
- <translation>%1 Door beperkingen in de Windows POSIX API Routino kunnen geen bestanden groter dan 4GB gebruikt worden.</translation>
- </message>
- <message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="338"/>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="425"/>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="332"/>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="419"/>
<source>Calculate route with %1</source>
<translation>Bereken route met %1</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="346"/>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="340"/>
<source><br/>Calculation time: %1s</source>
<translation><br/>Berekenen tijd: %1s</translation>
</message>
@@ -3688,12 +4181,12 @@ is geen geldig coordinaat definitie:
<context>
<name>CRouterRoutinoPathSetup</name>
<message>
- <location filename="../gis/rte/router/CRouterRoutinoPathSetup.cpp" line="40"/>
+ <location filename="../gis/rte/router/routino/CRouterRoutinoPathSetup.cpp" line="40"/>
<source>Add or remove paths containing Routino data. There can be multiple databases in a path but no sub-path is parsed.</source>
<translation>Maak of verwijder mappen naar Routino gegevens.-Er kunnen meerdere bestanden in een map zijn maar geen submappen.</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutinoPathSetup.cpp" line="55"/>
+ <location filename="../gis/rte/router/routino/CRouterRoutinoPathSetup.cpp" line="55"/>
<source>Select routing data file path...</source>
<translation>Selecteer routing gegevensmap...</translation>
</message>
@@ -3701,35 +4194,40 @@ is geen geldig coordinaat definitie:
<context>
<name>CRouterSetup</name>
<message>
- <location filename="../gis/rte/router/CRouterSetup.cpp" line="36"/>
+ <location filename="../gis/rte/router/CRouterSetup.cpp" line="38"/>
<source>Routino (offline)</source>
<translation>Routino (offline)</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterSetup.cpp" line="37"/>
+ <location filename="../gis/rte/router/CRouterSetup.cpp" line="39"/>
<source>MapQuest (online)</source>
<translation>MapQuest (online)</translation>
</message>
+ <message>
+ <location filename="../gis/rte/router/CRouterSetup.cpp" line="40"/>
+ <source>BRouter (online)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CRoutinoDatabaseBuilder</name>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="32"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="33"/>
<source>Create Routino Database</source>
<translation>Maak Routino database</translation>
</message>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="56"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="57"/>
<source>Select files...</source>
<translation>Selecteer bestanden...</translation>
</message>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="80"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="81"/>
<source>Select target path...</source>
<translation>Selecteer doel map...</translation>
</message>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="141"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="142"/>
<source>!!! done !!!
</source>
<translation>!!! klaar !!!
@@ -3914,27 +4412,125 @@ lijn %2, kolom %3:
<translation>Pauze %1</translation>
</message>
<message>
- <location filename="../gis/slf/CSlfReader.cpp" line="185"/>
- <source>Lap %1</source>
- <translation>Ronde %1</translation>
+ <location filename="../gis/slf/CSlfReader.cpp" line="185"/>
+ <source>Lap %1</source>
+ <translation>Ronde %1</translation>
+ </message>
+</context>
+<context>
+ <name>CTableTrk</name>
+ <message>
+ <location filename="../gis/trk/CTableTrk.cpp" line="99"/>
+ <source>Double click to edit elevation value</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CTableTrk.cpp" line="125"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="133"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="136"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="141"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="155"/>
+ <location filename="../gis/trk/CTableTrk.cpp" line="157"/>
+ <source>%1 %2</source>
+ <translation type="unfinished">%1 %2</translation>
+ </message>
+</context>
+<context>
+ <name>CTcxProject</name>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="51"/>
+ <source>Failed to load file %1...</source>
+ <translation type="unfinished">Kan bestand %1 niet laden...</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="73"/>
+ <source>Failed to open %1</source>
+ <translation type="unfinished">Openen mislukt-%1</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="84"/>
+ <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+ <translation type="unfinished">Lezen mislukt: %1
+lijn %2, kolom %3:
+ %4</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="91"/>
+ <source>Not a TCX file: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="101"/>
+ <source>This TCX file contains at least 1 workout, but neither an activity nor a course. As workouts do not contain position data, they can not be imported to QMapShack.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="106"/>
+ <source>This TCX file does not contain any activity or course: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="275"/>
+ <source>File exists ...</source>
+ <translation type="unfinished">Bestand bestaat al...</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="276"/>
+ <source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file. Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="315"/>
+ <source>The track <b>%1</b> you have selected contains trackpoints with invalid timestamps. Device might not accept the generated TCX course file if left as is. <b>Do you want to apply a filter with constant speed (10 m/s) and continue?</b></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="339"/>
+ <source>Course</source>
+ <translation type="unfinished">Richting</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="340"/>
+ <source>Activity</source>
+ <translation type="unfinished">Activiteit</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="341"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="314"/>
+ <source>Track with invalid timestamps...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="334"/>
+ <source>Activity or course?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="335"/>
+ <source>QMapShack does not know how track <b>%1</b> should be saved. <b>Do you want to save it as a course or as an activity? </b>Remember that only waypoints close enough to the track will be saved when saving as a course. Waypoints will not be saved when saving as an activity.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="432"/>
+ <source>Failed to create file '%1'</source>
+ <translation type="unfinished">Maken bestand mislukt '%1'</translation>
</message>
-</context>
-<context>
- <name>CTableTrk</name>
<message>
- <location filename="../gis/trk/CTableTrk.cpp" line="99"/>
- <source>Double click to edit elevation value</source>
- <translation type="unfinished"></translation>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="453"/>
+ <source>Failed to write file '%1'</source>
+ <translation type="unfinished">Schrijven bestand mislukt '%1'</translation>
</message>
<message>
- <location filename="../gis/trk/CTableTrk.cpp" line="125"/>
- <location filename="../gis/trk/CTableTrk.cpp" line="133"/>
- <location filename="../gis/trk/CTableTrk.cpp" line="136"/>
- <location filename="../gis/trk/CTableTrk.cpp" line="141"/>
- <location filename="../gis/trk/CTableTrk.cpp" line="155"/>
- <location filename="../gis/trk/CTableTrk.cpp" line="157"/>
- <source>%1 %2</source>
- <translation type="unfinished">%1 %2</translation>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="435"/>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="454"/>
+ <source>Saving GIS data failed...</source>
+ <translation type="unfinished">Opslaan GIS gegevens mislukt...</translation>
</message>
</context>
<context>
@@ -4012,139 +4608,149 @@ lijn %2, kolom %3:
</message>
<message>
<location filename="../IAbout.ui" line="62"/>
- <location filename="../IAbout.ui" line="106"/>
- <location filename="../IAbout.ui" line="120"/>
- <location filename="../IAbout.ui" line="134"/>
- <location filename="../IAbout.ui" line="148"/>
+ <location filename="../IAbout.ui" line="113"/>
+ <location filename="../IAbout.ui" line="127"/>
+ <location filename="../IAbout.ui" line="141"/>
+ <location filename="../IAbout.ui" line="155"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="99"/>
+ <location filename="../IAbout.ui" line="106"/>
<source>Qt</source>
<translation>Qt</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="113"/>
+ <location filename="../IAbout.ui" line="120"/>
<source>GDAL</source>
<translation>GDAL</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="127"/>
+ <location filename="../IAbout.ui" line="134"/>
<source>Proj4</source>
<translation>Proj4</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="141"/>
+ <location filename="../IAbout.ui" line="148"/>
<source>Routino</source>
<translation>Routino</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="172"/>
+ <location filename="../IAbout.ui" line="179"/>
<source>Czech:</source>
<translation>Tsjechisch:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="195"/>
+ <location filename="../IAbout.ui" line="202"/>
<source>German:</source>
<translation>Duits:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="218"/>
+ <location filename="../IAbout.ui" line="212"/>
+ <source>Oliver Eichler</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../IAbout.ui" line="225"/>
<source>Dutch:</source>
<translation>Nederlands:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="241"/>
+ <location filename="../IAbout.ui" line="248"/>
<source>French:</source>
<translation>Frans:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="251"/>
+ <location filename="../IAbout.ui" line="258"/>
<source>Rainer Unseld </source>
<translation>Rainer Unseld</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="381"/>
- <source>Christian Eichler (qms at christian-eichler.de)
-Ivo Kronenberg</source>
- <translation>Christian Eichler (qms at christian-eichler.de)
-Ivo Kronenberg</translation>
+ <location filename="../IAbout.ui" line="295"/>
+ <source>Russian:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../IAbout.ui" line="302"/>
+ <source>Wolfgang Thämelt</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../IAbout.ui" line="428"/>
+ <source>© 2017 Oliver Eichler (oliver.eichler at gmx.de)</source>
+ <translation type="unfinished">© 2014 Oliver Eichler (oliver.eichler at gmx.de) {2016 ?} {2017 ?}</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="182"/>
+ <location filename="../IAbout.ui" line="189"/>
<source>Pavel Fric</source>
<translation>Pavel Fric</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="281"/>
+ <location filename="../IAbout.ui" line="288"/>
<source><b>Translation:</b></source>
<translation><b>Vertaling:</b></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="228"/>
+ <location filename="../IAbout.ui" line="235"/>
<source>Harrie Klomp</source>
<translation></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="271"/>
+ <location filename="../IAbout.ui" line="278"/>
<source>Spanish:</source>
<translation>Spaans:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="305"/>
+ <location filename="../IAbout.ui" line="326"/>
<source>Win64:</source>
<translation>Win64:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="321"/>
+ <location filename="../IAbout.ui" line="342"/>
<source>OS X:</source>
<translation>OS X:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="345"/>
+ <location filename="../IAbout.ui" line="366"/>
<source><b>Binaries:</b></source>
<translation><b>Binaries:</b></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="374"/>
+ <location filename="../IAbout.ui" line="395"/>
<source><b>Contributors:</b></source>
<translation><b>Medewerkers:</b></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="205"/>
- <source>Josef Latt</source>
- <translation>Josef Latt</translation>
- </message>
- <message>
- <location filename="../IAbout.ui" line="258"/>
+ <location filename="../IAbout.ui" line="265"/>
<source>Jose Luis Domingo Lopez</source>
<translation>Jose Luis Domingo Lopez</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="338"/>
+ <location filename="../IAbout.ui" line="359"/>
<source>Ivo Kronenberg</source>
<translation>Ivo Kronenberg</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="331"/>
+ <location filename="../IAbout.ui" line="352"/>
<source>Helmut Schmidt</source>
<translation>Helmut Schmidt</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="354"/>
+ <location filename="../IAbout.ui" line="375"/>
<source>...and thanks to all Linux binary maintainers for doing a great job. Special thanks to Dan Horák and Bas Couwenberg for showing presence on the mailing list to discuss distribution related topics.</source>
<translation>..en een dank naar alle Linux binarie beheerders voor het geleverde werk. Speciale dank aan Dan Horák en Bas Couwenberg voor het tonen van hun aanwezigheid op de mailinglijst om de distributie-gerelateerde onderwerpen te bespreken.</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="399"/>
- <source>This software is licensed under GPL3 or any later version</source>
- <translation>Deze software is gelicenseerd onder GPL3 of latere versies</translation>
+ <location filename="../IAbout.ui" line="402"/>
+ <source>Christian Eichler (qms at christian-eichler.de)
+Ivo Kronenberg
+Norbert Truchsess (norbert.truchsess at t-online.de)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="406"/>
- <source>© 2014 Oliver Eichler (oliver.eichler at gmx.de)</source>
- <translation>© 2014 Oliver Eichler (oliver.eichler at gmx.de)</translation>
+ <location filename="../IAbout.ui" line="421"/>
+ <source>This software is licensed under GPL3 or any later version</source>
+ <translation>Deze software is gelicenseerd onder GPL3 of latere versies</translation>
</message>
</context>
<context>
@@ -4196,13 +4802,23 @@ Ivo Kronenberg</translation>
<translation>Combineer tracks...</translation>
</message>
<message>
- <location filename="../gis/trk/ICombineTrk.ui" line="43"/>
- <location filename="../gis/trk/ICombineTrk.ui" line="70"/>
- <location filename="../gis/trk/ICombineTrk.ui" line="117"/>
- <location filename="../gis/trk/ICombineTrk.ui" line="144"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="24"/>
+ <source>Available Tracks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/ICombineTrk.ui" line="54"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="81"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="139"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="166"/>
<source>...</source>
<translation>...</translation>
</message>
+ <message>
+ <location filename="../gis/trk/ICombineTrk.ui" line="109"/>
+ <source>Combined Tracks</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ICoordFormatSetup</name>
@@ -4254,17 +4870,22 @@ Ivo Kronenberg</translation>
<translation>Verwijder eerste deel van track en bewaar tweede deel</translation>
</message>
<message>
- <location filename="../gis/trk/ICutTrk.ui" line="27"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="30"/>
<source>Keep both parts of the track</source>
<translation>Bewaar beide delen van track</translation>
</message>
<message>
- <location filename="../gis/trk/ICutTrk.ui" line="37"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="43"/>
<source>Keep first part of the track and delete second one</source>
<translation>Bewaar eerste deel van track en verwijder tweede deel</translation>
</message>
<message>
- <location filename="../gis/trk/ICutTrk.ui" line="60"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="55"/>
+ <source>Cut Mode:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/ICutTrk.ui" line="136"/>
<source>Check this to store the result into a new track.
If you keep both parts of the track you have to create new ones.
@@ -4277,7 +4898,7 @@ Voor het opslaan van beide delen dienen er nieuwe tracks gemaakt te worden.
Als er alleen een halve track bewaard moet worden kunnen de overige punten verwijderd worden, of controleer dit bij het maken van de nieuwe track.</translation>
</message>
<message>
- <location filename="../gis/trk/ICutTrk.ui" line="67"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="143"/>
<source>Create a new track</source>
<translation>Maak een nieuwe track</translation>
</message>
@@ -4589,8 +5210,8 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
</message>
<message>
<location filename="../gis/ovl/IDetailsOvlArea.ui" line="132"/>
- <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>
+ <source>The area was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../gis/ovl/IDetailsOvlArea.ui" line="148"/>
@@ -4702,16 +5323,16 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
<translation>Info</translation>
</message>
<message>
+ <location filename="../gis/rte/IDetailsRte.ui" line="154"/>
+ <source>The route was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../gis/rte/IDetailsRte.ui" line="205"/>
<source>-</source>
<translation>-</translation>
</message>
<message>
- <location filename="../gis/rte/IDetailsRte.ui" line="154"/>
- <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/rte/IDetailsRte.ui" line="170"/>
<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>
@@ -4779,11 +5400,6 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
<translation>...</translation>
</message>
<message>
- <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="316"/>
<source>-</source>
<translation>-</translation>
@@ -4883,6 +5499,11 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="265"/>
+ <source>The track was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+ <translation type="unfinished"></translation>
+ </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"/>
@@ -5016,8 +5637,8 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
</message>
<message>
<location filename="../gis/wpt/IDetailsWpt.ui" line="268"/>
- <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>
+ <source>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../gis/wpt/IDetailsWpt.ui" line="284"/>
@@ -5613,70 +6234,70 @@ It is either a new item or it has been deleted in the database by someone else.<
<context>
<name>IGisProject</name>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="109"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="155"/>
<source>Save project?</source>
<translation>Project opslaan?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="109"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="155"/>
<source><h3>%1</h3>The project was changed. Save before closing it?</source>
<translation><h3>%1</h3>Het project is veranderd. Voor het sluiten opslaan?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="283"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="329"/>
<source>%1: Correlate tracks and waypoints.</source>
<translation>%1: Correlatie van tracks en waypointen.</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="293"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="339"/>
<source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
<translation><h3>%1</h3>Duurde dit te lang? Moet de correlatie van tracks en waypointen in dit project in de toekomst overgeslagen worden?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="294"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="340"/>
<source>Canceled correlation...</source>
<translation>Correlatie geanuleerd...</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="339"/>
- <location filename="../gis/prj/IGisProject.cpp" line="392"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="385"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="442"/>
<source>Save "%1" to...</source>
<translation>Opslaan "%1" als...</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="477"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="527"/>
<source><br/>
Filename: %1</source>
<translation><br/>
Bestandsnaam: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="482"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="532"/>
<source>Waypoints: %1</source>
<translation>Waypoints: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="486"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="536"/>
<source>Tracks: %1</source>
<translation>Tracks: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="490"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="540"/>
<source>Routes: %1</source>
<translation>Routes: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="494"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="544"/>
<source>Areas: %1</source>
<translation>Gebieden: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="614"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="664"/>
<source>Are you sure you want to delete '%1' from project '%2'?</source>
<translation>Moet '%1' werkelijk verwijderd worden uit project '%2'?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="615"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="665"/>
<source>Delete...</source>
<translation>Verwijderen...</translation>
</message>
@@ -5689,28 +6310,28 @@ Bestandsnaam: %1</translation>
<translation>Formulier</translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="37"/>
+ <location filename="../gis/IGisWidget.ui" line="49"/>
<source>Opacity</source>
<translation type="unfinished">Transparantie</translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="44"/>
+ <location filename="../gis/IGisWidget.ui" line="56"/>
<source>Change the opacity of all GIS Items on the map.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="96"/>
- <location filename="../gis/IGisWidget.ui" line="126"/>
+ <location filename="../gis/IGisWidget.ui" line="108"/>
+ <location filename="../gis/IGisWidget.ui" line="138"/>
<source>Name</source>
<translation>Naam</translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="131"/>
+ <location filename="../gis/IGisWidget.ui" line="143"/>
<source>Age</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="165"/>
+ <location filename="../gis/IGisWidget.ui" line="177"/>
<source>To add a database do a right click on the database list above.</source>
<translation>Om nieuwe database te maken doe een rechterklik op database erboven.</translation>
</message>
@@ -5812,7 +6433,7 @@ Bestandsnaam: %1</translation>
<context>
<name>ILineOp</name>
<message>
- <location filename="../mouse/line/ILineOp.cpp" line="211"/>
+ <location filename="../mouse/line/ILineOp.cpp" line="212"/>
<source>Routing</source>
<translation type="unfinished"></translation>
</message>
@@ -5869,333 +6490,338 @@ Bestandsnaam: %1</translation>
<translation>Venster</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="109"/>
+ <location filename="../IMainWindow.ui" line="110"/>
<source>?</source>
<translation>?</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="116"/>
+ <location filename="../IMainWindow.ui" line="118"/>
<source>Project</source>
<translation>Project</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="127"/>
+ <location filename="../IMainWindow.ui" line="129"/>
<source>Tool</source>
<translation>Extra</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="152"/>
+ <location filename="../IMainWindow.ui" line="154"/>
<source>Maps</source>
<translation>Kaarten</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="195"/>
+ <location filename="../IMainWindow.ui" line="197"/>
<source>Dig. Elev. Model (DEM)</source>
<translation>Dig. Elev. Model (DEM)</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="234"/>
+ <location filename="../IMainWindow.ui" line="236"/>
<source>Data</source>
<translation>Gegevens</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="252"/>
+ <location filename="../IMainWindow.ui" line="254"/>
<source>Route</source>
<translation>Route</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="286"/>
- <location filename="../IMainWindow.ui" line="289"/>
+ <location filename="../IMainWindow.ui" line="288"/>
+ <location filename="../IMainWindow.ui" line="291"/>
<source>Add Map View</source>
<translation>Nieuw venster</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="292"/>
+ <location filename="../IMainWindow.ui" line="294"/>
<source>Ctrl+T</source>
<translation>Ctrl+T</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="307"/>
+ <location filename="../IMainWindow.ui" line="309"/>
<source>Show Scale</source>
<translation>Toon schaal</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="319"/>
+ <location filename="../IMainWindow.ui" line="321"/>
<source>Setup Map Font</source>
<translation>Lettertype kaart instellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="334"/>
+ <location filename="../IMainWindow.ui" line="336"/>
<source>Show Grid</source>
<translation>Toon raster</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="337"/>
+ <location filename="../IMainWindow.ui" line="339"/>
<source>Ctrl+G</source>
<translation>Ctrl+G</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="349"/>
+ <location filename="../IMainWindow.ui" line="351"/>
<source>Setup Grid</source>
<translation>Raster instellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="352"/>
+ <location filename="../IMainWindow.ui" line="354"/>
<source>Ctrl+Alt+G</source>
<translation>Ctrl+Alt+G</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="367"/>
+ <location filename="../IMainWindow.ui" line="369"/>
<source>Flip Mouse Wheel</source>
<translation>Draai muiswiel om</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="379"/>
- <location filename="../IMainWindow.ui" line="382"/>
+ <location filename="../IMainWindow.ui" line="381"/>
+ <location filename="../IMainWindow.ui" line="384"/>
<source>Setup Map Paths</source>
<translation>Map met kaarten instellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="397"/>
+ <location filename="../IMainWindow.ui" line="399"/>
<source>POI Text</source>
<translation>POI tekst</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="412"/>
+ <location filename="../IMainWindow.ui" line="414"/>
<source>Night / Day</source>
<translation>Dag/Nacht</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="427"/>
+ <location filename="../IMainWindow.ui" line="429"/>
<source>Map Tool Tip</source>
<translation>Map Tool Tip</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="430"/>
+ <location filename="../IMainWindow.ui" line="432"/>
<source>Ctrl+I</source>
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="442"/>
+ <location filename="../IMainWindow.ui" line="444"/>
<source>Setup DEM Paths</source>
<translation>Map DEM instellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="454"/>
+ <location filename="../IMainWindow.ui" line="456"/>
<source>About</source>
<translation>Over</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="466"/>
+ <location filename="../IMainWindow.ui" line="468"/>
<source>Help</source>
<translation>Help</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="469"/>
+ <location filename="../IMainWindow.ui" line="471"/>
<source>F1</source>
<translation>F1</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="481"/>
- <location filename="../IMainWindow.ui" line="484"/>
+ <location filename="../IMainWindow.ui" line="483"/>
+ <location filename="../IMainWindow.ui" line="486"/>
<source>Setup Map View</source>
<translation>Kaartinstellingen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="496"/>
+ <location filename="../IMainWindow.ui" line="498"/>
<source>Load GIS Data</source>
<translation>GIS gegevens laden</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="499"/>
+ <location filename="../IMainWindow.ui" line="501"/>
<source>Load projects from file</source>
<translation>Project laden uit bestand</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="502"/>
+ <location filename="../IMainWindow.ui" line="504"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="514"/>
+ <location filename="../IMainWindow.ui" line="516"/>
<source>Save All GIS Data</source>
<translation>GIS gegevens opslaan</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="517"/>
+ <location filename="../IMainWindow.ui" line="519"/>
<source>Save all projects in the workspace</source>
<translation>Sla alle projecten op in werkruimte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="520"/>
+ <location filename="../IMainWindow.ui" line="522"/>
<source>Ctrl+S</source>
<translation>Ctrl+S</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="532"/>
+ <location filename="../IMainWindow.ui" line="534"/>
<source>Setup Time Zone</source>
<translation>Tijdzone instellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="544"/>
+ <location filename="../IMainWindow.ui" line="546"/>
<source>Add empty project</source>
<translation>Nieuw leeg project</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="559"/>
+ <location filename="../IMainWindow.ui" line="561"/>
<source>Search Google</source>
<translation>Zoeken Google</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="571"/>
+ <location filename="../IMainWindow.ui" line="573"/>
<source>Close all projects</source>
<translation>Sluit alle projecten</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="574"/>
+ <location filename="../IMainWindow.ui" line="576"/>
<source>F8</source>
<translation>F8</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="586"/>
+ <location filename="../IMainWindow.ui" line="588"/>
<source>Setup Units</source>
<translation>Eenheden instellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="598"/>
+ <location filename="../IMainWindow.ui" line="600"/>
<source>Setup Workspace</source>
<translation>Werkruimte instellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="601"/>
+ <location filename="../IMainWindow.ui" line="603"/>
<source>Setup save on exit.</source>
<translation>Oplaan bij afsluiten instellen.</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="613"/>
+ <location filename="../IMainWindow.ui" line="615"/>
<source>Import Database from QLandkarte</source>
<translation>Database van QLandkarte importeren</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="616"/>
+ <location filename="../IMainWindow.ui" line="618"/>
<source>Import QLandkarte GT database</source>
<translation>QLandkarte database importeren</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="628"/>
+ <location filename="../IMainWindow.ui" line="630"/>
<source>VRT Builder</source>
<translation>VRT maken</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="631"/>
+ <location filename="../IMainWindow.ui" line="633"/>
<source>GUI front end to gdalbuildvrt</source>
<translation>GUI front end naar gdalbuildvrt</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="643"/>
+ <location filename="../IMainWindow.ui" line="645"/>
<source>Store Map View</source>
<translation>Kaart opslaan</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="646"/>
+ <location filename="../IMainWindow.ui" line="648"/>
<source>Write current active map and DEM list including the properties to a file</source>
<translation>Schrijf huidige actieve kaart en DEM lijst inclusief de eigenschappen naar een bestand</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="658"/>
+ <location filename="../IMainWindow.ui" line="660"/>
<source>Load Map View</source>
<translation>Kaart laden</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="661"/>
+ <location filename="../IMainWindow.ui" line="663"/>
<source>Restore view with active map and DEM list including the properties from a file</source>
<translation>Herstel huidige actieve kaart en DEM lijst inclusief de eigenschappen naar een bestand</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="676"/>
+ <location filename="../IMainWindow.ui" line="678"/>
<source>Ext. Profile</source>
<translation>Ext. profiel</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="679"/>
+ <location filename="../IMainWindow.ui" line="681"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="691"/>
+ <location filename="../IMainWindow.ui" line="693"/>
<source>Close</source>
<translation>Sluiten</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="694"/>
+ <location filename="../IMainWindow.ui" line="696"/>
<source>Ctrl+Q</source>
<translation>Ctrl+Q</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="706"/>
+ <location filename="../IMainWindow.ui" line="708"/>
<source>Clone Map View</source>
<translation>Kloon venster</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="709"/>
+ <location filename="../IMainWindow.ui" line="711"/>
<source>Ctrl+Shift+T</source>
<translation>Ctrl+Shift+T</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="721"/>
+ <location filename="../IMainWindow.ui" line="723"/>
<source>Create Routino Database</source>
<translation>Maak Routino database</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="733"/>
+ <location filename="../IMainWindow.ui" line="735"/>
<source>Save(Print) Map Screenshot</source>
<translation>Kaartdeel opslaan/afdrukken</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="736"/>
+ <location filename="../IMainWindow.ui" line="738"/>
<source>Print a selected area of the map</source>
<translation>Geselecteerde deel van kaart afdrukken</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="739"/>
+ <location filename="../IMainWindow.ui" line="741"/>
<source>Ctrl+P</source>
<translation>Ctrl+P</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="751"/>
+ <location filename="../IMainWindow.ui" line="753"/>
<source>Setup Coord. Format</source>
<translation>Coördinaat formaat instellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="754"/>
+ <location filename="../IMainWindow.ui" line="756"/>
<source>Change the format coordinates are displayed</source>
<translation>Getoonde coördinaat formaat aanpassen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="766"/>
+ <location filename="../IMainWindow.ui" line="768"/>
<source>Setup Map Background</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="778"/>
+ <location filename="../IMainWindow.ui" line="780"/>
<source>Setup Waypoint Icons</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="781"/>
+ <location filename="../IMainWindow.ui" line="783"/>
<source>Setup path to custom icons</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="790"/>
+ <location filename="../IMainWindow.ui" line="792"/>
<source>Close Tab</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="793"/>
+ <location filename="../IMainWindow.ui" line="795"/>
<source>Ctrl+W</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../IMainWindow.ui" line="804"/>
+ <source>Quickstart Help</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>IMapList</name>
@@ -6319,37 +6945,42 @@ Ik wil de documentatie niet lezen!</translation>
<translation><html><head/><body><p>Klik om huidige schaal als maximumschaal op kaart te tonen.</p></body></html></translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="137"/>
+ <location filename="../map/IMapPropSetup.ui" line="139"/>
<source>Areas</source>
<translation>Gebieden</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="144"/>
+ <location filename="../map/IMapPropSetup.ui" line="146"/>
<source>Lines</source>
<translation>Lijnen</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="151"/>
+ <location filename="../map/IMapPropSetup.ui" line="153"/>
<source>Points</source>
<translation>Punten</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="196"/>
+ <location filename="../map/IMapPropSetup.ui" line="170"/>
+ <source>Details</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../map/IMapPropSetup.ui" line="227"/>
<source>Cache Size (MB)</source>
<translation>Cache grootte (MB)</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="216"/>
+ <location filename="../map/IMapPropSetup.ui" line="247"/>
<source>Expiration (Days)</source>
<translation>Vervaltijd (dagen)</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="233"/>
+ <location filename="../map/IMapPropSetup.ui" line="264"/>
<source>-</source>
<translation>-</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="240"/>
+ <location filename="../map/IMapPropSetup.ui" line="271"/>
<source>Cache Path</source>
<translation>Cachemap</translation>
</message>
@@ -6493,18 +7124,23 @@ Ik wil de documentatie niet lezen!</translation>
<translation type="unfinished">Maak waypoint</translation>
</message>
<message>
- <location filename="../plot/IPlot.cpp" line="541"/>
+ <location filename="../plot/IPlot.cpp" line="99"/>
+ <source>Cut...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../plot/IPlot.cpp" line="542"/>
<source>Hold CTRL key for vertical zoom, only.
Hold ALT key for horizontal zoom, only.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../plot/IPlot.cpp" line="696"/>
+ <location filename="../plot/IPlot.cpp" line="697"/>
<source>No or bad data.</source>
<translation>Geen of ontbrekende gegevens.</translation>
</message>
<message>
- <location filename="../plot/IPlot.cpp" line="1296"/>
+ <location filename="../plot/IPlot.cpp" line="1298"/>
<source>Select output file</source>
<translation>Selecteer bestand</translation>
</message>
@@ -6674,6 +7310,262 @@ of
</message>
</context>
<context>
+ <name>IRouterBRouter</name>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished">Formulier</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="28"/>
+ <source>Profile</source>
+ <translation type="unfinished">Profiel</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="35"/>
+ <source>Alternative</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="64"/>
+ <source>display selected routing profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="67"/>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="128"/>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="142"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="87"/>
+ <source>on-the-fly routing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="111"/>
+ <source>BRouter: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="118"/>
+ <source>not running</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="125"/>
+ <source>start/stop BRouter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="139"/>
+ <source>show BRouter console</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="172"/>
+ <source>Setup</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="181"/>
+ <source>Caution! BRouter is listening on all ports for connections.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>IRouterBRouterInfo</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterInfo.ui" line="14"/>
+ <source>BRouter Profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterInfo.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>IRouterBRouterSetupWizard</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="23"/>
+ <source>BRouter Setup</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="48"/>
+ <source>choose which BRouter to use</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="54"/>
+ <source>BRouter-Web (online)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="61"/>
+ <source>local Installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="68"/>
+ <source>Expert Mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="91"/>
+ <source>local BRouter Installation directory:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="103"/>
+ <source>select installation directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="106"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="162"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="342"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="356"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="389"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="400"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="119"/>
+ <source>labelLocalDirResult</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="128"/>
+ <source>create or update installation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="152"/>
+ <source>Java Executable</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="175"/>
+ <source>labelLocalJavaResult</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="184"/>
+ <source>search for installed java</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="241"/>
+ <source>Download and install BRouter Version</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="255"/>
+ <source>about:blank</source>
+ <translation type="unfinished">Over:leeg</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="263"/>
+ <source>File to install</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="272"/>
+ <source>Download and Install</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="321"/>
+ <source>available Profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="339"/>
+ <source>install profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="353"/>
+ <source>remove profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="371"/>
+ <source>installed Profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="415"/>
+ <source>content of profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="451"/>
+ <source>BRouter-Web URL:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="501"/>
+ <source>Service-URL</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="511"/>
+ <source>Profile-URL</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="561"/>
+ <source>Hostname</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="571"/>
+ <source>Port</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="581"/>
+ <source>Profile directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="591"/>
+ <source>Segments directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="601"/>
+ <source>Custom Profiles dir</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="611"/>
+ <source>Max Runtime</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="621"/>
+ <source>Number Threads</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="631"/>
+ <source>Java Options</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="551"/>
+ <source>Profiles Url</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>IRouterMapQuest</name>
<message>
<location filename="../gis/rte/router/IRouterMapQuest.ui" line="14"/>
@@ -6777,18 +7669,18 @@ of
<context>
<name>IRouterRoutinoPathSetup</name>
<message>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="14"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="14"/>
<source>Setup Routino database...</source>
<translation>Routino database instellen...</translation>
</message>
<message>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="27"/>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="47"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="27"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="47"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="99"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="99"/>
<source>-</source>
<translation>-</translation>
</message>
@@ -7041,18 +7933,18 @@ of
<translation>Formulier</translation>
</message>
<message>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="20"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="32"/>
<source>Delete all points between the first and last one.</source>
<translation>Verwijder alle punten tussen eerste en laatste punt.</translation>
</message>
<message>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="23"/>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="37"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="35"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="49"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="34"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="46"/>
<source><html><head/><body><p>Calculate a route between the first and last selected point.</p></body></html></source>
<translation><html><head/><body><p>Bereken een route tussen het eerste en laatst geselecteerde punt..</p></body></html></translation>
</message>
@@ -7175,12 +8067,13 @@ of
<location filename="../mouse/IScrOptSelect.ui" line="82"/>
<location filename="../mouse/IScrOptSelect.ui" line="102"/>
<location filename="../mouse/IScrOptSelect.ui" line="122"/>
- <location filename="../mouse/IScrOptSelect.ui" line="176"/>
- <location filename="../mouse/IScrOptSelect.ui" line="205"/>
- <location filename="../mouse/IScrOptSelect.ui" line="265"/>
- <location filename="../mouse/IScrOptSelect.ui" line="292"/>
- <location filename="../mouse/IScrOptSelect.ui" line="319"/>
- <location filename="../mouse/IScrOptSelect.ui" line="346"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="142"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="196"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="225"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="285"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="312"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="339"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="366"/>
<source>...</source>
<translation type="unfinished">...</translation>
</message>
@@ -7191,41 +8084,46 @@ of
</message>
<message>
<location filename="../mouse/IScrOptSelect.ui" line="99"/>
- <source>Combine all selected tracks to a new one.</source>
+ <source>Change the icon of all selected waypoints.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mouse/IScrOptSelect.ui" line="119"/>
+ <source>Combine all selected tracks to a new one.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mouse/IScrOptSelect.ui" line="139"/>
<source>Delete all selected items.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="173"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="193"/>
<source>Select all items that intersect the selected area.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="202"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="222"/>
<source>Select all itmes that are completely inside the selected area.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="262"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="282"/>
<source>Add tracks to selection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="289"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="309"/>
<source>Add waypoints to selection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="316"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="336"/>
<source>Add routes to selection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="343"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="363"/>
<source>Add areas to selection.</source>
<translation type="unfinished"></translation>
</message>
@@ -8093,40 +8991,40 @@ of
<context>
<name>IToolShell</name>
<message>
- <location filename="../tool/IToolShell.cpp" line="45"/>
+ <location filename="../tool/IToolShell.cpp" line="46"/>
<source>Execution of external program `%1` failed: </source>
<translation>Starten van extern programma `%1` mislukt:</translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="49"/>
+ <location filename="../tool/IToolShell.cpp" line="50"/>
<source>Process cannot be started.
</source>
<translation>Het proces kan niet gestart worden.
</translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="50"/>
+ <location filename="../tool/IToolShell.cpp" line="51"/>
<source>Make sure the required packages are installed, `%1` exists and is executable.
</source>
<translation>De benodigde pakketten dienen geïnstalleerd te zijn, `%1` bestaat en is uitvoerbaar.
</translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="54"/>
+ <location filename="../tool/IToolShell.cpp" line="55"/>
<source>External process crashed.
</source>
<translation>Extern proces is vast gelopen.
</translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="58"/>
+ <location filename="../tool/IToolShell.cpp" line="59"/>
<source>An unknown error occurred.
</source>
<translation>Een onbekende fout is opgetreden.
</translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="149"/>
+ <location filename="../tool/IToolShell.cpp" line="172"/>
<source>!!! failed !!!
</source>
<translation>!!! Mislukt !!!
diff --git a/src/locale/qmapshack_ru.desktop b/src/locale/qmapshack_ru.desktop
new file mode 100644
index 0000000..7f15e0b
--- /dev/null
+++ b/src/locale/qmapshack_ru.desktop
@@ -0,0 +1,3 @@
+#Translations
+Name[de]=QMapShack
+GenericName[de]= Администрация GPS данных и карт
\ No newline at end of file
diff --git a/src/locale/qmapshack_cs.ts b/src/locale/qmapshack_ru.ts
similarity index 56%
copy from src/locale/qmapshack_cs.ts
copy to src/locale/qmapshack_ru.ts
index 43ba41e..5cf6208 100644
--- a/src/locale/qmapshack_cs.ts
+++ b/src/locale/qmapshack_ru.ts
@@ -1,17 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.1" language="cs_CZ">
+<TS version="2.1" language="ru_RU">
<context>
<name>CAbout</name>
<message>
<location filename="../CAbout.cpp" line="38"/>
<source>%1 (API V%2, expected V%3)</source>
- <translation>%1 (API verze %2, očekávána verze %3)</translation>
+ <translation>%1 (API версия %2, ожидаемая версия: %3)</translation>
</message>
<message>
<location filename="../CAbout.cpp" line="42"/>
<source>%1 (API V%2)</source>
- <translation>%1 (API verze %2)</translation>
+ <translation>%1 (API версия %2)</translation>
+ </message>
+ <message>
+ <location filename="../CAbout.cpp" line="49"/>
+ <source>(no DBUS: device detection and handling disabled)</source>
+ <translation>(Нет DBUS: обнаружение и управление устройств отключено)</translation>
</message>
</context>
<context>
@@ -19,107 +24,107 @@
<message>
<location filename="../gis/trk/CActivityTrk.cpp" line="39"/>
<source>Foot</source>
- <translation>Chodec</translation>
+ <translation>Пешком</translation>
</message>
<message>
<location filename="../gis/trk/CActivityTrk.cpp" line="47"/>
<source>Bicycle</source>
- <translation>Jízdní kolo</translation>
+ <translation>Велосипед</translation>
</message>
<message>
<location filename="../gis/trk/CActivityTrk.cpp" line="55"/>
<source>Motor Bike</source>
- <translation>Motocykl</translation>
+ <translation>Мотоцикл</translation>
</message>
<message>
<location filename="../gis/trk/CActivityTrk.cpp" line="63"/>
<source>Car</source>
- <translation>Auto</translation>
+ <translation>Автомобиль</translation>
</message>
<message>
<location filename="../gis/trk/CActivityTrk.cpp" line="71"/>
<source>Cable Car</source>
- <translation>Lanovka</translation>
+ <translation>Фуникулер</translation>
</message>
<message>
<location filename="../gis/trk/CActivityTrk.cpp" line="79"/>
<source>Swim</source>
- <translation>Plavání</translation>
+ <translation>Плавание</translation>
</message>
<message>
<location filename="../gis/trk/CActivityTrk.cpp" line="87"/>
<source>Ship</source>
- <translation>Loď</translation>
+ <translation>Корабль</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="103"/>
+ <source>Ski/Winter</source>
+ <translation>Лыжи/зима</translation>
</message>
<message>
<location filename="../gis/trk/CActivityTrk.cpp" line="267"/>
<location filename="../gis/trk/CActivityTrk.cpp" line="318"/>
<source>Ascent:</source>
- <translation type="unfinished"></translation>
+ <translation>Подъем:</translation>
</message>
<message>
<location filename="../gis/trk/CActivityTrk.cpp" line="269"/>
<location filename="../gis/trk/CActivityTrk.cpp" line="329"/>
<source>Descent:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="103"/>
- <source>Ski/Winter</source>
- <translation>Lyže/Zima</translation>
+ <translation>Спуск:</translation>
</message>
<message>
<location filename="../gis/trk/CActivityTrk.cpp" line="95"/>
<source>Aeronautics</source>
- <translation>Letectví</translation>
+ <translation>Аэронавтика</translation>
</message>
<message>
<location filename="../gis/trk/CActivityTrk.cpp" line="265"/>
<location filename="../gis/trk/CActivityTrk.cpp" line="307"/>
<source>Distance:</source>
- <translation>Vzdálenost:</translation>
+ <translation>Расстояние:</translation>
</message>
<message>
<location filename="../gis/trk/CActivityTrk.cpp" line="271"/>
<location filename="../gis/trk/CActivityTrk.cpp" line="340"/>
<source>Speed Moving:</source>
- <translation>Rychlost při pohybu:</translation>
+ <translation>Скорость движения:</translation>
</message>
<message>
<location filename="../gis/trk/CActivityTrk.cpp" line="273"/>
<location filename="../gis/trk/CActivityTrk.cpp" line="351"/>
<source>Speed Total:</source>
- <translation>Celková rychlost:</translation>
+ <translation>Общая скорость:</translation>
</message>
<message>
<location filename="../gis/trk/CActivityTrk.cpp" line="275"/>
<location filename="../gis/trk/CActivityTrk.cpp" line="362"/>
<source>Time Moving:</source>
- <translation>Čas při pohybu:</translation>
+ <translation>Время движения:</translation>
</message>
<message>
<location filename="../gis/trk/CActivityTrk.cpp" line="277"/>
<location filename="../gis/trk/CActivityTrk.cpp" line="373"/>
<source>Time Total:</source>
- <translation>Celkový čas:</translation>
+ <translation>Общее время:</translation>
</message>
<message>
<location filename="../gis/trk/CActivityTrk.cpp" line="414"/>
<source>None</source>
- <translation>Žádné</translation>
+ <translation>Никакое</translation>
</message>
</context>
<context>
<name>CCanvas</name>
<message>
- <location filename="../canvas/CCanvas.cpp" line="60"/>
+ <location filename="../canvas/CCanvas.cpp" line="61"/>
<source>View %1</source>
- <translation>Pohled %1</translation>
+ <translation>Вид %1</translation>
</message>
<message>
- <location filename="../canvas/CCanvas.cpp" line="685"/>
+ <location filename="../canvas/CCanvas.cpp" line="693"/>
<source>Setup Map Background</source>
- <translation>Nastavit pozadí mapy</translation>
+ <translation>Настройка фона карт</translation>
</message>
</context>
<context>
@@ -127,7 +132,7 @@
<message>
<location filename="../widgets/CColorChooser.cpp" line="51"/>
<source>Esc.</source>
- <translation>Esc</translation>
+ <translation>Esc.</translation>
</message>
</context>
<context>
@@ -135,32 +140,32 @@
<message>
<location filename="../setup/CCommandProcessor.cpp" line="31"/>
<source>Print debug output to console.</source>
- <translation>Zobrazit výstup ladění v konzoli.</translation>
+ <translation>Печатать отладочный вывод на консолью.</translation>
</message>
<message>
<location filename="../setup/CCommandProcessor.cpp" line="34"/>
<source>Print debug output to logfile (temp. path).</source>
- <translation>Uložit výstup ladění do souboru se zápisem (cesta temp).</translation>
+ <translation>Печатать отладочную информацию в файл журнала (путь Temp).</translation>
</message>
<message>
<location filename="../setup/CCommandProcessor.cpp" line="37"/>
<source>Do not show splash screen.</source>
- <translation>Neukazovat uvítací obrazovku.</translation>
+ <translation>Не показывать экран-заставку.</translation>
</message>
<message>
<location filename="../setup/CCommandProcessor.cpp" line="40"/>
<source>File with QMapShack configuration.</source>
- <translation>Soubor s nastavením pro QMapShack.</translation>
+ <translation>Файл с конфигурацией QMapShack.</translation>
</message>
<message>
<location filename="../setup/CCommandProcessor.cpp" line="40"/>
<source>file</source>
- <translation>Soubor</translation>
+ <translation>файл</translation>
</message>
<message>
<location filename="../setup/CCommandProcessor.cpp" line="43"/>
<source>Files for future use.</source>
- <translation>Soubory pro pozdější potřebu.</translation>
+ <translation>Файлы для будущего использования.</translation>
</message>
</context>
<context>
@@ -168,7 +173,7 @@
<message>
<location filename="../gis/rte/CCreateRouteFromWpt.cpp" line="68"/>
<source>route</source>
- <translation>Cesta</translation>
+ <translation>маршрут</translation>
</message>
</context>
<context>
@@ -176,17 +181,17 @@
<message>
<location filename="../gis/db/CDBFolderLostFound.cpp" line="30"/>
<source>All your data grouped by folders.</source>
- <translation>Všechna data seskupená podle složek.</translation>
+ <translation>Все ваши данные сгруппированы по папкам.</translation>
</message>
<message>
<location filename="../gis/db/CDBFolderLostFound.cpp" line="59"/>
<source>Lost & Found (%1)</source>
- <translation>Ztraceno a nalezeno (%1)</translation>
+ <translation>Потеряно и найдено (%1)</translation>
</message>
<message>
<location filename="../gis/db/CDBFolderLostFound.cpp" line="64"/>
<source>Lost & Found</source>
- <translation>Ztraceno a nalezeno</translation>
+ <translation>Потеряно и найдено</translation>
</message>
</context>
<context>
@@ -194,28 +199,28 @@
<message>
<location filename="../gis/db/CDBFolderMysql.cpp" line="33"/>
<source>All your data grouped by folders.</source>
- <translation>Všechna data seskupená podle složek.</translation>
+ <translation>Все ваши данные сгруппированы по папкам.</translation>
</message>
<message>
<location filename="../gis/db/CDBFolderMysql.cpp" line="53"/>
<source>MySQL Database</source>
- <translation>Databáze MySQL</translation>
+ <translation>База данных MySQL</translation>
</message>
<message>
<location filename="../gis/db/CDBFolderMysql.cpp" line="56"/>
<location filename="../gis/db/CDBFolderMysql.cpp" line="60"/>
<source>Server: </source>
- <translation>Server: </translation>
+ <translation>Сервер: </translation>
</message>
<message>
<location filename="../gis/db/CDBFolderMysql.cpp" line="65"/>
<source> (No PW)</source>
- <translation> (žádné heslo)</translation>
+ <translation> (Нет пароля)</translation>
</message>
<message>
<location filename="../gis/db/CDBFolderMysql.cpp" line="73"/>
<source>Error: </source>
- <translation>Chyba: </translation>
+ <translation>Ошибка: </translation>
</message>
</context>
<context>
@@ -223,22 +228,22 @@
<message>
<location filename="../gis/db/CDBFolderSqlite.cpp" line="30"/>
<source>All your data grouped by folders.</source>
- <translation>Všechna data seskupená podle složek.</translation>
+ <translation>Все ваши данные сгруппированы по папкам.</translation>
</message>
<message>
<location filename="../gis/db/CDBFolderSqlite.cpp" line="52"/>
<source>SQLite Database</source>
- <translation>Databáze SQLite</translation>
+ <translation>База данных SQLite</translation>
</message>
<message>
<location filename="../gis/db/CDBFolderSqlite.cpp" line="62"/>
<source>File: </source>
- <translation>Soubor: </translation>
+ <translation>Файл: </translation>
</message>
<message>
<location filename="../gis/db/CDBFolderSqlite.cpp" line="66"/>
<source>Error: </source>
- <translation>Chyba: </translation>
+ <translation>Ошибка: </translation>
</message>
</context>
<context>
@@ -246,88 +251,108 @@
<message>
<location filename="../gis/db/CDBItem.cpp" line="91"/>
<source>%1 min.</source>
- <translation>%1 m</translation>
+ <translation>%1 мин.</translation>
</message>
<message>
<location filename="../gis/db/CDBItem.cpp" line="95"/>
<source>%1 h</source>
- <translation>%1 h</translation>
+ <translation>%1 ч.</translation>
</message>
<message>
<location filename="../gis/db/CDBItem.cpp" line="99"/>
<source>%1 days</source>
- <translation>%1 dnů</translation>
+ <translation>%1 дней</translation>
</message>
</context>
<context>
<name>CDBProject</name>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="223"/>
+ <location filename="../gis/db/CDBProject.cpp" line="112"/>
+ <source>Failed to load...</source>
+ <translation>Не удалось загрузить...</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="113"/>
+ <source>Can't load file "%1" . It will be skipped.</source>
+ <translation>Загрузить файл %1 не удалось. Он будет пропущен.</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="126"/>
+ <source>Project already in database...</source>
+ <translation>Проект уже в базе данных...</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="127"/>
+ <source>The project "%1" has already been imported into the database. It will be skipped.</source>
+ <translation>Проект "%1" уже был загружен в базу данных. Он будет пропущен.</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/CDBProject.cpp" line="278"/>
<source>The item %1 has been changed by %2 (%3).
To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
- <translation>Prvek %1 byl změněn pomocí %2 (%3).
+ <translation>Элемент %1 изменен пользователем %2 (%3).
-K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji verzi, nebo ji zahodit a vzít jednu z databáze</translation>
+Для решения этого конфликта можно создать и сохранить клон, заставить вашу версию или бросить вашу версию и взять версию базы данных</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="229"/>
+ <location filename="../gis/db/CDBProject.cpp" line="284"/>
<source>Conflict with database...</source>
- <translation>Střet s databází...</translation>
+ <translation>Конфликт с базой данных...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="230"/>
+ <location filename="../gis/db/CDBProject.cpp" line="285"/>
<source>Clone && Save</source>
- <translation>Klonovat a uložit</translation>
+ <translation>Клонировать и сохранить</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="231"/>
+ <location filename="../gis/db/CDBProject.cpp" line="286"/>
<source>Force Save</source>
- <translation>Vynutit uložení</translation>
+ <translation>Сохранить принудительно</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="232"/>
+ <location filename="../gis/db/CDBProject.cpp" line="287"/>
<source>Take remote</source>
- <translation>Vzít vzdálenou verzi</translation>
+ <translation>Взять удаленную версию</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="514"/>
+ <location filename="../gis/db/CDBProject.cpp" line="569"/>
<source>Missing folder...</source>
- <translation>Chybí složka...</translation>
+ <translation>Отсутствует папка...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="515"/>
+ <location filename="../gis/db/CDBProject.cpp" line="570"/>
<source>Failed to save project. The folder has been deleted in the database.</source>
- <translation>Nepodařilo se uložit projekt. Složka byla v databázi smazána.</translation>
+ <translation>Не удалось сохранить проект. Папка удалена с базы данных.</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="522"/>
+ <location filename="../gis/db/CDBProject.cpp" line="577"/>
<source>Save ...</source>
- <translation>Uložit...</translation>
+ <translation>Сохранить ...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="585"/>
+ <location filename="../gis/db/CDBProject.cpp" line="640"/>
<source>Error</source>
- <translation>Chyba</translation>
+ <translation>Ошибка</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="585"/>
+ <location filename="../gis/db/CDBProject.cpp" line="640"/>
<source>There was an unexpected database error:
%1</source>
- <translation>Vyskytla se neočekávaná chyba databáze:
+ <translation>Неожиданная ошибка в базе данных:
%1</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="700"/>
+ <location filename="../gis/db/CDBProject.cpp" line="755"/>
<source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
- <translation>Projekt '%1' se právě bude aktualizovat z databáze. Jsou tu ovšem neuložené změny.</translation>
+ <translation>Проект '%1' собирается обновить себя с базы данных. Однако имеются несохранённые изменения.</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="701"/>
+ <location filename="../gis/db/CDBProject.cpp" line="756"/>
<source>Save changes?</source>
- <translation>Uložit změny?</translation>
+ <translation>Сохранить изменения?</translation>
</message>
</context>
<context>
@@ -335,12 +360,12 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<message>
<location filename="../dem/CDemList.cpp" line="195"/>
<source>Deactivate</source>
- <translation>Vypnout</translation>
+ <translation>Деактивировать</translation>
</message>
<message>
<location filename="../dem/CDemList.cpp" line="195"/>
<source>Activate</source>
- <translation>Zapnout</translation>
+ <translation>Активировать</translation>
</message>
</context>
<context>
@@ -348,12 +373,12 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<message>
<location filename="../dem/CDemPathSetup.cpp" line="41"/>
<source>Add or remove paths containing DEM data. There can be multiple files in a path but no sub-path is parsed. Supported formats are: %1</source>
- <translation>Přidat nebo odstranit cesty obsahující data s výškovým modelem (DEM). V cestě může být více souborů, ale žádná podcesta není zpracována. Podporovanými formáty jsou: %1</translation>
+ <translation>Добавить или удалить путь к данным ЦМР. Несколько файлов может быть в пути, но вложенные пути не проанализированы. Поддерживаемые форматы: %1</translation>
</message>
<message>
<location filename="../dem/CDemPathSetup.cpp" line="56"/>
<source>Select DEM file path...</source>
- <translation>Vybrat cestu k souboru s výškovým modelem...</translation>
+ <translation>Выбрать путь к файлам ЦМР...</translation>
</message>
</context>
<context>
@@ -364,23 +389,23 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<location filename="../dem/CDemVRT.cpp" line="61"/>
<location filename="../dem/CDemVRT.cpp" line="90"/>
<source>Error...</source>
- <translation>Chyba...</translation>
+ <translation>Ошибка...</translation>
</message>
<message>
<location filename="../dem/CDemVRT.cpp" line="44"/>
<source>Failed to load file: %1</source>
- <translation>Nepodařilo se nahrát soubor %1</translation>
+ <translation>Не удалось загрузить файл: %1</translation>
</message>
<message>
<location filename="../dem/CDemVRT.cpp" line="52"/>
<location filename="../dem/CDemVRT.cpp" line="61"/>
<source>DEM must have one band with 16bit or 32bit data.</source>
- <translation>Výškový model (DEM) musí mít jedno pásmo s 16bitovými nebo 32bitovými daty.</translation>
+ <translation>ЦМР должен иметь одну полосу с 16бит или 32бит данными.</translation>
</message>
<message>
<location filename="../dem/CDemVRT.cpp" line="90"/>
<source>No georeference information found.</source>
- <translation>Nenalezeny žádné údaje o vyjádření prostorových vztahů.</translation>
+ <translation>Отсутствует геопозиционная информация.</translation>
</message>
</context>
<context>
@@ -388,42 +413,57 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<message>
<location filename="../gis/wpt/CDetailsGeoCache.cpp" line="61"/>
<source>none</source>
- <translation>žádné</translation>
+ <translation>Нет</translation>
</message>
<message>
<location filename="../gis/wpt/CDetailsGeoCache.cpp" line="61"/>
<location filename="../gis/wpt/CDetailsGeoCache.cpp" line="131"/>
<source>???</source>
- <translation>?</translation>
+ <translation>???</translation>
</message>
<message>
<location filename="../gis/wpt/CDetailsGeoCache.cpp" line="158"/>
<source>Searching for images...</source>
- <translation>Hledají se obrázky...</translation>
+ <translation>Поиск изображений...</translation>
</message>
<message>
<location filename="../gis/wpt/CDetailsGeoCache.cpp" line="264"/>
<source>No images found</source>
- <translation>Nebyly nalezeny žádné obrázky</translation>
+ <translation>Изображения не найдены</translation>
</message>
</context>
<context>
<name>CDetailsPrj</name>
<message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="127"/>
+ <source>You want to sort waypoints along a track, but you switched off track and waypoint correlation. Do you want to switch it on again?</source>
+ <translation>Вы желаете отсортировать маршрутные точки вдоль трека, но отключили корреляцию между треком и точками. Желаете включить её снова?</translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="128"/>
+ <source>Correlation...</source>
+ <translation>Корреляция...</translation>
+ </message>
+ <message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="267"/>
<location filename="../gis/prj/CDetailsPrj.cpp" line="774"/>
<source>none</source>
- <translation>žádné</translation>
+ <translation>нет</translation>
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="340"/>
<source>Build diary...</source>
- <translation>Sestavit deník...</translation>
+ <translation>Построить дневник...</translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="395"/>
+ <source><b>Summary over all tracks in project</b><br/></source>
+ <translation><b>Резюме всех треков в проекте</b><br/></translation>
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="437"/>
<source><h2>Waypoints</h2></source>
- <translation><h2>Cestovní body</h2></translation>
+ <translation><h2>Маршрутные точки</h2></translation>
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="444"/>
@@ -432,7 +472,7 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<location filename="../gis/prj/CDetailsPrj.cpp" line="709"/>
<location filename="../gis/prj/CDetailsPrj.cpp" line="739"/>
<source>Info</source>
- <translation>Informace</translation>
+ <translation>Информация</translation>
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="445"/>
@@ -441,94 +481,79 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<location filename="../gis/prj/CDetailsPrj.cpp" line="710"/>
<location filename="../gis/prj/CDetailsPrj.cpp" line="740"/>
<source>Comment</source>
- <translation>Poznámka</translation>
+ <translation>Комментарий</translation>
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="463"/>
<source><h2>Tracks</h2></source>
- <translation><h2>Stopy</h2></translation>
+ <translation><h2>Треки</h2></translation>
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
<source>From Start</source>
- <translation>Od začátku</translation>
+ <translation>С начала</translation>
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
<source>To Next</source>
- <translation>K další</translation>
+ <translation>До следующего</translation>
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
<source>To End</source>
- <translation>Na konec</translation>
+ <translation>До конца</translation>
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="613"/>
<source>distance: </source>
- <translation>Vzdálenost: </translation>
+ <translation>Расстояние: </translation>
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="623"/>
<source>ascent: </source>
- <translation>Stoupání: </translation>
+ <translation>Подъем: </translation>
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="633"/>
<source>descent: </source>
- <translation type="unfinished"></translation>
+ <translation>Спуск: </translation>
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="702"/>
<source><h2>Areas</h2></source>
- <translation><h2>Oblasti</h2></translation>
- </message>
- <message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="127"/>
- <source>You want to sort waypoints along a track, but you switched off track and waypoint correlation. Do you want to switch it on again?</source>
- <translation>Chcete třídit cestovní body podél cesty, ale vypnul jste svázání cestovních bodů a cest (dání do vzájemného vztahu). Chcete je opět zapnout?</translation>
- </message>
- <message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="128"/>
- <source>Correlation...</source>
- <translation>Svázání...</translation>
- </message>
- <message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="395"/>
- <source><b>Summary over all tracks in project</b><br/></source>
- <translation><b>Přehled všech stop v projektu</b><br/></translation>
+ <translation><h2>Области</h2></translation>
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="732"/>
<source><h2>Routes</h2></source>
- <translation><h2>Cesty</h2></translation>
+ <translation><h2>Маршруты</h2></translation>
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="760"/>
<location filename="../gis/prj/CDetailsPrj.cpp" line="787"/>
<source>Edit name...</source>
- <translation>Upravit název...</translation>
+ <translation>Изменить имя...</translation>
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="760"/>
<location filename="../gis/prj/CDetailsPrj.cpp" line="787"/>
<source>Enter new project name.</source>
- <translation>Zadejte nový název projektu.</translation>
+ <translation>Ввести новое имя проекта.</translation>
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
<source>Edit keywords...</source>
- <translation>Upravit klíčová slova...</translation>
+ <translation>Изменить ключевые слова...</translation>
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
<source>Enter keywords.</source>
- <translation>Zadejte klíčová slova.</translation>
+ <translation>Ввести ключевые слова.</translation>
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="915"/>
<source>Print Diary</source>
- <translation>Tisk deníku</translation>
+ <translation>Печатать дневник</translation>
</message>
</context>
<context>
@@ -536,42 +561,42 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<message>
<location filename="../gis/trk/CDetailsTrk.cpp" line="168"/>
<source>Reduce visible track points</source>
- <translation>Omezit počet viditelných bodů stopy</translation>
+ <translation>Уменьшить число видимых точек трека</translation>
</message>
<message>
<location filename="../gis/trk/CDetailsTrk.cpp" line="171"/>
<source>Change elevation of track points</source>
- <translation>Změnit informace o výškách bodů stopy</translation>
+ <translation>Изменить высоту точек трека</translation>
</message>
<message>
<location filename="../gis/trk/CDetailsTrk.cpp" line="174"/>
<source>Change timestamp of track points</source>
- <translation>Změnit časová razítka bodů stopy</translation>
+ <translation>Изменить метки времени точек трека</translation>
</message>
<message>
<location filename="../gis/trk/CDetailsTrk.cpp" line="177"/>
<source>Miscellaneous</source>
- <translation type="unfinished"></translation>
+ <translation>Разное</translation>
</message>
<message>
<location filename="../gis/trk/CDetailsTrk.cpp" line="402"/>
<source>Color</source>
- <translation>Barva</translation>
+ <translation>Цвет</translation>
</message>
<message>
<location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
<source>Activity</source>
- <translation>Činnost</translation>
+ <translation>Мероприятие</translation>
</message>
<message>
<location filename="../gis/trk/CDetailsTrk.cpp" line="633"/>
<source>Reset activities...</source>
- <translation>Nastavit činnosti znovu...</translation>
+ <translation>Сбросить мероприятия...</translation>
</message>
<message>
<location filename="../gis/trk/CDetailsTrk.cpp" line="633"/>
<source>This will remove all activities from the track. Proceed?</source>
- <translation>Tímto budou všechny činnosti odstraněny ze stopy. Pokračovat?</translation>
+ <translation>Это удалит все мероприятия с трека. Продолжить?</translation>
</message>
</context>
<context>
@@ -579,7 +604,7 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<message>
<location filename="../gis/wpt/CDetailsWpt.cpp" line="166"/>
<source>Enter new proximity range.</source>
- <translation>Zadat nový poplach kvůli odstupu.</translation>
+ <translation>Ввести новый диапазон приближения.</translation>
</message>
</context>
<context>
@@ -587,12 +612,12 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<message>
<location filename="../device/CDeviceGarmin.cpp" line="265"/>
<source>Picture%1</source>
- <translation>Obrázek %1</translation>
+ <translation>Изображение %1</translation>
</message>
<message>
<location filename="../gis/gpx/serialization.cpp" line="1063"/>
<source>Unknown</source>
- <translation>Neznámý</translation>
+ <translation>Неизвестно</translation>
</message>
</context>
<context>
@@ -600,12 +625,12 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<message>
<location filename="../device/CDeviceGarminArchive.cpp" line="30"/>
<source>Archive - expand to load</source>
- <translation>Archiv - Rozbalit k nahrání</translation>
+ <translation>Архив - развернуть чтобы загрузить</translation>
</message>
<message>
<location filename="../device/CDeviceGarminArchive.cpp" line="43"/>
<source>Archive - loaded</source>
- <translation>Archiv - Nahráno</translation>
+ <translation>Архив - загружен</translation>
</message>
</context>
<context>
@@ -613,7 +638,7 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<message>
<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>
+ <translation>Данные ЦМР для этой точки не найдены.</translation>
</message>
</context>
<context>
@@ -621,7 +646,7 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<message>
<location filename="../gis/db/CExportDatabase.cpp" line="90"/>
<source>Select export path...</source>
- <translation type="unfinished"></translation>
+ <translation>Выбрать путь экспорта...</translation>
</message>
</context>
<context>
@@ -630,40 +655,40 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<location filename="../gis/db/CExportDatabaseThread.cpp" line="79"/>
<location filename="../gis/db/CExportDatabaseThread.cpp" line="123"/>
<source>Create %1</source>
- <translation type="unfinished"></translation>
+ <translation>Создать %1</translation>
</message>
<message>
<location filename="../gis/db/CExportDatabaseThread.cpp" line="82"/>
<location filename="../gis/db/CExportDatabaseThread.cpp" line="126"/>
<source>Failed to create %1</source>
- <translation type="unfinished"></translation>
+ <translation>Не удалось создать %1</translation>
</message>
<message>
<location filename="../gis/db/CExportDatabaseThread.cpp" line="88"/>
<source>Done!</source>
- <translation type="unfinished"></translation>
+ <translation>Сделано!</translation>
</message>
<message>
<location filename="../gis/db/CExportDatabaseThread.cpp" line="100"/>
<source>Abort by user!</source>
- <translation type="unfinished"></translation>
+ <translation>Прекращение пользователем!</translation>
</message>
<message>
<location filename="../gis/db/CExportDatabaseThread.cpp" line="108"/>
<location filename="../gis/db/CExportDatabaseThread.cpp" line="140"/>
<location filename="../gis/db/CExportDatabaseThread.cpp" line="165"/>
<source>Database Error: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Ошибка базы данных: %1</translation>
</message>
<message>
<location filename="../gis/db/CExportDatabaseThread.cpp" line="153"/>
<source>Save project as %1</source>
- <translation type="unfinished"></translation>
+ <translation>Сохранить проект как %1</translation>
</message>
<message>
<location filename="../gis/db/CExportDatabaseThread.cpp" line="157"/>
<source>Failed!</source>
- <translation type="unfinished"></translation>
+ <translation>Не удалось!</translation>
</message>
</context>
<context>
@@ -671,7 +696,7 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<message>
<location filename="../gis/trk/filter/CFilterDeleteExtension.cpp" line="57"/>
<source>No extension available</source>
- <translation>Není dostupné žádné rozšíření</translation>
+ <translation>Нет расширения</translation>
</message>
</context>
<context>
@@ -679,17 +704,17 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<message>
<location filename="../gis/trk/filter/CFilterInterpolateElevation.cpp" line="30"/>
<source>coarse</source>
- <translation type="unfinished"></translation>
+ <translation>грубо</translation>
</message>
<message>
<location filename="../gis/trk/filter/CFilterInterpolateElevation.cpp" line="31"/>
<source>medium</source>
- <translation type="unfinished"></translation>
+ <translation>нормально</translation>
</message>
<message>
<location filename="../gis/trk/filter/CFilterInterpolateElevation.cpp" line="32"/>
<source>fine</source>
- <translation type="unfinished"></translation>
+ <translation>точно</translation>
</message>
</context>
<context>
@@ -697,7 +722,7 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<message>
<location filename="../gis/fit/decoder/CFitCrcState.cpp" line="32"/>
<source>FIT decoding error : invalid CRC.</source>
- <translation>Chyba při dekódování FIT: Neplatné CRC.</translation>
+ <translation>Ошибка декодирования FIT: неверная контрольная сумма.</translation>
</message>
</context>
<context>
@@ -705,7 +730,7 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<message>
<location filename="../gis/fit/decoder/CFitDecoder.cpp" line="116"/>
<source>FIT decoding error: unexpected end of file %1.</source>
- <translation>Chyba při dekódování FIT: Neočekávaný konec souboru %1.</translation>
+ <translation>Ошибка декодирования FIT: неожиданный конец файла %1.</translation>
</message>
</context>
<context>
@@ -713,7 +738,7 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<message>
<location filename="../gis/fit/decoder/CFitFieldBuilder.cpp" line="70"/>
<source>FIT decoding error: unknown base type %1.</source>
- <translation>Chyba při dekódování FIT: Neznámý datový typ %1.</translation>
+ <translation>Ошибка декодирования FIT: неизвестный базовый тип %1.</translation>
</message>
</context>
<context>
@@ -721,12 +746,12 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<message>
<location filename="../gis/fit/decoder/CFitHeaderState.cpp" line="69"/>
<source>FIT decoding error: protocol %1 version not supported.</source>
- <translation>Chyba při dekódování FIT: Verze protokolu %1 není podporována.</translation>
+ <translation>Ошибка декодирования FIT: версия протокола %1 не поддерживается.</translation>
</message>
<message>
<location filename="../gis/fit/decoder/CFitHeaderState.cpp" line="120"/>
<source>FIT decoding error: file header signature mismatch. File is not FIT.</source>
- <translation>Chyba při dekódování FIT: Nesouhlasí signatura hlavičky. Soubor není FIT.</translation>
+ <translation>Ошибка декодирования FIT: некорректная сигнатура в заголовке файла. Это не файл типа FIT.</translation>
</message>
</context>
<context>
@@ -734,12 +759,12 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<message>
<location filename="../gis/fit/CFitProject.cpp" line="61"/>
<source>Failed to load file %1...</source>
- <translation>Nepodařilo se nahrát soubor %1...</translation>
+ <translation>Не удалось загрузить файл %1...</translation>
</message>
<message>
<location filename="../gis/fit/CFitProject.cpp" line="93"/>
<source>Failed to open FIT file %1.</source>
- <translation>Nepodařilo se otevřít soubor FIT %1.</translation>
+ <translation>Не удалось открыть FIT файл %1.</translation>
</message>
</context>
<context>
@@ -747,12 +772,12 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<message>
<location filename="../gis/fit/decoder/CFitRecordContentState.cpp" line="66"/>
<source>FIT decoding error: architecture %1 not supported.</source>
- <translation>Chyba při dekódování FIT: Architektura %1 není podporována.</translation>
+ <translation>Ошибка декодирования FIT: архитектура %1 не поддерживается.</translation>
</message>
<message>
<location filename="../gis/fit/decoder/CFitRecordContentState.cpp" line="87"/>
<source>FIT decoding error: invalid offset %1 for state 'record content'</source>
- <translation>Chyba při dekódování FIT: Neplatný posun %1 pro stav 'zaznamenaný obsah'</translation>
+ <translation>Ошибка декодирования FIT: неправильное смещение %1 для состояния 'содержимое записи'</translation>
</message>
</context>
<context>
@@ -761,17 +786,17 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<location filename="../map/garmin/CGarminTyp.cpp" line="457"/>
<location filename="../map/garmin/CGarminTyp.cpp" line="838"/>
<source>Warning...</source>
- <translation>Varování...</translation>
+ <translation>Предупреждение...</translation>
</message>
<message>
<location filename="../map/garmin/CGarminTyp.cpp" line="457"/>
<source>This is a typ file with unknown polygon encoding. Please report!</source>
- <translation>Toto je souborový typ s neznámým kódováním mnohoúhelníku. Nahlašte to, prosím!</translation>
+ <translation>Файл типов с неизвестной кодировкой полигона. Сообщите об этой проблеме!</translation>
</message>
<message>
<location filename="../map/garmin/CGarminTyp.cpp" line="838"/>
<source>This is a typ file with unknown polyline encoding. Please report!</source>
- <translation>Toto je souborový typ s neznámým kódováním čáry. Nahlašte to, prosím!</translation>
+ <translation>Файл типов с неизвестной кодировкой полилинии. Сообщите об этой проблеме!</translation>
</message>
</context>
<context>
@@ -779,156 +804,156 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<message>
<location filename="../gis/ovl/CGisItemOvlArea.cpp" line="36"/>
<source>thin</source>
- <translation>Tenký</translation>
+ <translation>Тонко</translation>
</message>
<message>
<location filename="../gis/ovl/CGisItemOvlArea.cpp" line="37"/>
<source>normal</source>
- <translation>Obvyklý</translation>
+ <translation>Нормально</translation>
</message>
<message>
<location filename="../gis/ovl/CGisItemOvlArea.cpp" line="38"/>
<source>wide</source>
- <translation>Široký</translation>
+ <translation>Широко</translation>
</message>
<message>
<location filename="../gis/ovl/CGisItemOvlArea.cpp" line="39"/>
<source>strong</source>
- <translation>Silný</translation>
+ <translation>Строго</translation>
</message>
<message>
<location filename="../gis/ovl/CGisItemOvlArea.cpp" line="78"/>
<source>_Clone</source>
- <translation>_Klon</translation>
+ <translation>_клон</translation>
</message>
<message>
<location filename="../gis/ovl/CGisItemOvlArea.cpp" line="391"/>
<source>Area: %1%2</source>
- <translation>Oblast: %1%2</translation>
+ <translation>Область: %1%2</translation>
</message>
<message>
<location filename="../gis/ovl/CGisItemOvlArea.cpp" line="451"/>
<source>Changed area shape.</source>
- <translation>Změněn tvar oblasti.</translation>
+ <translation>Изменена фигура области.</translation>
</message>
<message>
<location filename="../gis/ovl/CGisItemOvlArea.cpp" line="459"/>
<source>Changed name.</source>
- <translation>Změněn název.</translation>
+ <translation>Изменено имя.</translation>
</message>
<message>
<location filename="../gis/ovl/CGisItemOvlArea.cpp" line="465"/>
<source>Changed border width.</source>
- <translation>Změněna šířka okraje.</translation>
+ <translation>Изменена ширина границы.</translation>
</message>
<message>
<location filename="../gis/ovl/CGisItemOvlArea.cpp" line="471"/>
<source>Changed fill pattern.</source>
- <translation>Změněn vzor výplně.</translation>
+ <translation>Изменен узор заливки.</translation>
</message>
<message>
<location filename="../gis/ovl/CGisItemOvlArea.cpp" line="477"/>
<source>Changed opacity.</source>
- <translation>Změněna neprůhlednost.</translation>
+ <translation>Изменена прозрачность.</translation>
</message>
<message>
<location filename="../gis/ovl/CGisItemOvlArea.cpp" line="483"/>
<source>Changed comment.</source>
- <translation>Změněna poznámka.</translation>
+ <translation>Изменен комментарий.</translation>
</message>
<message>
<location filename="../gis/ovl/CGisItemOvlArea.cpp" line="489"/>
<source>Changed description.</source>
- <translation>Změněn popis.</translation>
+ <translation>Изменено описание.</translation>
</message>
<message>
<location filename="../gis/ovl/CGisItemOvlArea.cpp" line="495"/>
<source>Changed links</source>
- <translation>Změněné odkazy</translation>
+ <translation>Изменены ссылки</translation>
</message>
<message>
<location filename="../gis/ovl/CGisItemOvlArea.cpp" line="506"/>
<source>Changed color</source>
- <translation>Změněná barva</translation>
+ <translation>Изменен цвет</translation>
</message>
</context>
<context>
<name>CGisItemRte</name>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="65"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="66"/>
<source>_Clone</source>
- <translation>_Klon</translation>
+ <translation>_клон</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="283"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="284"/>
<source>track</source>
- <translation>Stopa</translation>
+ <translation>трек</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="310"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="311"/>
<source>Changed name.</source>
- <translation>Změněn název.</translation>
+ <translation>Изменено имя.</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="316"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="317"/>
<source>Changed comment</source>
- <translation>Změněná poznámka</translation>
+ <translation>Изменен комментарий</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="322"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="323"/>
<source>Changed description</source>
- <translation>Změněný popis</translation>
+ <translation>Изменено описание</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="328"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="329"/>
<source>Changed links</source>
- <translation>Změněné odkazy</translation>
+ <translation>Изменены ссылки</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="346"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="347"/>
<source>Length: %1 %2</source>
- <translation>Délka: %1 %2</translation>
+ <translation>Длина: %1 %2</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="350"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
<source>Length: -</source>
- <translation>Délka: -</translation>
+ <translation>Длина: -</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="357"/>
- <location filename="../gis/rte/CGisItemRte.cpp" line="599"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="600"/>
<source>Time: %1 %2</source>
- <translation>Čas: %1 %2</translation>
+ <translation>Время: %1 %2</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="361"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
<source>Time: -</source>
- <translation>Výsledný čas: -</translation>
+ <translation>Время: -</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="371"/>
+ <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="377"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="378"/>
<source>Last time routed:<br/>%1</source>
- <translation>Poslední spočítání cesty:<br/>%1</translation>
+ <translation>Последнее время маршрутизации:<br/>%1</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="379"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="380"/>
<source>with %1</source>
- <translation>s %1</translation>
+ <translation>с %1</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="601"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="602"/>
<source>Distance: %1 %2</source>
- <translation>Vzdálenost: %1 %2</translation>
+ <translation>Расстояние: %1 %2</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="716"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="717"/>
<source>Changed route points.</source>
- <translation>Změněné body cesty.</translation>
+ <translation>Изменены точки маршрута.</translation>
</message>
</context>
<context>
@@ -936,7 +961,7 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<message>
<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>
+ <translation>FIT файл %1 не содержит данных GPS.</translation>
</message>
<message>
<location filename="../gis/tnv/serialization.cpp" line="211"/>
@@ -945,39 +970,39 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<location filename="../gis/tnv/serialization.cpp" line="387"/>
<location filename="../gis/tnv/serialization.cpp" line="420"/>
<source>Error...</source>
- <translation>Chyba...</translation>
+ <translation>Ошибка...</translation>
</message>
<message>
<location filename="../gis/tnv/serialization.cpp" line="211"/>
<location filename="../gis/tnv/serialization.cpp" line="347"/>
<source>Failed to open %1.</source>
- <translation>Nepodařilo se otevřít %1.</translation>
+ <translation>Не удалось открыть %1.</translation>
</message>
<message>
<location filename="../gis/tnv/serialization.cpp" line="376"/>
<location filename="../gis/tnv/serialization.cpp" line="387"/>
<source>Only support lon/lat WGS 84 format.</source>
- <translation>Jako formát je podporován jen lon/lat WGS 84.</translation>
+ <translation>Поддерживается долгота/широта только в формате WGS 84.</translation>
</message>
<message>
<location filename="../gis/tnv/serialization.cpp" line="420"/>
<source>Failed to read data.</source>
- <translation>Nepodařilo se přečíst data.</translation>
+ <translation>Не удалось читать данные.</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="80"/>
<source>_Clone</source>
- <translation>_Klon</translation>
+ <translation>_клон</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="251"/>
<source>Changed trackpoints, sacrificed all previous data.</source>
- <translation>Změněny body stop. Obětována veškerá předchozí data.</translation>
+ <translation>Изменены точки трека, удалены все предыдущие данные.</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="305"/>
<source>Length: %1 %2</source>
- <translation>Délka: %1 %2</translation>
+ <translation>Длина: %1 %2</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="312"/>
@@ -985,113 +1010,128 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<translation>, %1%2 %3, %4%5 %6</translation>
</message>
<message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="316"/>
+ <source>, %1-, %2-</source>
+ <translation>, %1-, %2-</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="328"/>
+ <source>Time: -, Speed: -</source>
+ <translation>Время: -, скорость: -</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="340"/>
+ <source>Moving: -, Speed: -</source>
+ <translation>В движении: -, скорость: -</translation>
+ </message>
+ <message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="346"/>
<source>Start: %1</source>
- <translation>Začátek: %1</translation>
+ <translation>Начало: %1</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="350"/>
<source>Start: -</source>
- <translation>Začátek: -</translation>
+ <translation>Начало: -</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="356"/>
<source>End: %1</source>
- <translation>Konec: %1</translation>
+ <translation>Конец: %1</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="360"/>
<source>End: -</source>
- <translation>Konec: -</translation>
+ <translation>Конец: -</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="364"/>
<source>Points: %1 (%2)</source>
- <translation>Body: %1 (%2)</translation>
+ <translation>Точки: %1 (%2)</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="368"/>
<source>Invalid elevations!</source>
- <translation>Neplatné výšky!</translation>
+ <translation>Неверные высоты!</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="373"/>
<source>Invalid timestamps!</source>
- <translation>Neplatná časová razítka!</translation>
+ <translation>Неверные метки времени!</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="378"/>
<source>Invalid positions!</source>
- <translation>Neplatné polohy!</translation>
+ <translation>Неверные позиции!</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="387"/>
<source>Activities: %1</source>
- <translation>Činnosti: %1</translation>
+ <translation>Мероприятие %1</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="495"/>
<source>Index: %1</source>
- <translation>Rejstřík: %1</translation>
+ <translation>Индекс: %1</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="499"/>
<source>Index: visible %1, total %2</source>
- <translation>Rejstřík: viditelné %1, celkem %2</translation>
+ <translation>Индекс: видимо %1, всего %2</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="510"/>
<source>Ele.: %1 %2</source>
- <translation>Výška: %1 %2</translation>
+ <translation>Высота: %1 %2</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="513"/>
<source> slope: %1%3 (%2%)</source>
- <translation> sklon: %1%3 (%2%)</translation>
+ <translation> наклон: %1%3 (%2%)</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="518"/>
<source> speed: %1%2</source>
- <translation> rychlost: %1%2</translation>
+ <translation> скорость: %1 %2</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="546"/>
<source>... and %1 tags not displayed</source>
- <translation>... a %1 značek nezobrazeno</translation>
+ <translation>... и %1 не показанных элементов</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="558"/>
<source>Distance: - (-)</source>
- <translation>Vzdálenost: - (-)</translation>
+ <translation>Расстояние: - (-)</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="559"/>
<source>Moving: - (-)</source>
- <translation>Pohyb: - (-)</translation>
+ <translation>В движении: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1214"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1227"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1283"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1327"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1466"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1223"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1236"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1292"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1336"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1475"/>
<source>track</source>
- <translation>Stopa</translation>
+ <translation>трек</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1418"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1427"/>
<source>Hide point %1.</source>
- <translation>Skrýt bod %1.</translation>
+ <translation>Скрыть точку %1.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1422"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1431"/>
<source>Hide points %1..%2.</source>
- <translation>Skrýt body %1 %2.</translation>
+ <translation>Скрыть точки %1..%2.</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="582"/>
<source> Moving: %1%2 (%3%)</source>
- <translation> Pohyb: %1%2 (%3%)</translation>
+ <translation> В движении: %1 %2 (%3%)</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
@@ -1102,207 +1142,192 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="631"/>
<source> Time: %1%2</source>
- <translation> Čas: %1%2</translation>
- </message>
- <message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="316"/>
- <source>, %1-, %2-</source>
- <translation>, %1-, %2-</translation>
+ <translation> Время: %1 %2</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="324"/>
<source>Time: %1, Speed: %2 %3</source>
- <translation>Čas: %1, Rychlost: %2 %3</translation>
- </message>
- <message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="328"/>
- <source>Time: -, Speed: -</source>
- <translation>Čas: -, Rychlost: -</translation>
+ <translation>Время: %1, скорость: %2 %3</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="336"/>
<source>Moving: %1, Speed: %2 %3</source>
- <translation>Pohyb: %1, Rychlost: %2 %3</translation>
- </message>
- <message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="340"/>
- <source>Moving: -, Speed: -</source>
- <translation>Pohyb: -, Rychlost: -</translation>
+ <translation>В движении: %1, скорость: %2 %3</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="556"/>
<source>Ascent: - (-)</source>
- <translation type="unfinished"></translation>
+ <translation>Подъем: -(-)</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="557"/>
<source>Descent: - (-)</source>
- <translation type="unfinished"></translation>
+ <translation>Спуск: -(-)</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="564"/>
<source>Ascent: %1%2 (%3%)</source>
- <translation type="unfinished"></translation>
+ <translation>Подъем: %1 %2 (%3%)</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="570"/>
<source> Descent: %1%2 (%3%)</source>
- <translation type="unfinished"></translation>
+ <translation> Спуск: %1 %2 (%3%)</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
<source>Distance: %1%2 (%3%)</source>
- <translation>Vzdálenost: %1%2 (%3%)</translation>
+ <translation>Расстояние: %1 %2 (%3%)</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
<source>Ascent: -</source>
- <translation type="unfinished"></translation>
+ <translation>Подъем: -</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="599"/>
<source>Descent: -</source>
- <translation type="unfinished"></translation>
+ <translation>Спуск: -</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
<source>Ascent: %1%2</source>
- <translation type="unfinished"></translation>
+ <translation>Подъем: %1 %2</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="616"/>
<source> Descent: %1%2</source>
- <translation type="unfinished"></translation>
+ <translation> Спуск: %1 %2</translation>
</message>
<message>
<location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
<source>Distance: %1%2</source>
- <translation>Vzdálenost: %1%2</translation>
+ <translation>Расстояние: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1273"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1282"/>
<source>Permanently removed points %1..%2</source>
- <translation>Trvale odstraněné body %1 ... %2</translation>
+ <translation>Удалены безвозвратно точки %1..%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1451"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1460"/>
<source>Show points.</source>
- <translation>Ukázat body.</translation>
+ <translation>Показать точки.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1985"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
<source>Changed name</source>
- <translation>Změněný název</translation>
+ <translation>Изменено имя</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1991"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
<source>Changed comment</source>
- <translation>Změněná poznámka</translation>
+ <translation>Изменен комментарий</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1997"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
<source>Changed description</source>
- <translation>Změněný popis</translation>
+ <translation>Изменено описание</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2003"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2012"/>
<source>Changed links</source>
- <translation>Změněné odkazy</translation>
+ <translation>Изменены ссылки</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2014"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2023"/>
<source>Changed elevation of point %1 to %2 %3</source>
- <translation>Výška bodu %1 byla změněna na %2 %3</translation>
+ <translation>Изменена высота точки %1 на %2 %3</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2038"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2047"/>
<source>Changed activity to '%1' for complete track.</source>
- <translation>Činnost byla pro celou stopu změněna na '%1'.</translation>
+ <translation>Изменено мероприятие на '%1' для всего трека.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2077"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2086"/>
<source>Changed activity to '%1' for range(%2..%3).</source>
- <translation>Činnost byla změněna pro oblast (%2...%3) na '%1'.</translation>
+ <translation>Изменено мероприятие на '%1' для интервала (%2..%3).</translation>
</message>
<message>
<location filename="../gis/trk/filter/filter.cpp" line="96"/>
<source>Hide points by Douglas Peuker algorithm (%1%2)</source>
- <translation>Skrýt body pomocí algoritmu Douglas Peuker (%1%2)</translation>
+ <translation>Скрыть точки при помощи алгоритма Douglas-Peuker (%1%2)</translation>
</message>
<message>
<location filename="../gis/trk/filter/filter.cpp" line="122"/>
<source>Hide points with invalid data.</source>
- <translation>Skrýt body s neplatnými daty.</translation>
+ <translation>Скрыть точки с неверными данными.</translation>
</message>
<message>
<location filename="../gis/trk/filter/filter.cpp" line="132"/>
<source>Reset all hidden track points to visible</source>
- <translation>Nastavit znovu všechny skryté body stopy na viditelné</translation>
+ <translation>Сделать видимыми все скрытые точки трека</translation>
</message>
<message>
<location filename="../gis/trk/filter/filter.cpp" line="162"/>
<source>Permanently removed all hidden track points</source>
- <translation>Všechny skryté body stopy odstraněny trvale</translation>
+ <translation>Удалены безвозвратно все скрытые точки трека</translation>
</message>
<message>
<location filename="../gis/trk/filter/filter.cpp" line="199"/>
<source>Smoothed profile with a Median filter of size %1</source>
- <translation>Profil vyhlazen středovým filtrem o velikosti %1</translation>
+ <translation>Сгладить профиль используя фильтр Медиан с размером %1</translation>
</message>
<message>
<location filename="../gis/trk/filter/filter.cpp" line="221"/>
<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>
+ <translation>Заменены высоты данными файлов ЦМР.</translation>
</message>
<message>
<location filename="../gis/trk/filter/filter.cpp" line="239"/>
<source>Replaced elevation data with interpolated values. (M=%1, RMSErr=%2)</source>
- <translation type="unfinished"></translation>
+ <translation>Заменены высоты интерполированными значениями. (M=%1, RMSErr=%2)</translation>
</message>
<message>
<location filename="../gis/trk/filter/filter.cpp" line="255"/>
<source>Offset elevation data by %1%2.</source>
- <translation>Výšková data posunuta o %1%2.</translation>
+ <translation>Добавить %1 %2 к высоте.</translation>
</message>
<message>
<location filename="../gis/trk/filter/filter.cpp" line="268"/>
<source>Changed start of track to %1.</source>
- <translation>Začátek stopy změněn na %1.</translation>
+ <translation>Изменено начало трека на %1.</translation>
</message>
<message>
<location filename="../gis/trk/filter/filter.cpp" line="281"/>
<source>Remove timestamps.</source>
- <translation>Odstranit časová razítka.</translation>
+ <translation>Удалить метки времени.</translation>
</message>
<message>
<location filename="../gis/trk/filter/filter.cpp" line="298"/>
<source>Set artificial timestamps with delta of %1 sec.</source>
- <translation>Uměle utvořená časová razítka nastavena s odstupem %1 s.</translation>
+ <translation>Установить искусственные метки времени с интервалом в %1 секунд.</translation>
</message>
<message>
<location filename="../gis/trk/filter/filter.cpp" line="324"/>
<source>Changed speed to %1%2.</source>
- <translation>Rychlost změněna na %1%2.</translation>
+ <translation>Изменена скорость на %1 %2.</translation>
</message>
<message>
<location filename="../gis/trk/filter/filter.cpp" line="343"/>
<source>%1 (Segment %2)</source>
- <translation>%1 (část %2)</translation>
+ <translation>%1 (сегмент %2)</translation>
</message>
<message>
<location filename="../gis/trk/filter/filter.cpp" line="361"/>
<source>Removed extension %1 from all Track Points</source>
- <translation>Rozšíření %1 bylo odstraněno ze všech bodů stopy</translation>
+ <translation>Удалено расширение %1 со всех точек трека</translation>
</message>
<message>
<location filename="../gis/trk/filter/filter.cpp" line="372"/>
<source>Converted subpoints from routing to track points</source>
- <translation type="unfinished"></translation>
+ <translation>Преобразованы подточки с маршрутных в точки трека</translation>
</message>
<message>
<location filename="../qlgt/converter.cpp" line="195"/>
<source>Copy flag information from QLandkarte GT track</source>
- <translation>Kopírovat informační příznak ze stopy QLandkarte GT</translation>
+ <translation>Скопировать информацию о флагах с трека QLandkarte GT</translation>
</message>
</context>
<context>
@@ -1310,452 +1335,467 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<message>
<location filename="../gis/gpx/serialization.cpp" line="604"/>
<source>Archived</source>
- <translation>Archivováno</translation>
+ <translation>Архивировано</translation>
</message>
<message>
<location filename="../gis/gpx/serialization.cpp" line="608"/>
<source>Available</source>
- <translation>Dostupné</translation>
+ <translation>Доступно</translation>
</message>
<message>
<location filename="../gis/gpx/serialization.cpp" line="612"/>
<source>Not Available</source>
- <translation>Nedostupné</translation>
+ <translation>Не доступно</translation>
</message>
<message>
<location filename="../gis/wpt/CGisItemWpt.cpp" line="102"/>
<source>_Clone</source>
- <translation>_Klon</translation>
+ <translation>_клон</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="272"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="275"/>
<source>Elevation: %1 %2</source>
- <translation>Výška: %1 %2</translation>
+ <translation>Высота: %1 %2</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="283"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="286"/>
<source>Proximity: %1 %2</source>
- <translation>Blízkost: %1 %2</translation>
+ <translation>Приближение: %1 %2</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="355"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="358"/>
<source>Changed name</source>
- <translation>Změněný název</translation>
+ <translation>Изменено имя</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="365"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="368"/>
<source>Changed position</source>
- <translation>Změněná poloha</translation>
+ <translation>Изменена позиция</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="371"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="374"/>
<source>Changed elevation</source>
- <translation>Změněná výška</translation>
+ <translation>Изменена высота</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="377"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="380"/>
<source>Changed proximity</source>
- <translation>Změněná blízkost</translation>
+ <translation>Изменена приближение</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="391"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
<source>Changed icon</source>
- <translation>Změněná ikona</translation>
+ <translation>Изменена пиктограмма</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="397"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
<source>Changed comment</source>
- <translation>Změněná poznámka</translation>
+ <translation>Изменен комментарий</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="403"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="406"/>
<source>Changed description</source>
- <translation>Změněný popis</translation>
+ <translation>Изменено описание</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="409"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="412"/>
<source>Changed links</source>
- <translation>Změněné odkazy</translation>
+ <translation>Изменены ссылки</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="415"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="418"/>
<source>Changed images</source>
- <translation>Změněné obrázky</translation>
+ <translation>Изменены изображения</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="421"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="424"/>
<source>Add image</source>
- <translation>Přidat obrázek</translation>
+ <translation>Добавить изображение</translation>
</message>
</context>
<context>
<name>CGisListDB</name>
<message>
- <location filename="../gis/CGisListDB.cpp" line="83"/>
+ <location filename="../gis/CGisListDB.cpp" line="84"/>
<source>Due to changes in the database system QMapShack forgot about the filename of your database '%1'. You have to select it again in the next step.</source>
- <translation>Na základě změn v databázovém systému QMapShack souborové názvy ve vaší databázi '%1' už nezná. Musíte je v dalším kroku znovu zvolit.</translation>
+ <translation>Из-за изменений в системе баз данных QMapShack забыл об имени файла базы данных '%1'. Выбрать его снова на следующем шаге.</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="84"/>
+ <location filename="../gis/CGisListDB.cpp" line="85"/>
<source>Select database file.</source>
- <translation>Vybrat soubor s databází.</translation>
+ <translation>Выбрать файл базы данных.</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="117"/>
+ <location filename="../gis/CGisListDB.cpp" line="118"/>
<source>Add Database</source>
- <translation>Přidat databázi</translation>
+ <translation>Добавить базу данных</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="120"/>
+ <location filename="../gis/CGisListDB.cpp" line="121"/>
<source>Add Folder</source>
- <translation>Přidat složku</translation>
+ <translation>Добавить папку</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="121"/>
+ <location filename="../gis/CGisListDB.cpp" line="122"/>
<source>Rename Folder</source>
- <translation>Přejmenovat složku</translation>
+ <translation>Переименовать папку</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="122"/>
+ <location filename="../gis/CGisListDB.cpp" line="123"/>
<source>Copy Folder</source>
- <translation>Kopírovat složku</translation>
+ <translation>Копировать папку</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="123"/>
+ <location filename="../gis/CGisListDB.cpp" line="124"/>
<source>Move Folder</source>
- <translation>Přesunout složku</translation>
+ <translation>Переместить папку</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="124"/>
+ <location filename="../gis/CGisListDB.cpp" line="125"/>
<source>Delete Folder</source>
- <translation>Smazat složku</translation>
+ <translation>Удалить папку</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="125"/>
- <source>Export to GPX...</source>
- <translation type="unfinished"></translation>
+ <location filename="../gis/CGisListDB.cpp" line="127"/>
+ <source>Import from Files...</source>
+ <translation>Импортировать файлы...</translation>
</message>
<message>
<location filename="../gis/CGisListDB.cpp" line="128"/>
- <location filename="../gis/CGisListDB.cpp" line="141"/>
+ <source>Export to GPX...</source>
+ <translation>Экспортировать в GPX...</translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListDB.cpp" line="131"/>
+ <location filename="../gis/CGisListDB.cpp" line="147"/>
<source>Delete Item</source>
- <translation>Smazat prvek</translation>
+ <translation>Удалить элемент</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="132"/>
+ <location filename="../gis/CGisListDB.cpp" line="135"/>
<source>Search Database</source>
- <translation>Prohledat databázi</translation>
+ <translation>Искать в базе данных</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="133"/>
+ <location filename="../gis/CGisListDB.cpp" line="136"/>
<source>Sync. with Database</source>
- <translation>Seřídit s databází</translation>
+ <translation>Синхронизировать с базой данных</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="134"/>
+ <location filename="../gis/CGisListDB.cpp" line="137"/>
<source>Remove Database</source>
- <translation>Odstranit databázi</translation>
+ <translation>Удалить базу данных</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="138"/>
+ <location filename="../gis/CGisListDB.cpp" line="144"/>
<source>Empty</source>
- <translation>Prázdný</translation>
+ <translation>Удалить все элементы</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="437"/>
+ <location filename="../gis/CGisListDB.cpp" line="444"/>
<source>Remove database...</source>
- <translation>Odstranit databázi...</translation>
+ <translation>Удалить базу данных...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="437"/>
+ <location filename="../gis/CGisListDB.cpp" line="444"/>
<source>Do you really want to remove '%1' from the list?</source>
- <translation>Opravdu chcete '%1' odstranit ze seznamu?</translation>
+ <translation>Вы действительно хотите удалить '%1' со списка?</translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListDB.cpp" line="508"/>
+ <source>Delete database folder...</source>
+ <translation>Удалить папку с базы данных...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="501"/>
+ <location filename="../gis/CGisListDB.cpp" line="508"/>
<source>Are you sure you want to delete selected folders and all subfolders from the database?</source>
- <translation>Opravdu chcete smazat vybrané složky a všechny podsložky z databáze?</translation>
+ <translation>Вы действительно хотите удалить все выбранные папки вместе с вложенными папками с базы данных?</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="669"/>
+ <location filename="../gis/CGisListDB.cpp" line="676"/>
<source>Bad operation....</source>
- <translation>Špatná operace...</translation>
+ <translation>Неверная операция...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="669"/>
+ <location filename="../gis/CGisListDB.cpp" line="676"/>
<source>The target folder is a subfolder of the one to move. This will not work.</source>
- <translation>Cílová složka je podsložkou složky k přesunutí. Toto nebude pracovat.</translation>
+ <translation>Целевая папка есть вложенная папка папки которая перемещается. Так нельзя.</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="728"/>
+ <location filename="../gis/CGisListDB.cpp" line="735"/>
<source>Folder name...</source>
- <translation>Název složky...</translation>
+ <translation>Имя папки...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="728"/>
+ <location filename="../gis/CGisListDB.cpp" line="735"/>
<source>Rename folder:</source>
- <translation>Přejmenovat složku:</translation>
+ <translation>Переименовать папку:</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="857"/>
- <source>Are you sure you want to delete '%1' from folder '%2'?</source>
- <translation>Jste si jistý, že chcete smazat '%1' ze složky '%2'?</translation>
+ <location filename="../gis/CGisListDB.cpp" line="756"/>
+ <location filename="../gis/CGisListDB.cpp" line="777"/>
+ <source>Remove items...</source>
+ <translation>Удалить элементы...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="858"/>
- <source>Delete...</source>
- <translation>Smazat...</translation>
+ <location filename="../gis/CGisListDB.cpp" line="756"/>
+ <source>Are you sure you want to delete all items from Lost&Found? This will remove them permanently.</source>
+ <translation>Вы действительно хотите удалить все элементы с 'Потеряно и найдено'? Это удалит их безвозвратно.</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="501"/>
- <source>Delete database folder...</source>
- <translation>Smazat složku s databází...</translation>
+ <location filename="../gis/CGisListDB.cpp" line="777"/>
+ <source>Are you sure you want to delete all selected items from Lost&Found? This will remove them permanently.</source>
+ <translation>Вы действительно хотите удалить все выбранные элементы с 'Потеряно и найдено'? Это удалит их безвозвратно.</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="749"/>
- <location filename="../gis/CGisListDB.cpp" line="770"/>
- <source>Remove items...</source>
- <translation>Odstranit prvky...</translation>
+ <location filename="../gis/CGisListDB.cpp" line="864"/>
+ <source>Are you sure you want to delete '%1' from folder '%2'?</source>
+ <translation>Вы действительно хотите удалить '%1' с папки '%2'?</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="749"/>
- <source>Are you sure you want to delete all items from Lost&Found? This will remove them permanently.</source>
- <translation>Opravdu chcete smazat všechny prvky ze ztracených a nalezených? Tím budou trvale odstraněny.</translation>
+ <location filename="../gis/CGisListDB.cpp" line="865"/>
+ <source>Delete...</source>
+ <translation>Удалить...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="770"/>
- <source>Are you sure you want to delete all selected items from Lost&Found? This will remove them permanently.</source>
- <translation>Opravdu chcete smazat všechny vybrané prvky ze ztracených a nalezených? Tím budou trvale odstraněny.</translation>
+ <location filename="../gis/CGisListDB.cpp" line="1055"/>
+ <source>Import GIS Data...</source>
+ <translation>Импортировать данные GIS...</translation>
</message>
</context>
<context>
<name>CGisListWks</name>
<message>
- <location filename="../gis/CGisListWks.cpp" line="112"/>
- <source>Save</source>
- <translation>Uložit</translation>
- </message>
- <message>
- <location filename="../gis/CGisListWks.cpp" line="99"/>
+ <location filename="../gis/CGisListWks.cpp" line="101"/>
<source>Edit..</source>
- <translation>Upravit...</translation>
+ <translation>Изменить..</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="121"/>
- <source>Close</source>
- <translation>Zavřít</translation>
+ <location filename="../gis/CGisListWks.cpp" line="103"/>
+ <source>Show on Map</source>
+ <translation>Показать на карте</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="130"/>
- <source>Update Project on Device</source>
- <translation>Aktualizovat projekt na zařízení</translation>
+ <location filename="../gis/CGisListWks.cpp" line="104"/>
+ <source>Hide from Map</source>
+ <translation>Скрыть с карты</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="144"/>
- <source>Edit...</source>
- <translation>Upravit...</translation>
+ <location filename="../gis/CGisListWks.cpp" line="110"/>
+ <source>Sort by Time</source>
+ <translation>Сортировать по времени</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="100"/>
- <location filename="../gis/CGisListWks.cpp" line="145"/>
- <source>Copy to...</source>
- <translation>Kopírovat do...</translation>
+ <location filename="../gis/CGisListWks.cpp" line="111"/>
+ <source>Sort by Name</source>
+ <translation>Сортировать по именам</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="113"/>
- <source>Save as...</source>
- <translation type="unfinished"></translation>
+ <location filename="../gis/CGisListWks.cpp" line="114"/>
+ <source>Save</source>
+ <translation>Сохранить</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="153"/>
- <source>Copy Track with Waypoints</source>
- <translation type="unfinished"></translation>
+ <location filename="../gis/CGisListWks.cpp" line="116"/>
+ <source>Save as GPX 1.1 w/o ext...</source>
+ <translation>Сохранить как GPX 1.1 без расширений...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="161"/>
- <source>Show Bubble</source>
- <translation>Ukázat bublinu</translation>
+ <location filename="../gis/CGisListWks.cpp" line="119"/>
+ <source>Send to Devices</source>
+ <translation>Отправить в устройства</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="163"/>
- <source>Move Waypoint</source>
- <translation>Přesunout cestovní bod</translation>
+ <location filename="../gis/CGisListWks.cpp" line="120"/>
+ <source>Sync. with Database</source>
+ <translation>Синхронизировать с базой данных</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="164"/>
- <source>Proj. Waypoint...</source>
- <translation>Promítnutí cestovního bodu...</translation>
+ <location filename="../gis/CGisListWks.cpp" line="123"/>
+ <source>Close</source>
+ <translation>Закрыть</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="172"/>
- <source>Route Instructions</source>
- <translation>Pokyny pro cestu</translation>
+ <location filename="../gis/CGisListWks.cpp" line="132"/>
+ <source>Update Project on Device</source>
+ <translation>Обновить проект на устройстве</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="174"/>
- <source>Calculate Route</source>
- <translation>Spočítat cestu</translation>
+ <location filename="../gis/CGisListWks.cpp" line="134"/>
+ <location filename="../gis/CGisListWks.cpp" line="157"/>
+ <source>Delete</source>
+ <translation>Удалить</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="175"/>
- <source>Reset Route</source>
- <translation>Nastavit cestu znovu</translation>
+ <location filename="../gis/CGisListWks.cpp" line="146"/>
+ <source>Edit...</source>
+ <translation>Изменить...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="176"/>
- <source>Edit Route</source>
- <translation>Upravit cestu</translation>
+ <location filename="../gis/CGisListWks.cpp" line="102"/>
+ <location filename="../gis/CGisListWks.cpp" line="147"/>
+ <source>Copy to...</source>
+ <translation>Копировать в...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="177"/>
- <source>Convert to Track</source>
- <translation>Převést na stopu</translation>
+ <location filename="../gis/CGisListWks.cpp" line="115"/>
+ <source>Save as...</source>
+ <translation>Сохранить как...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="193"/>
- <source>Create Route</source>
- <translation>Vytvořit cestu</translation>
+ <location filename="../gis/CGisListWks.cpp" line="149"/>
+ <source>Track Profile</source>
+ <translation>Профиль трека</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="622"/>
- <source>Drop items...</source>
- <translation>Zahodit prvky...</translation>
+ <location filename="../gis/CGisListWks.cpp" line="151"/>
+ <source>Select Range</source>
+ <translation>Выделить интервал</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="647"/>
- <location filename="../gis/CGisListWks.cpp" line="1631"/>
- <location filename="../gis/CGisListWks.cpp" line="1669"/>
- <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>
+ <location filename="../gis/CGisListWks.cpp" line="152"/>
+ <source>Edit Track Points</source>
+ <translation>Изменить точки трека</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1178"/>
- <source>Delete project...</source>
- <translation>Smazat projekt...</translation>
+ <location filename="../gis/CGisListWks.cpp" line="153"/>
+ <source>Reverse Track</source>
+ <translation>Обратить трек</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1178"/>
- <source>Do you really want to delete %1?</source>
- <translation>Opravdu chcete smazat %1?</translation>
+ <location filename="../gis/CGisListWks.cpp" line="154"/>
+ <source>Combine Tracks</source>
+ <translation>Соединить треки</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="147"/>
- <source>Track Profile</source>
- <translation>Profil stopy</translation>
+ <location filename="../gis/CGisListWks.cpp" line="155"/>
+ <source>Copy Track with Waypoints</source>
+ <translation>Копировать трек с маршрутными точками</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="101"/>
- <source>Show on Map</source>
- <translation>Ukázat na mapě</translation>
+ <location filename="../gis/CGisListWks.cpp" line="163"/>
+ <source>Show Bubble</source>
+ <translation>Показать пузырек</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="102"/>
- <source>Hide from Map</source>
- <translation>Skrýt v mapě</translation>
+ <location filename="../gis/CGisListWks.cpp" line="165"/>
+ <source>Move Waypoint</source>
+ <translation>Переместить маршрутную точку</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="108"/>
- <source>Sort by Time</source>
- <translation>Třídit podle času</translation>
+ <location filename="../gis/CGisListWks.cpp" line="166"/>
+ <source>Proj. Waypoint...</source>
+ <translation>Проекция маршрутной точки...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="109"/>
- <source>Sort by Name</source>
- <translation>Třídit podle názvu</translation>
+ <location filename="../gis/CGisListWks.cpp" line="174"/>
+ <source>Route Instructions</source>
+ <translation>Маршрутные инструкции</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="114"/>
- <source>Save as GPX 1.1 w/o ext...</source>
- <translation type="unfinished"></translation>
+ <location filename="../gis/CGisListWks.cpp" line="176"/>
+ <source>Calculate Route</source>
+ <translation>Вычислить маршрут</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="117"/>
- <source>Send to Devices</source>
- <translation>Poslat do zařízení</translation>
+ <location filename="../gis/CGisListWks.cpp" line="177"/>
+ <source>Reset Route</source>
+ <translation>Сбросить маршрутизацию</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="118"/>
- <source>Sync. with Database</source>
- <translation>Seřídit s databází</translation>
+ <location filename="../gis/CGisListWks.cpp" line="178"/>
+ <source>Edit Route</source>
+ <translation>Изменить маршрут</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="149"/>
- <source>Select Range</source>
- <translation>Vybrat rozsah</translation>
+ <location filename="../gis/CGisListWks.cpp" line="179"/>
+ <source>Convert to Track</source>
+ <translation>Преобразовать в трек</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="150"/>
- <source>Edit Track Points</source>
- <translation>Upravit body stopy</translation>
+ <location filename="../gis/CGisListWks.cpp" line="188"/>
+ <source>Edit Area Points</source>
+ <translation>Изменить точки области</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="151"/>
- <source>Reverse Track</source>
- <translation>Obrátit stopu</translation>
+ <location filename="../gis/CGisListWks.cpp" line="195"/>
+ <source>Create Route</source>
+ <translation>Создать маршрут</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="152"/>
- <source>Combine Tracks</source>
- <translation>Spojit stopy</translation>
+ <location filename="../gis/CGisListWks.cpp" line="196"/>
+ <source>Change Icon (sel. waypt. only)</source>
+ <translation>Изменить пиктограмму (выбрать только маршрутные точки)</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="186"/>
- <source>Edit Area Points</source>
- <translation>Upravit body oblasti</translation>
+ <location filename="../gis/CGisListWks.cpp" line="627"/>
+ <source>Drop items...</source>
+ <translation>Удалить элементы...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="132"/>
- <location filename="../gis/CGisListWks.cpp" line="155"/>
- <source>Delete</source>
- <translation>Smazat</translation>
+ <location filename="../gis/CGisListWks.cpp" line="652"/>
+ <location filename="../gis/CGisListWks.cpp" line="1650"/>
+ <location filename="../gis/CGisListWks.cpp" line="1688"/>
+ <source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
+ <translation><b>Обновить устройства</b><p>Обновить %1<br/>Подождите...</p></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="773"/>
+ <location filename="../gis/CGisListWks.cpp" line="778"/>
<source>Saving workspace. Please wait.</source>
- <translation>Ukládá se pracovní prostor. Počkejte, prosím.</translation>
+ <translation>Сохранить рабочую область. Подождите.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="819"/>
+ <location filename="../gis/CGisListWks.cpp" line="824"/>
<source>Loading workspace. Please wait.</source>
- <translation>Nahrává se pracovní prostor. Počkejte, prosím.</translation>
+ <translation>Загрузка рабочей области. Подождите.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1155"/>
+ <location filename="../gis/CGisListWks.cpp" line="1174"/>
<source>Close all projects...</source>
- <translation>Zavřít všechny projekty...</translation>
+ <translation>Закрыть все проекты...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1155"/>
+ <location filename="../gis/CGisListWks.cpp" line="1174"/>
<source>This will remove all projects from the workspace.</source>
- <translation>Tímto budou všechny projekty odstraněny z pracovního prostoru.</translation>
+ <translation>Это удалит все проекты с рабочей области.</translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="1197"/>
+ <source>Delete project...</source>
+ <translation>Удалить проект...</translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="1197"/>
+ <source>Do you really want to delete %1?</source>
+ <translation>Вы действительно хотите удалить %1?</translation>
</message>
</context>
<context>
<name>CGisWidget</name>
<message>
- <location filename="../gis/CGisWidget.cpp" line="139"/>
+ <location filename="../gis/CGisWidget.cpp" line="110"/>
<source>Load project...</source>
- <translation>Nahrát projekt...</translation>
+ <translation>Загрузить проект...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="139"/>
+ <location filename="../gis/CGisWidget.cpp" line="110"/>
<source>The project "%1" is already in the workspace.</source>
- <translation>Projekt "%1" je již náhrán do pracovního prostoru.</translation>
+ <translation>Проект "%1" уже находится в рабочей области.</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="544"/>
+ <location filename="../gis/CGisWidget.cpp" line="515"/>
<source>Copy items...</source>
- <translation>Kopírovat prvky...</translation>
+ <translation>Копировать элемент ...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="672"/>
+ <location filename="../gis/CGisWidget.cpp" line="664"/>
<source>Cut Track...</source>
- <translation>Rozkrojit stopu...</translation>
+ <translation>Вырезать трек...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="672"/>
+ <location filename="../gis/CGisWidget.cpp" line="664"/>
<source>Do you want to delete the original track?</source>
- <translation>Opravdu chcete smazat původní stopu?</translation>
+ <translation>Желаете удалить изначальный трек?</translation>
</message>
</context>
<context>
@@ -1763,51 +1803,51 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<message>
<location filename="../gis/gpx/CGpxProject.cpp" line="91"/>
<source>Failed to load file %1...</source>
- <translation>Nepodařilo se nahrát soubor %1...</translation>
+ <translation>Не удалось загрузить файл %1...</translation>
</message>
<message>
<location filename="../gis/gpx/CGpxProject.cpp" line="113"/>
<source>Failed to open %1</source>
- <translation>Nepodařilo se otevřít %1</translation>
+ <translation>Не удалось открыть %1</translation>
</message>
<message>
<location filename="../gis/gpx/CGpxProject.cpp" line="125"/>
<source>Failed to read: %1
line %2, column %3:
%4</source>
- <translation>Chyba při čtení: %1
-Řádek %2, Sloupec %3:
+ <translation>Не удалось читать %1
+строка %2, столбец %3:
%4</translation>
</message>
<message>
<location filename="../gis/gpx/CGpxProject.cpp" line="133"/>
<source>Not a GPX file: %1</source>
- <translation>Není souborem GPX: %1</translation>
+ <translation>Нет файла GPX: %1</translation>
</message>
<message>
<location filename="../gis/gpx/CGpxProject.cpp" line="264"/>
<source>File exists ...</source>
- <translation>Soubor existuje...</translation>
+ <translation>Файл существует...</translation>
</message>
<message>
<location filename="../gis/gpx/CGpxProject.cpp" line="265"/>
<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>
+ <translation>Файл существует и не создан в QMapShack. Если нажать 'да' все данные в этом файле будут потеряны. Даже если этот файл содержит данные GPX и был загружен в QMapShack, QMapShack не может загрузить и сохранить все элементы этого файла. Такие элементы будут потеряны. Рекомендуется использовать другой файл. <b>Вы действительно хотите перезаписать этот файл?</b></translation>
</message>
<message>
<location filename="../gis/gpx/CGpxProject.cpp" line="382"/>
<source>Failed to create file '%1'</source>
- <translation>Nepodařilo se vytvořit soubor '%1'</translation>
+ <translation>Не удалось создать файл '%1'</translation>
</message>
<message>
<location filename="../gis/gpx/CGpxProject.cpp" line="392"/>
<source>Failed to write file '%1'</source>
- <translation>Nepodařilo se zapsat soubor '%1'</translation>
+ <translation>Не удалось записать файл '%1'</translation>
</message>
<message>
<location filename="../gis/gpx/CGpxProject.cpp" line="404"/>
<source>Saving GIS data failed...</source>
- <translation>Nepodařilo se uložit data GIS...</translation>
+ <translation>Не удалось сохранить данные GIS...</translation>
</message>
</context>
<context>
@@ -1825,12 +1865,12 @@ line %2, column %3:
<message>
<location filename="../grid/CGrid.cpp" line="72"/>
<source>%1m, %2m </source>
- <translation>%1m, %2m </translation>
+ <translation>%1м, %2м</translation>
</message>
<message>
<location filename="../grid/CGrid.cpp" line="76"/>
<source>N %1m, E %2m </source>
- <translation>N %1 m, E %2 m</translation>
+ <translation>С %1м, В %2м</translation>
</message>
</context>
<context>
@@ -1838,12 +1878,12 @@ line %2, column %3:
<message>
<location filename="../widgets/CHistoryListWidget.cpp" line="34"/>
<source>Cut history</source>
- <translation>Vyjmout historii</translation>
+ <translation>Вырезать историю</translation>
</message>
<message>
<location filename="../widgets/CHistoryListWidget.cpp" line="61"/>
<source> by %1</source>
- <translation> od %1</translation>
+ <translation>от %1</translation>
</message>
</context>
<context>
@@ -1851,17 +1891,17 @@ line %2, column %3:
<message>
<location filename="../tool/CImportDatabase.cpp" line="29"/>
<source>Import QLandkarte Database</source>
- <translation>Zavést databázi QLandkarte</translation>
+ <translation>Импортировать базу данных QLandkarte</translation>
</message>
<message>
<location filename="../tool/CImportDatabase.cpp" line="75"/>
<source>Select source database...</source>
- <translation>Vybrat zdrojovou databázi...</translation>
+ <translation>Выбрать исходную базу данных...</translation>
</message>
<message>
<location filename="../tool/CImportDatabase.cpp" line="97"/>
<source>Select target database...</source>
- <translation>Vybrat cílovou databázi...</translation>
+ <translation>Выбрать целевую базу данных...</translation>
</message>
</context>
<context>
@@ -1869,64 +1909,64 @@ line %2, column %3:
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="62"/>
<source>Air Temperature</source>
- <translation>Teplota vzduchu</translation>
+ <translation>Температура воздуха</translation>
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="66"/>
<source>Water Temperature</source>
- <translation>Teplota vody</translation>
+ <translation>Температура воды</translation>
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="70"/>
<source>Depth</source>
- <translation>Hloubka</translation>
+ <translation>Глубина</translation>
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="74"/>
<location filename="../gis/trk/CKnownExtension.cpp" line="86"/>
<source>Heart Rate</source>
- <translation>Tep srdce</translation>
+ <translation>Пульс</translation>
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="78"/>
<location filename="../gis/trk/CKnownExtension.cpp" line="90"/>
<source>Cadence</source>
- <translation>Rychlost chůze</translation>
+ <translation>Каденция</translation>
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="94"/>
<source>Speed</source>
- <translation>Rychlost</translation>
+ <translation>Скорость</translation>
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="98"/>
<source>Acceleration</source>
- <translation>Zrychlení</translation>
+ <translation>Ускорение</translation>
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="102"/>
<source>Course</source>
- <translation>Směr</translation>
+ <translation>Курс</translation>
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="111"/>
<source>Slope*</source>
- <translation>Sklon*</translation>
+ <translation>Наклон*</translation>
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
<source>Speed*</source>
- <translation>Rychlost*</translation>
+ <translation>Скорость*</translation>
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="121"/>
<source>Elevation</source>
- <translation>Výška</translation>
+ <translation>Высота</translation>
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="126"/>
<source>Progress</source>
- <translation>Postup</translation>
+ <translation>Выполнение</translation>
</message>
</context>
<context>
@@ -1934,692 +1974,694 @@ line %2, column %3:
<message>
<location filename="../gis/db/CLostFoundProject.cpp" line="39"/>
<source>Lost & Found</source>
- <translation>Ztraceno a nalezeno</translation>
+ <translation>Потеряно и найдено</translation>
</message>
</context>
<context>
<name>CMainWindow</name>
<message>
- <location filename="../CMainWindow.cpp" line="562"/>
+ <location filename="../CMainWindow.cpp" line="588"/>
<source>Use <b>Menu->View->Add Map View</b> to open a new view. Or <b>Menu->File->Load Map View</b> to restore a saved one. Or click <a href='newview'>here</a>.</source>
- <translation>Použít <b>Nabídka → Pohled → Přidat pohled na mapu</b> k otevření nového pohledu. Nebo <b>Nabídka → Soubor → Nahrát pohled na mapu</b> k obnovení uložené. Nebo klepněte <a href='newview'>sem</a>.</translation>
+ <translation>Использовать <b>Меню->Вид->Добавить окно карты</b> для добавления нового вида. Или <b>Меню->Файл->Загрузить вид карты</b> для восстановления сохраненного вида. Или нажмите <a href='newview'>здесь</a>.</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="690"/>
+ <location filename="../CMainWindow.cpp" line="716"/>
<source>Ele: %1%2</source>
- <translation>Výška: %1%2</translation>
+ <translation>Высота: %1%2</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="706"/>
+ <location filename="../CMainWindow.cpp" line="732"/>
<source>[Grid: %1]</source>
- <translation>[Mřížka: %1]</translation>
+ <translation>[Координатная сетка: %1]</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="841"/>
+ <location filename="../CMainWindow.cpp" line="867"/>
<source>Load GIS Data...</source>
- <translation>Nahrát data GIS...</translation>
+ <translation>Загрузить данные GIS...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="875"/>
+ <location filename="../CMainWindow.cpp" line="901"/>
<source>Select output file</source>
- <translation>Vybrat výstupní soubor</translation>
+ <translation>Выбрать выходной файл</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="875"/>
<location filename="../CMainWindow.cpp" line="901"/>
+ <location filename="../CMainWindow.cpp" line="927"/>
<source>QMapShack View (*.view)</source>
- <translation>Pohled QMapShack (*.view)</translation>
+ <translation>QMapShack вид (*.view)</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="901"/>
+ <location filename="../CMainWindow.cpp" line="927"/>
<source>Select file to load</source>
- <translation>Vybrat soubor k nahrání</translation>
+ <translation>Выбрать файл для загрузки</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1080"/>
+ <location filename="../CMainWindow.cpp" line="1106"/>
<source>Fatal...</source>
- <translation>Kritické...</translation>
+ <translation>Неустранимая ошибка...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1081"/>
+ <location filename="../CMainWindow.cpp" line="1107"/>
<source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your distribution to fix it.</source>
- <translation type="unfinished"></translation>
+ <translation>QMapShack обнаружил плохо установленную библиотеку Proj4. Таблицы перевода для проекций EPSG обычно находятся в /usr/share/pro отсутствуют. Пожалуйста, сообщите об этом администратору пакета чтобы поправить это.</translation>
</message>
</context>
<context>
<name>CMapDraw</name>
<message>
- <location filename="../map/CMapDraw.cpp" line="420"/>
+ <location filename="../map/CMapDraw.cpp" line="457"/>
<source>There are no maps right now. QMapShack is no fun without maps. You can install maps by pressing the 'Help! I want maps!' button in the 'Maps' dock window. Or you can press the F1 key to open the online documentation that tells you how to use QMapShack.
If it's no fun, why don't you provide maps? Well to host maps ready for download and installation requires a good server. And this is not a free service. The project lacks the money. Additionally map and DEM data has a copyright. Therefore the copyright holder has to be asked prior to package the data. This is not that easy as it might sound and for some data you have to pay royalties. The project simply lacks resources to do this. And we think installing the stuff yourself is [...]
- <translation type="unfinished"></translation>
+ <translation>В данный момент, карт ещё нет. Использование QMapShack без карт совсем непривлекательно. Вы можете установить карты, нажав кнопку 'Помогите! Я хочу карты!' в окне 'Карты'. Или Вы можете нажать клавишу F1, чтобы открыть документацию в Интернете, которая объяснит как использовать QMapShack.
+
+Так не очень удобно, почему не поставлять сразу с картами? Поддержка готовых для загрузки и установки карт требует хорошего сервера. И это небесплатно. У проекта нет денег. Вдобавок карты и данные ЦМР зачастую распространяются под ограничительными лицензиями. Поэтому требуется разрешение правообладателя перед упаковкой его данных. Это не так просто как звучит, к тому же за некоторые данные требуется платить комиссионные. У проекта просто нет ресурсов для этого. И мы надеемся установка ка [...]
</message>
</context>
<context>
<name>CMapIMG</name>
<message>
- <location filename="../map/CMapIMG.cpp" line="145"/>
+ <location filename="../map/CMapIMG.cpp" line="146"/>
<source>Failed ...</source>
- <translation>Nepodařilo se...</translation>
+ <translation>Не удалось...</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="156"/>
+ <location filename="../map/CMapIMG.cpp" line="157"/>
<source>Unspecified</source>
- <translation>Neurčeno</translation>
+ <translation>Не указано</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="157"/>
+ <location filename="../map/CMapIMG.cpp" line="158"/>
<source>French</source>
- <translation>Francouzský</translation>
+ <translation>Французский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="158"/>
+ <location filename="../map/CMapIMG.cpp" line="159"/>
<source>German</source>
- <translation>Německý</translation>
+ <translation>Немецкий</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="159"/>
+ <location filename="../map/CMapIMG.cpp" line="160"/>
<source>Dutch</source>
- <translation>Holandský</translation>
+ <translation>Голландский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="160"/>
+ <location filename="../map/CMapIMG.cpp" line="161"/>
<source>English</source>
- <translation>Anglický</translation>
+ <translation>Английский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="161"/>
+ <location filename="../map/CMapIMG.cpp" line="162"/>
<source>Italian</source>
- <translation>Italský</translation>
+ <translation>Итальянский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="162"/>
+ <location filename="../map/CMapIMG.cpp" line="163"/>
<source>Finnish</source>
- <translation>Finský</translation>
+ <translation>Финский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="163"/>
+ <location filename="../map/CMapIMG.cpp" line="164"/>
<source>Swedish</source>
- <translation>Švédský</translation>
+ <translation>Шведский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="164"/>
+ <location filename="../map/CMapIMG.cpp" line="165"/>
<source>Spanish</source>
- <translation>Španělský</translation>
+ <translation>Испанский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="165"/>
+ <location filename="../map/CMapIMG.cpp" line="166"/>
<source>Basque</source>
- <translation>Baskický</translation>
+ <translation>Баскский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="166"/>
+ <location filename="../map/CMapIMG.cpp" line="167"/>
<source>Catalan</source>
- <translation>Katalánský</translation>
+ <translation>Каталонский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="167"/>
+ <location filename="../map/CMapIMG.cpp" line="168"/>
<source>Galician</source>
- <translation>Galicijský</translation>
+ <translation>Галисийский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="168"/>
+ <location filename="../map/CMapIMG.cpp" line="169"/>
<source>Welsh</source>
- <translation>Velšský</translation>
+ <translation>Валлийский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="169"/>
+ <location filename="../map/CMapIMG.cpp" line="170"/>
<source>Gaelic</source>
- <translation>Gaelský</translation>
+ <translation>Гэльский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="170"/>
+ <location filename="../map/CMapIMG.cpp" line="171"/>
<source>Danish</source>
- <translation>Dánský</translation>
+ <translation>Датский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="171"/>
+ <location filename="../map/CMapIMG.cpp" line="172"/>
<source>Norwegian</source>
- <translation>Norský</translation>
+ <translation>Норвежский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="172"/>
+ <location filename="../map/CMapIMG.cpp" line="173"/>
<source>Portuguese</source>
- <translation>Portugalský</translation>
+ <translation>Португальский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="173"/>
+ <location filename="../map/CMapIMG.cpp" line="174"/>
<source>Slovak</source>
- <translation>Slovenský</translation>
+ <translation>Словацкий</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="174"/>
+ <location filename="../map/CMapIMG.cpp" line="175"/>
<source>Czech</source>
- <translation>Český</translation>
+ <translation>Чешский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="175"/>
+ <location filename="../map/CMapIMG.cpp" line="176"/>
<source>Croatian</source>
- <translation>Chorvatský</translation>
+ <translation>Хорватский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="176"/>
+ <location filename="../map/CMapIMG.cpp" line="177"/>
<source>Hungarian</source>
- <translation>Maďarský</translation>
+ <translation>Венгерский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="177"/>
+ <location filename="../map/CMapIMG.cpp" line="178"/>
<source>Polish</source>
- <translation>Polský</translation>
+ <translation>Польский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="178"/>
+ <location filename="../map/CMapIMG.cpp" line="179"/>
<source>Turkish</source>
- <translation>Turecký</translation>
+ <translation>Турецкий</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="179"/>
+ <location filename="../map/CMapIMG.cpp" line="180"/>
<source>Greek</source>
- <translation>Řecký</translation>
+ <translation>Греческий</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="180"/>
+ <location filename="../map/CMapIMG.cpp" line="181"/>
<source>Slovenian</source>
- <translation>Slovinský</translation>
+ <translation>Словенский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="181"/>
+ <location filename="../map/CMapIMG.cpp" line="182"/>
<source>Russian</source>
- <translation>Ruský</translation>
+ <translation>Русский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="182"/>
+ <location filename="../map/CMapIMG.cpp" line="183"/>
<source>Estonian</source>
- <translation>Estonský</translation>
+ <translation>Эстонский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="183"/>
+ <location filename="../map/CMapIMG.cpp" line="184"/>
<source>Latvian</source>
- <translation>Lotyšský</translation>
+ <translation>Латвийский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="184"/>
+ <location filename="../map/CMapIMG.cpp" line="185"/>
<source>Romanian</source>
- <translation>Rumunský</translation>
+ <translation>Румынский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="185"/>
+ <location filename="../map/CMapIMG.cpp" line="186"/>
<source>Albanian</source>
- <translation>Albánský</translation>
+ <translation>Албанский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="186"/>
+ <location filename="../map/CMapIMG.cpp" line="187"/>
<source>Bosnian</source>
- <translation>Bosenský</translation>
+ <translation>Боснийский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="187"/>
+ <location filename="../map/CMapIMG.cpp" line="188"/>
<source>Lithuanian</source>
- <translation>Litevský</translation>
+ <translation>Литовский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="188"/>
+ <location filename="../map/CMapIMG.cpp" line="189"/>
<source>Serbian</source>
- <translation>Srbský</translation>
+ <translation>Сербский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="189"/>
+ <location filename="../map/CMapIMG.cpp" line="190"/>
<source>Macedonian</source>
- <translation>Makedonský</translation>
+ <translation>Македонский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="190"/>
+ <location filename="../map/CMapIMG.cpp" line="191"/>
<source>Bulgarian</source>
- <translation>Bulharský</translation>
+ <translation>Болгарский</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="247"/>
+ <location filename="../map/CMapIMG.cpp" line="248"/>
<source>Major highway</source>
- <translation>Dálnice</translation>
+ <translation>Автомагистраль</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="248"/>
+ <location filename="../map/CMapIMG.cpp" line="249"/>
<source>Principal highway</source>
- <translation>Silnice první třídy</translation>
+ <translation>Шоссе основное</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="249"/>
+ <location filename="../map/CMapIMG.cpp" line="250"/>
<source>Other highway</source>
- <translation>Jiné rychlostní silnice</translation>
+ <translation>Прочие загородные дороги</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="250"/>
+ <location filename="../map/CMapIMG.cpp" line="251"/>
<source>Arterial road</source>
- <translation>Rychlostní silnice</translation>
+ <translation>Городская магистраль</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="251"/>
+ <location filename="../map/CMapIMG.cpp" line="252"/>
<source>Collector road</source>
- <translation>Státní silnice</translation>
+ <translation>Улица крупная</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="252"/>
+ <location filename="../map/CMapIMG.cpp" line="253"/>
<source>Residential street</source>
- <translation>Silnice v obytné oblasti</translation>
+ <translation>Улица малая</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="253"/>
+ <location filename="../map/CMapIMG.cpp" line="254"/>
<source>Alley/Private road</source>
- <translation>Soukromá cesta</translation>
+ <translation>Переулок, внутриквартальный проезд</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="254"/>
+ <location filename="../map/CMapIMG.cpp" line="255"/>
<source>Highway ramp, low speed</source>
- <translation>Nájezd na dálnici/sjezd z dálnice</translation>
+ <translation>Наклонный съезд с путепровода</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="255"/>
+ <location filename="../map/CMapIMG.cpp" line="256"/>
<source>Highway ramp, high speed</source>
- <translation>Nájezd na dálnici/sjezd z dálnice</translation>
+ <translation>Наклонный съезд с путепровода скоростной</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="256"/>
+ <location filename="../map/CMapIMG.cpp" line="257"/>
<source>Unpaved road</source>
- <translation>Neasfaltovaná cesta</translation>
+ <translation>Грунтовая дорога</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="257"/>
+ <location filename="../map/CMapIMG.cpp" line="258"/>
<source>Major highway connector</source>
- <translation>Dalniční přivaděč</translation>
+ <translation>Соединительное шоссе</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="258"/>
+ <location filename="../map/CMapIMG.cpp" line="259"/>
<source>Roundabout</source>
- <translation>Kruhový objezd</translation>
+ <translation>Круговое движение</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="259"/>
+ <location filename="../map/CMapIMG.cpp" line="260"/>
<source>Railroad</source>
- <translation>Železnice, koleje</translation>
+ <translation>Железная дорога</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="260"/>
+ <location filename="../map/CMapIMG.cpp" line="261"/>
<source>Shoreline</source>
- <translation>Břeh</translation>
+ <translation>Береговая линия</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="261"/>
+ <location filename="../map/CMapIMG.cpp" line="262"/>
<source>Trail</source>
- <translation>Cesta</translation>
+ <translation>Тропа</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="262"/>
+ <location filename="../map/CMapIMG.cpp" line="263"/>
<source>Stream</source>
- <translation>Proud</translation>
+ <translation>Ручей</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="263"/>
+ <location filename="../map/CMapIMG.cpp" line="264"/>
<source>Time zone</source>
- <translation>Časové pásmo</translation>
+ <translation>Граница часового пояса</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="264"/>
<location filename="../map/CMapIMG.cpp" line="265"/>
+ <location filename="../map/CMapIMG.cpp" line="266"/>
<source>Ferry</source>
- <translation>Přívoz</translation>
+ <translation>Паром</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="266"/>
+ <location filename="../map/CMapIMG.cpp" line="267"/>
<source>State/province border</source>
- <translation>Státní/Zemská hranice</translation>
+ <translation>Граница области</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="267"/>
+ <location filename="../map/CMapIMG.cpp" line="268"/>
<source>County/parish border</source>
- <translation>Krajská/Obecní hranice</translation>
+ <translation>Граница района, округа</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="268"/>
+ <location filename="../map/CMapIMG.cpp" line="269"/>
<source>International border</source>
- <translation>Mezinárodní hranice</translation>
+ <translation>Международная граница</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="269"/>
+ <location filename="../map/CMapIMG.cpp" line="270"/>
<source>River</source>
- <translation>Řeka</translation>
+ <translation>Река</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="270"/>
+ <location filename="../map/CMapIMG.cpp" line="271"/>
<source>Minor land contour</source>
- <translation>Malá vrstevnice</translation>
+ <translation>Изолиния высоты, вспомогательная</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="271"/>
+ <location filename="../map/CMapIMG.cpp" line="272"/>
<source>Intermediate land contour</source>
- <translation>Střední vrstevnice</translation>
+ <translation>Изолиния высоты, основная</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="272"/>
+ <location filename="../map/CMapIMG.cpp" line="273"/>
<source>Major land contour</source>
- <translation>Velká vrstevnice</translation>
+ <translation>Изолиния высоты, утолщённая</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="273"/>
+ <location filename="../map/CMapIMG.cpp" line="274"/>
<source>Minor depth contour</source>
- <translation>Malá hloubková čára</translation>
+ <translation>Изолиния глубины, вспомогательная</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="274"/>
+ <location filename="../map/CMapIMG.cpp" line="275"/>
<source>Intermediate depth contour</source>
- <translation>Střední hloubková čára</translation>
+ <translation>Изолиния глубины, основная</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="275"/>
+ <location filename="../map/CMapIMG.cpp" line="276"/>
<source>Major depth contour</source>
- <translation>Velká hloubková čára</translation>
+ <translation>Изолиния глубины, утолщённая</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="276"/>
+ <location filename="../map/CMapIMG.cpp" line="277"/>
<source>Intermittent stream</source>
- <translation>Přerušovaný potok (Wadi)</translation>
+ <translation>Пересыхающая река, ручей или канава</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="277"/>
- <location filename="../map/CMapIMG.cpp" line="359"/>
+ <location filename="../map/CMapIMG.cpp" line="278"/>
+ <location filename="../map/CMapIMG.cpp" line="360"/>
<source>Airport runway</source>
- <translation>Přistávací dráha</translation>
+ <translation>Взлетно-посадочная полоса</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="278"/>
+ <location filename="../map/CMapIMG.cpp" line="279"/>
<source>Pipeline</source>
- <translation>Dálkové potrubí</translation>
+ <translation>Трубопровод</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="279"/>
+ <location filename="../map/CMapIMG.cpp" line="280"/>
<source>Powerline</source>
- <translation>Elektrické vedení</translation>
+ <translation>Линия электропередачи</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="280"/>
+ <location filename="../map/CMapIMG.cpp" line="281"/>
<source>Marine boundary</source>
- <translation>Hranice moře</translation>
+ <translation>Морская граница</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="281"/>
+ <location filename="../map/CMapIMG.cpp" line="282"/>
<source>Hazard boundary</source>
- <translation>Nebezpečná hranice</translation>
+ <translation>Опасность для плавания</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="346"/>
+ <location filename="../map/CMapIMG.cpp" line="347"/>
<source>Large urban area (>200K)</source>
- <translation>Velkoměstská oblast (>200 000)</translation>
+ <translation>Городская застройка (>200 тыс.ж)</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="347"/>
+ <location filename="../map/CMapIMG.cpp" line="348"/>
<source>Small urban area (<200K)</source>
- <translation>Maloměstská oblast (>200 000)</translation>
+ <translation>Городская застройка (<200 тыс.ж)</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="348"/>
+ <location filename="../map/CMapIMG.cpp" line="349"/>
<source>Rural housing area</source>
- <translation>Městská obytná oblast</translation>
+ <translation>Застройка сельского типа</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="349"/>
+ <location filename="../map/CMapIMG.cpp" line="350"/>
<source>Military base</source>
- <translation>Vojenská základna</translation>
+ <translation>Военная база</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="350"/>
+ <location filename="../map/CMapIMG.cpp" line="351"/>
<source>Parking lot</source>
- <translation>Parkoviště</translation>
+ <translation>Автостоянка</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="351"/>
+ <location filename="../map/CMapIMG.cpp" line="352"/>
<source>Parking garage</source>
- <translation>Parkovací budova</translation>
+ <translation>Гараж</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="352"/>
+ <location filename="../map/CMapIMG.cpp" line="353"/>
<source>Airport</source>
- <translation>Letiště</translation>
+ <translation>Аэропорт</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="353"/>
+ <location filename="../map/CMapIMG.cpp" line="354"/>
<source>Shopping center</source>
- <translation>Nákupní středisko</translation>
+ <translation>Место для торговли</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="354"/>
+ <location filename="../map/CMapIMG.cpp" line="355"/>
<source>Marina</source>
- <translation>Přístav</translation>
+ <translation>Пристань</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="355"/>
+ <location filename="../map/CMapIMG.cpp" line="356"/>
<source>University/College</source>
- <translation>Univerzita/Vysoká škola</translation>
+ <translation>Университета или колледж</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="356"/>
+ <location filename="../map/CMapIMG.cpp" line="357"/>
<source>Hospital</source>
- <translation>Nemocnice</translation>
+ <translation>Больница</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="357"/>
+ <location filename="../map/CMapIMG.cpp" line="358"/>
<source>Industrial complex</source>
- <translation>Průmyslový celek</translation>
+ <translation>Промышленная зона</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="358"/>
+ <location filename="../map/CMapIMG.cpp" line="359"/>
<source>Reservation</source>
- <translation>Chráněné území</translation>
+ <translation>Резервация, заповедник</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="360"/>
+ <location filename="../map/CMapIMG.cpp" line="361"/>
<source>Man-made area</source>
- <translation>Zástavba</translation>
+ <translation>Здание, искусственное сооружение</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="361"/>
+ <location filename="../map/CMapIMG.cpp" line="362"/>
<source>Sports complex</source>
- <translation>Oblast pro tělesné činnosti</translation>
+ <translation>Спортивный комплекс</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="362"/>
+ <location filename="../map/CMapIMG.cpp" line="363"/>
<source>Golf course</source>
- <translation>Golfové hřiště</translation>
+ <translation>Площадка для гольфа</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="363"/>
+ <location filename="../map/CMapIMG.cpp" line="364"/>
<source>Cemetery</source>
- <translation>Hřbitov</translation>
+ <translation>Кладбище</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="364"/>
<location filename="../map/CMapIMG.cpp" line="365"/>
<location filename="../map/CMapIMG.cpp" line="366"/>
+ <location filename="../map/CMapIMG.cpp" line="367"/>
<source>National park</source>
- <translation>Národní park</translation>
+ <translation>Национальный парк</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="367"/>
+ <location filename="../map/CMapIMG.cpp" line="368"/>
<source>City park</source>
- <translation>Městské sady</translation>
+ <translation>Городской парк</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="368"/>
<location filename="../map/CMapIMG.cpp" line="369"/>
<location filename="../map/CMapIMG.cpp" line="370"/>
+ <location filename="../map/CMapIMG.cpp" line="371"/>
<source>State park</source>
- <translation>Státní park</translation>
+ <translation>Парк регионального значения</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="371"/>
+ <location filename="../map/CMapIMG.cpp" line="372"/>
<source>Forest</source>
- <translation>Les</translation>
+ <translation>Лес</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="372"/>
+ <location filename="../map/CMapIMG.cpp" line="373"/>
<source>Ocean</source>
- <translation>Oceán</translation>
+ <translation>Море/океан</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="373"/>
- <location filename="../map/CMapIMG.cpp" line="375"/>
- <location filename="../map/CMapIMG.cpp" line="385"/>
+ <location filename="../map/CMapIMG.cpp" line="374"/>
+ <location filename="../map/CMapIMG.cpp" line="376"/>
+ <location filename="../map/CMapIMG.cpp" line="386"/>
<source>Blue (unknown)</source>
- <translation>Modrá (neznámé)</translation>
+ <translation>Синий (неизвестно)</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="374"/>
+ <location filename="../map/CMapIMG.cpp" line="375"/>
<source>Sea</source>
- <translation>Moře</translation>
+ <translation>Море</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="376"/>
<location filename="../map/CMapIMG.cpp" line="377"/>
- <location filename="../map/CMapIMG.cpp" line="384"/>
+ <location filename="../map/CMapIMG.cpp" line="378"/>
+ <location filename="../map/CMapIMG.cpp" line="385"/>
<source>Large lake</source>
- <translation>Velké jezero</translation>
+ <translation>Озеро, большое</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="378"/>
<location filename="../map/CMapIMG.cpp" line="379"/>
+ <location filename="../map/CMapIMG.cpp" line="380"/>
<source>Medium lake</source>
- <translation>Střední jezero</translation>
+ <translation>Озеро, среднее</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="380"/>
<location filename="../map/CMapIMG.cpp" line="381"/>
+ <location filename="../map/CMapIMG.cpp" line="382"/>
<source>Small lake</source>
- <translation>Malé jezero</translation>
+ <translation>Озеро, малое</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="382"/>
<location filename="../map/CMapIMG.cpp" line="383"/>
+ <location filename="../map/CMapIMG.cpp" line="384"/>
<source>Major lake</source>
- <translation>Velmi velké jezero</translation>
+ <translation>Озеро, крупное</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="386"/>
+ <location filename="../map/CMapIMG.cpp" line="387"/>
<source>Major River</source>
- <translation>Veletok</translation>
+ <translation>Река, крупная</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="387"/>
+ <location filename="../map/CMapIMG.cpp" line="388"/>
<source>Large River</source>
- <translation>Velká řeka</translation>
+ <translation>Река, большая</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="388"/>
+ <location filename="../map/CMapIMG.cpp" line="389"/>
<source>Medium River</source>
- <translation>Střední řeka</translation>
+ <translation>Река, средняя</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="389"/>
+ <location filename="../map/CMapIMG.cpp" line="390"/>
<source>Small River</source>
- <translation>Malá řeka</translation>
+ <translation>Река, малая</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="392"/>
+ <location filename="../map/CMapIMG.cpp" line="393"/>
<source>Intermittent water</source>
- <translation>Přerušovaná voda</translation>
+ <translation>Пересыхающая река, озеро</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="393"/>
+ <location filename="../map/CMapIMG.cpp" line="394"/>
<source>Wetland/Swamp</source>
- <translation>Močál/Bažina</translation>
+ <translation>Болото</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="394"/>
+ <location filename="../map/CMapIMG.cpp" line="395"/>
<source>Glacier</source>
- <translation>Ledovec</translation>
+ <translation>Ледник</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="395"/>
+ <location filename="../map/CMapIMG.cpp" line="396"/>
<source>Orchard/Plantation</source>
- <translation>Sad/Plantáž</translation>
+ <translation>Фруктовый сад, огород</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="396"/>
+ <location filename="../map/CMapIMG.cpp" line="397"/>
<source>Scrub</source>
- <translation>Křoví</translation>
+ <translation>Кустарник</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="397"/>
+ <location filename="../map/CMapIMG.cpp" line="398"/>
<source>Tundra</source>
- <translation>Tundra</translation>
+ <translation>Тундра</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="398"/>
+ <location filename="../map/CMapIMG.cpp" line="399"/>
<source>Flat</source>
- <translation>Rovina</translation>
+ <translation>Равнина</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="399"/>
+ <location filename="../map/CMapIMG.cpp" line="400"/>
<source>???</source>
<translation>???</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="435"/>
+ <location filename="../map/CMapIMG.cpp" line="436"/>
<source>Failed to read: </source>
- <translation>Nepodařilo se přečíst: </translation>
+ <translation>Не удалось читать: </translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="478"/>
+ <location filename="../map/CMapIMG.cpp" line="479"/>
<source>Failed to open: </source>
- <translation>Nepodařilo se otevřít: </translation>
+ <translation>Не удалось открыть: </translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="502"/>
- <location filename="../map/CMapIMG.cpp" line="506"/>
+ <location filename="../map/CMapIMG.cpp" line="503"/>
+ <location filename="../map/CMapIMG.cpp" line="507"/>
<source>Bad file format: </source>
- <translation>Špatný formát souboru: </translation>
+ <translation>Неверный формат файла: </translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="595"/>
+ <location filename="../map/CMapIMG.cpp" line="596"/>
<source>Failed to read file structure: </source>
- <translation>Nepodařilo se přečíst stavbu souboru: </translation>
+ <translation>Не удалось читать структуру файла: </translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="630"/>
+ <location filename="../map/CMapIMG.cpp" line="631"/>
<source>Loading %1</source>
- <translation>Nahrává se %1</translation>
+ <translation>Идет загрузка %1</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="636"/>
+ <location filename="../map/CMapIMG.cpp" line="637"/>
<source>User abort: </source>
- <translation>Zrušeno uživatelem: </translation>
+ <translation>Прекращение пользователем: </translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="639"/>
+ <location filename="../map/CMapIMG.cpp" line="640"/>
<source>File is NT format. QMapShack is unable to read map files with NT format: </source>
- <translation>Soubor je ve formátu NT. QMapShack nedokáže číst mapové soubory ve formátu NT: </translation>
+ <translation>Файл имеет формат NT. QMapShack не может считывать этот формат: </translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="730"/>
+ <location filename="../map/CMapIMG.cpp" line="731"/>
<source>File contains locked / encrypted data. Garmin does not want you to use this file with any other software than the one supplied by Garmin.</source>
- <translation>Soubor obsahuje zamknutá/zašifrovaná data. Garmin nechce, aby byl tento soubor použit s jiným programem než dodaným Garminem.</translation>
+ <translation>Файл содержит заблокированные / зашифрованные данные. Garmin позволяет использовать этот файл только с помощью программного обеспечения Garmin.</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2305"/>
- <location filename="../map/CMapIMG.cpp" line="2311"/>
- <location filename="../map/CMapIMG.cpp" line="2315"/>
+ <location filename="../map/CMapIMG.cpp" line="2342"/>
+ <location filename="../map/CMapIMG.cpp" line="2348"/>
+ <location filename="../map/CMapIMG.cpp" line="2352"/>
<source>Point of Interest</source>
- <translation>Podivuhodnost</translation>
+ <translation>Достопримечательность</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2401"/>
+ <location filename="../map/CMapIMG.cpp" line="2438"/>
<source>Unknown</source>
- <translation>Neznámý</translation>
+ <translation>Неизвестно</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2443"/>
- <location filename="../map/CMapIMG.cpp" line="2451"/>
- <location filename="../map/CMapIMG.cpp" line="2458"/>
+ <location filename="../map/CMapIMG.cpp" line="2480"/>
+ <location filename="../map/CMapIMG.cpp" line="2488"/>
+ <location filename="../map/CMapIMG.cpp" line="2495"/>
<source>Area</source>
- <translation>Oblast</translation>
+ <translation>Область</translation>
</message>
</context>
<context>
@@ -2627,17 +2669,17 @@ If it's no fun, why don't you provide maps? Well to host maps ready fo
<message>
<location filename="../map/CMapList.cpp" line="202"/>
<source>Deactivate</source>
- <translation>Vypnout</translation>
+ <translation>Деактивировать</translation>
</message>
<message>
<location filename="../map/CMapList.cpp" line="202"/>
<source>Activate</source>
- <translation>Zapnout</translation>
+ <translation>Активировать</translation>
</message>
<message>
<location filename="../map/CMapList.cpp" line="227"/>
<source>Where do you want to store maps?</source>
- <translation>Kde chcete ukládat mapy?</translation>
+ <translation>Где вы хотите хранить карты?</translation>
</message>
</context>
<context>
@@ -2645,17 +2687,17 @@ If it's no fun, why don't you provide maps? Well to host maps ready fo
<message>
<location filename="../map/CMapMAP.cpp" line="46"/>
<source>Failed ...</source>
- <translation>Nepodařilo se...</translation>
+ <translation>Не удалось...</translation>
</message>
<message>
<location filename="../map/CMapMAP.cpp" line="63"/>
<source>Failed to open: </source>
- <translation>Nepodařilo se otevřít: </translation>
+ <translation>Не удалось открыть: </translation>
</message>
<message>
<location filename="../map/CMapMAP.cpp" line="73"/>
<source>Bad file format: </source>
- <translation>Špatný formát souboru: </translation>
+ <translation>Неверный формат файла: </translation>
</message>
</context>
<context>
@@ -2663,17 +2705,17 @@ If it's no fun, why don't you provide maps? Well to host maps ready fo
<message>
<location filename="../map/CMapPathSetup.cpp" line="47"/>
<source>Add or remove paths containing maps. There can be multiple maps in a path but no sub-path is parsed. Supported formats are: %1</source>
- <translation>Přidat nebo odstranit cesty obsahující mapy. V cestě může být více map, ale žádná podcesta není zpracována. Podporovanými formáty jsou: %1</translation>
+ <translation>Добавить или удалить путь с картами. Несколько карт может быть в пути, но вложенные пути не поддерживаются. Поддерживаемые форматы: %1</translation>
</message>
<message>
<location filename="../map/CMapPathSetup.cpp" line="62"/>
<source>Select map path...</source>
- <translation>Vybrat cestu k mapě...</translation>
+ <translation>Выбрать путь к картам...</translation>
</message>
<message>
<location filename="../map/CMapPathSetup.cpp" line="81"/>
<source>Select root path...</source>
- <translation>Vybrat cestu ke kořeni...</translation>
+ <translation>Выбрать корневой путь...</translation>
</message>
</context>
<context>
@@ -2688,22 +2730,22 @@ If it's no fun, why don't you provide maps? Well to host maps ready fo
<location filename="../map/CMapRMAP.cpp" line="209"/>
<location filename="../map/CMapRMAP.cpp" line="237"/>
<source>Error...</source>
- <translation>Chyba...</translation>
+ <translation>Ошибка...</translation>
</message>
<message>
<location filename="../map/CMapRMAP.cpp" line="48"/>
<source>This is not a TwoNav RMAP file.</source>
- <translation>Toto není soubor TwoNav RMAP</translation>
+ <translation>Это не файл TwoNav RMAP.</translation>
</message>
<message>
<location filename="../map/CMapRMAP.cpp" line="57"/>
<source>Unknown sub-format.</source>
- <translation>Neznámý podformát.</translation>
+ <translation>Неизвестный подформат.</translation>
</message>
<message>
<location filename="../map/CMapRMAP.cpp" line="127"/>
<source>Unknown version.</source>
- <translation>Neznámá verze</translation>
+ <translation>Неизвестная версия.</translation>
</message>
<message>
<location filename="../map/CMapRMAP.cpp" line="144"/>
@@ -2711,12 +2753,12 @@ If it's no fun, why don't you provide maps? Well to host maps ready fo
<location filename="../map/CMapRMAP.cpp" line="187"/>
<location filename="../map/CMapRMAP.cpp" line="209"/>
<source>Failed to read reference point.</source>
- <translation>Nepodařilo se přečíst referenční bod.</translation>
+ <translation>Не удалось читать опорную точку.</translation>
</message>
<message>
<location filename="../map/CMapRMAP.cpp" line="237"/>
<source>Unknown projection and datum (%1%2).</source>
- <translation>Neznámé promítání a datum (%1%2).</translation>
+ <translation>Неизвестные проекция и датум (%1%2).</translation>
</message>
</context>
<context>
@@ -2726,36 +2768,36 @@ If it's no fun, why don't you provide maps? Well to host maps ready fo
<location filename="../map/CMapTMS.cpp" line="77"/>
<location filename="../map/CMapTMS.cpp" line="136"/>
<source>Error...</source>
- <translation>Chyba...</translation>
+ <translation>Ошибка...</translation>
</message>
<message>
<location filename="../map/CMapTMS.cpp" line="67"/>
<source>Failed to open %1</source>
- <translation>Nepodařilo se otevřít %1</translation>
+ <translation>Не удалось открыть %1</translation>
</message>
<message>
<location filename="../map/CMapTMS.cpp" line="77"/>
<source>Failed to read: %1
line %2, column %3:
%4</source>
- <translation>Chyba při čtení: %1
-Řádek %2, Sloupec %3:
+ <translation>Не удалось читать %1
+строка %2, столбец %3:
%4</translation>
</message>
<message>
<location filename="../map/CMapTMS.cpp" line="115"/>
<source>Layer %1</source>
- <translation>Vrstva %1</translation>
+ <translation>Слой %1</translation>
</message>
<message>
<location filename="../map/CMapTMS.cpp" line="130"/>
<source>This map requires OpenSSL support. However due to legal restrictions in some countries OpenSSL is not packaged with QMapShack. You can have a look at the <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
- <translation>Tato mapa vyžaduje podporu pro OpenSSL. Nicméně kvůli právním omezením v některých zemích není OpenSSL k QMapShack přibaleno. Můžete se podívat na <a href='https://www.openssl.org/community/binaries.html'>stránky OpenSSL</a>, kde najdete spustitelné soubory. Musíte zkopírovat libeay32.dll a ssleay32.dll do adresáře s programem QMapShack.</translation>
+ <translation>Эта карта требует поддержки OpenSSL. Однако для соблюдения законов некоторых стран OpenSSL не поставляется с QMapShack. Вы можете посетить <a href='https://www.openssl.org/community/binaries.html'> домашнюю страницу OpenSSL</a> для бинарных файлов. Вы должны скопировать libeay32.dll и ssleay32.dll в папку программы QMapShack.</translation>
</message>
<message>
<location filename="../map/CMapTMS.cpp" line="299"/>
<source><b>%1</b>: %2 tiles pending<br/></source>
- <translation><b>%1</b>: %2 dlaždic čeká<br/></translation>
+ <translation><b>%1</b>: %2 плиток ожидается<br/></translation>
</message>
</context>
<context>
@@ -2764,50 +2806,49 @@ line %2, column %3:
<location filename="../map/CMapVRT.cpp" line="45"/>
<location filename="../map/CMapVRT.cpp" line="59"/>
<location filename="../map/CMapVRT.cpp" line="88"/>
- <location filename="../map/CMapVRT.cpp" line="126"/>
+ <location filename="../map/CMapVRT.cpp" line="133"/>
<source>Error...</source>
- <translation>Chyba...</translation>
+ <translation>Ошибка...</translation>
</message>
<message>
<location filename="../map/CMapVRT.cpp" line="45"/>
<location filename="../map/CMapVRT.cpp" line="59"/>
<source>Failed to load file: %1</source>
- <translation>Nepodařilo se nahrát soubor %1
-</translation>
+ <translation>Не удалось загрузить файл: %1</translation>
</message>
<message>
<location filename="../map/CMapVRT.cpp" line="88"/>
<source>File must be 8 bit palette or gray indexed.</source>
- <translation>Soubor musí mít 8 bitovou barevnou paletu nebo být v odstínech šedi.</translation>
+ <translation>Файл должен быть 8 битной палитрой или серый проиндексирован.</translation>
</message>
<message>
- <location filename="../map/CMapVRT.cpp" line="126"/>
+ <location filename="../map/CMapVRT.cpp" line="133"/>
<source>No georeference information found.</source>
- <translation>Nenalezeny žádné údaje o vyjádření prostorových vztahů.</translation>
+ <translation>Не удалось найти геопозиционную информацию.</translation>
</message>
</context>
<context>
<name>CMapVrtBuilder</name>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="28"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="29"/>
<source>Build GDAL VRT</source>
- <translation>Sestavit GDAL VRT</translation>
+ <translation>Построить GDAL VRT</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="46"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="47"/>
<source>Select files...</source>
- <translation>Vybrat soubory...</translation>
+ <translation>Выбрать файлы...</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="70"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="71"/>
<source>Select target file...</source>
- <translation>Vybrat cílový soubor...</translation>
+ <translation>Выбрать целевой файл...</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="114"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="115"/>
<source>!!! done !!!
</source>
- <translation>Hotovo!</translation>
+ <translation>Сделано!</translation>
</message>
</context>
<context>
@@ -2820,48 +2861,48 @@ line %2, column %3:
<location filename="../map/CMapWMTS.cpp" line="157"/>
<location filename="../map/CMapWMTS.cpp" line="217"/>
<source>Error...</source>
- <translation>Chyba...</translation>
+ <translation>Ошибка...</translation>
</message>
<message>
<location filename="../map/CMapWMTS.cpp" line="43"/>
<source>Failed to open %1</source>
- <translation>Nepodařilo se otevřít %1</translation>
+ <translation>Не удалось открыть %1</translation>
</message>
<message>
<location filename="../map/CMapWMTS.cpp" line="53"/>
<source>Failed to read: %1
line %2, column %3:
%4</source>
- <translation>Chyba při čtení: %1
-Řádek %2, Sloupec %3:
+ <translation>Не удалось читать %1
+строка %2, столбец %3:
%4</translation>
</message>
<message>
<location filename="../map/CMapWMTS.cpp" line="63"/>
<source>Failed to read: %1
Unknown structure.</source>
- <translation>Chyba při čtení: %1
-Neznámá stavba.</translation>
+ <translation>Не удалось читать: %1.
+Неизвестная структура.</translation>
</message>
<message>
<location filename="../map/CMapWMTS.cpp" line="72"/>
<source>Unexpected service. '* WMTS 1.0.0' is expected. '%1 %2' is read.</source>
- <translation>Neočekávaná služba. Očekáváno '* WMTS 1.0.0'. Přečteno '%1 %2'.</translation>
+ <translation>Неожиданный сервис. Ожидается '* WMTS 1.0.0'. Получено '%1 %2'.</translation>
</message>
<message>
<location filename="../map/CMapWMTS.cpp" line="151"/>
<source>This map requires OpenSSL support. However due to legal restrictions in some countries OpenSSL is not packaged with QMapShack. You can have a look at the <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
- <translation>Tato mapa vyžaduje podporu pro OpenSSL. Nicméně kvůli právním omezením v některých zemích není OpenSSL k QMapShack přibaleno. Můžete se podívat na <a href='https://www.openssl.org/community/binaries.html'>stránky OpenSSL</a>, kde najdete spustitelné soubory. Musíte zkopírovat libeay32.dll a ssleay32.dll do adresáře s programem QMapShack.</translation>
+ <translation>Эта карта требует поддержки OpenSSL. Однако для соблюдения законов некоторых стран OpenSSL не поставляется с QMapShack. Вы можете посетить <a href='https://www.openssl.org/community/binaries.html'> домашнюю страницу OpenSSL</a> для бинарных файлов. Вы должны скопировать libeay32.dll и ssleay32.dll в папку программы QMapShack.</translation>
</message>
<message>
<location filename="../map/CMapWMTS.cpp" line="217"/>
<source>No georeference information found.</source>
- <translation>Nenalezeny žádné údaje o soustavě souřadnic.</translation>
+ <translation>Не удалось найти геопозиционную информацию.</translation>
</message>
<message>
<location filename="../map/CMapWMTS.cpp" line="413"/>
<source><b>%1</b>: %2 tiles pending<br/></source>
- <translation><b>%1</b>: %2 dlaždic čeká<br/></translation>
+ <translation><b>%1</b>: %2 плиток ожидается<br/></translation>
</message>
</context>
<context>
@@ -2870,17 +2911,17 @@ Neznámá stavba.</translation>
<location filename="../mouse/CMouseEditArea.cpp" line="28"/>
<location filename="../mouse/CMouseEditArea.cpp" line="35"/>
<source>Area</source>
- <translation>Oblast</translation>
+ <translation>Область</translation>
</message>
<message>
<location filename="../mouse/CMouseEditArea.cpp" line="37"/>
<source><b>Edit Area</b><br/>Select a function and a routing mode via the tool buttons. Next select a point of the line. Only points marked with a large square can be changed. The ones with a black dot are subpoints introduced by routing.<br/></source>
- <translation><b>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>
+ <translation><b>Изменить область</b><br/>Выберите функцию и режим маршрутизации с помощью кнопок панели инструментов. Потом выберите точку на линии. Только точки, отмеченные большим квадратиком могут быть изменены. Те с черной точкой являются подточки добавлены маршрутизацией<br/></translation>
</message>
<message>
<location filename="../mouse/CMouseEditArea.cpp" line="96"/>
<source>area</source>
- <translation>Oblast</translation>
+ <translation>область</translation>
</message>
</context>
<context>
@@ -2889,17 +2930,17 @@ Neznámá stavba.</translation>
<location filename="../mouse/CMouseEditRte.cpp" line="30"/>
<location filename="../mouse/CMouseEditRte.cpp" line="37"/>
<source>Route</source>
- <translation>Cesta</translation>
+ <translation>Маршрут</translation>
</message>
<message>
<location filename="../mouse/CMouseEditRte.cpp" line="39"/>
<source><b>Edit Route Points</b><br/>Select a function and a routing mode via the tool buttons. Next select a point of the line. Only points marked with a large square can be changed. The ones with a black dot are subpoints introduced by routing.<br/></source>
- <translation><b>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>
+ <translation><b>Изменить точки маршрута</b><br/>Выберите функцию и режим маршрутизации с помощью кнопок панели инструментов. Потом выберите точку на линии. Только точки, отмеченные большим квадратиком могут быть изменены. Точки с черным пунктиром являются подточки введены маршрутизацией<br/></translation>
</message>
<message>
<location filename="../mouse/CMouseEditRte.cpp" line="107"/>
<source>route</source>
- <translation>Cesta</translation>
+ <translation>маршрут</translation>
</message>
</context>
<context>
@@ -2908,65 +2949,70 @@ Neznámá stavba.</translation>
<location filename="../mouse/CMouseEditTrk.cpp" line="28"/>
<location filename="../mouse/CMouseEditTrk.cpp" line="35"/>
<source>Track</source>
- <translation>Stopa</translation>
+ <translation>Трек</translation>
</message>
<message>
<location filename="../mouse/CMouseEditTrk.cpp" line="38"/>
<source><b>Edit Track Points</b><br/>Select a function and a routing mode via the tool buttons. Next select a point of the line. Only points marked with a large square can be changed. The ones with a black dot are subpoints introduced by routing.<br/></source>
- <translation><b>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>
+ <translation><b>Изменить точки трека</b><br/>Выберите функцию и режим маршрутизации с помощью кнопок панели инструментов. Потом выберите точку на линии. Только точки, отмеченные большим квадратиком могут быть изменены. Точки с черным пунктиром являются подточки введены маршрутизацией<br/></translation>
</message>
<message>
<location filename="../mouse/CMouseEditTrk.cpp" line="80"/>
<source>Warning!</source>
- <translation>Varování!</translation>
+ <translation>Предупреждение!</translation>
</message>
<message>
<location filename="../mouse/CMouseEditTrk.cpp" line="80"/>
<source>This will replace all data of the original by a simple line of coordinates. All other data will be lost permanently.</source>
- <translation>Tímto budou všechny původní údaje nahrazeny jednoduchou čárou souřadnic. Všechna ostatní data budou trvale ztracena.</translation>
+ <translation>Это заменит все данные оригинала простой линией. Все остальные данные будут потеряны безвозвратно.</translation>
</message>
<message>
<location filename="../mouse/CMouseEditTrk.cpp" line="112"/>
<source>track</source>
- <translation>Stopa</translation>
+ <translation>трек</translation>
</message>
</context>
<context>
<name>CMouseNormal</name>
<message>
<location filename="../mouse/CMouseNormal.cpp" line="39"/>
- <source>Add Waypoint</source>
- <translation>Přidat cestovní bod</translation>
+ <source>Add POI as Waypoint</source>
+ <translation>Добавить достопримечательность как маршрутную точку</translation>
</message>
<message>
<location filename="../mouse/CMouseNormal.cpp" line="40"/>
- <source>Add Track</source>
- <translation>Přidat stopu</translation>
+ <source>Add Waypoint</source>
+ <translation>Добавить маршрутную точку</translation>
</message>
<message>
<location filename="../mouse/CMouseNormal.cpp" line="41"/>
- <source>Add Route</source>
- <translation>Přidat cestu</translation>
+ <source>Add Track</source>
+ <translation>Добавить трек</translation>
</message>
<message>
<location filename="../mouse/CMouseNormal.cpp" line="42"/>
+ <source>Add Route</source>
+ <translation>Добавить маршрут</translation>
+ </message>
+ <message>
+ <location filename="../mouse/CMouseNormal.cpp" line="43"/>
<source>Add Area</source>
- <translation>Přidat oblast</translation>
+ <translation>Добавить область</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="44"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="45"/>
<source>Select Items On Map</source>
- <translation>Vybrat prvky na mapě</translation>
+ <translation>Выбрать элементы на карте</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="46"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="47"/>
<source>Copy position</source>
- <translation>Kopírovat polohu</translation>
+ <translation>Скопировать позицию</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="47"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="48"/>
<source>Copy position (Grid)</source>
- <translation>Kopírovat polohu (mřížka)</translation>
+ <translation>Скопировать позицию (координатная сетка)</translation>
</message>
</context>
<context>
@@ -2974,48 +3020,48 @@ Neznámá stavba.</translation>
<message>
<location filename="../mouse/CMousePrint.cpp" line="31"/>
<source><b>Save(Print) Map</b><br/>Select a rectangular area on the map. Use the left mouse button and move the mouse. Abort with a right click. Adjust the selection by point-click-move on the corners.</source>
- <translation><b>Uložit mapu (vytisknout)</b><br/>Vyberte na mapě obdélníkovou oblast. použijte levé tlačítko myši a pohybujte myší. Zrušte výběr klepnutím pravým tlačítkem myši. Výběr lze upravit posunutím rohových bodů myší. Uložení/Vytištění následuje po klepnutí levým tlačítkem myši na odpovídající symbol uprostřed výběru.</translation>
+ <translation><b>Сохранить (Печатать) карту</b><br/> Выберите прямоугольную область на карте. Используйте левую кнопку мышки и двигайте её. Прервать с правой кнопкой мышки. Уточните выбор с помощью метода указать-нажать-переместить по углам.</translation>
</message>
</context>
<context>
<name>CMouseRangeTrk</name>
<message>
- <location filename="../mouse/CMouseRangeTrk.cpp" line="227"/>
+ <location filename="../mouse/CMouseRangeTrk.cpp" line="224"/>
<source><b>Select Range</b><br/>Select first track point with left mouse button. And then a second one. Leave range selection with a click of the right mouse button.<br/></source>
- <translation type="unfinished"></translation>
+ <translation><b>Выбрать интервал</b><br/> Выберите первую точку трека с левой кнопкой мышки. А затем второй. Закончите выбор интервала с помощью щелчка правой кнопкой мышки. <br/></translation>
</message>
</context>
<context>
<name>CMouseSelect</name>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="31"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="32"/>
<source><b>Select Items On Map</b><br/>Select a rectangular area on the map. Use the left mouse button and move the mouse. Abort with a right click. Adjust the selection by point-click-move on the corners.</source>
- <translation><b>Vybrat prvky na mapě</b><br/>Vyberte na mapě klepnutím levým tlačítkem myši obdélníkovou oblast. Výběr zrušíte klepnutím pravým tlačítkem myši. Výběr lze upravit posunutím rohových bodů myší.</translation>
+ <translation><b>Выбрать элементы на карте</b><br/> Выберите прямоугольную область на карте. Используйте левую кнопку мышки и двигайте её. Прервать с правой кнопкой мышки. Уточните выбор с помощью метода указать-нажать-переместить по углам.</translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="96"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="98"/>
<source><b>Selected:</b><br/></source>
- <translation><b>Vybráno:</b><br/></translation>
+ <translation><b>Выбрано:</b><br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="104"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="106"/>
<source>%1 waypoints<br/></source>
- <translation>%1 cestovní body<br/></translation>
+ <translation>%1 маршрутных точек<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="99"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="101"/>
<source>%1 tracks<br/></source>
- <translation>%1 stopy<br/></translation>
+ <translation>%1 треков<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="109"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="111"/>
<source>%1 routes<br/></source>
- <translation>%1 cesty<br/></translation>
+ <translation>%1 маршрутов<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="114"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="116"/>
<source>%1 areas<br/></source>
- <translation>%1 oblasti<br/></translation>
+ <translation>%1 областей<br/></translation>
</message>
</context>
<context>
@@ -3023,7 +3069,7 @@ Neznámá stavba.</translation>
<message>
<location filename="../widgets/CPhotoAlbum.cpp" line="73"/>
<source>Select images...</source>
- <translation>Vybrat obrázky...</translation>
+ <translation>Выбрать изображения...</translation>
</message>
</context>
<context>
@@ -3031,12 +3077,12 @@ Neznámá stavba.</translation>
<message>
<location filename="../plot/CPlot.cpp" line="55"/>
<source>distance [%1]</source>
- <translation>Vzdálenost [%1]</translation>
+ <translation>расстояние [%1]</translation>
</message>
<message>
<location filename="../plot/CPlot.cpp" line="60"/>
<source>time</source>
- <translation>Čas</translation>
+ <translation>время</translation>
</message>
</context>
<context>
@@ -3044,12 +3090,12 @@ Neznámá stavba.</translation>
<message>
<location filename="../plot/CPlotProfile.cpp" line="79"/>
<source>distance [%1]</source>
- <translation>Vzdálenost [%1]</translation>
+ <translation>расстояние [%1]</translation>
</message>
<message>
<location filename="../plot/CPlotProfile.cpp" line="80"/>
<source>alt. [%1]</source>
- <translation>Výška [%1]</translation>
+ <translation>высота [%1]</translation>
</message>
</context>
<context>
@@ -3057,22 +3103,22 @@ Neznámá stavba.</translation>
<message>
<location filename="../print/CPrintDialog.cpp" line="67"/>
<source>Print Map...</source>
- <translation>Tisk mapy...</translation>
+ <translation>Печатать карту...</translation>
</message>
<message>
<location filename="../print/CPrintDialog.cpp" line="74"/>
<source>Save Map as Image...</source>
- <translation>Uložit mapu jako obrázek...</translation>
+ <translation>Сохранить карту как изображение...</translation>
</message>
<message>
<location filename="../print/CPrintDialog.cpp" line="94"/>
<source>Printer Properties...</source>
- <translation>Vlastnosti tiskárny...</translation>
+ <translation>Свойства принтера...</translation>
</message>
<message>
<location filename="../print/CPrintDialog.cpp" line="169"/>
<source>Pages: %1 x %2</source>
- <translation>Strany: %1 x %2</translation>
+ <translation>Страницы: %1 x %2</translation>
</message>
<message>
<location filename="../print/CPrintDialog.cpp" line="170"/>
@@ -3081,21 +3127,21 @@ Neznámá stavba.</translation>
%1x%2 pixel
x: %3 m/px
y: %4 m/px</source>
- <translation>Přibližujte a oddalujte pomocí kolečka myši na mapě dole pro změnu rozlišení:
+ <translation>Использовать колёсико мышки на нижней карте для изменения разрешения:
-%1x%2 pixel
-x: %3 m/px
-y: %4 m/px</translation>
+%1x%2 пиксель
+x: %3 м/пиксель
+y: %4 м/пиксель</translation>
</message>
<message>
<location filename="../print/CPrintDialog.cpp" line="216"/>
<source>Printing pages.</source>
- <translation>Probíhá tisk stran.</translation>
+ <translation>Вывод страниц на печать.</translation>
</message>
<message>
<location filename="../print/CPrintDialog.cpp" line="260"/>
<source>Save map...</source>
- <translation>Uložit mapu...</translation>
+ <translation>Сохранить карту...</translation>
</message>
</context>
<context>
@@ -3103,12 +3149,12 @@ y: %4 m/px</translation>
<message>
<location filename="../helpers/CProgressDialog.cpp" line="40"/>
<source>Elapsed time: %1</source>
- <translation>Uplynulý čas: %1</translation>
+ <translation>Истёкшее время: %1</translation>
</message>
<message>
- <location filename="../helpers/CProgressDialog.cpp" line="82"/>
+ <location filename="../helpers/CProgressDialog.cpp" line="86"/>
<source>Elapsed time: %1 seconds.</source>
- <translation>Uplynulý čas: %1 sekund.</translation>
+ <translation>Истёкшее время: %1 сек.</translation>
</message>
</context>
<context>
@@ -3116,17 +3162,17 @@ y: %4 m/px</translation>
<message>
<location filename="../grid/CProjWizard.cpp" line="62"/>
<source>north</source>
- <translation>Sever</translation>
+ <translation>север</translation>
</message>
<message>
<location filename="../grid/CProjWizard.cpp" line="63"/>
<source>south</source>
- <translation>Jih</translation>
+ <translation>юг</translation>
</message>
<message>
<location filename="../grid/CProjWizard.cpp" line="222"/>
<source>Error...</source>
- <translation>Chyba...</translation>
+ <translation>Ошибка...</translation>
</message>
<message>
<location filename="../grid/CProjWizard.cpp" line="222"/>
@@ -3134,9 +3180,9 @@ y: %4 m/px</translation>
'%1'
is not a valid coordinate system definition:
%2</source>
- <translation>Zadání:
+ <translation>Значение
'%1'
-není platným vymezením soustavy souřadnic
+недопустимое определение координатной системы:
%2</translation>
</message>
</context>
@@ -3145,12 +3191,12 @@ není platným vymezením soustavy souřadnic
<message>
<location filename="../gis/wpt/CProjWpt.cpp" line="62"/>
<source>Edit name...</source>
- <translation>Upravit název...</translation>
+ <translation>Изменить имя...</translation>
</message>
<message>
<location filename="../gis/wpt/CProjWpt.cpp" line="62"/>
<source>Enter new waypoint name.</source>
- <translation>Zadat nový název cestovního bodu.</translation>
+ <translation>Ввести новое имя маршрутной точки.</translation>
</message>
</context>
<context>
@@ -3158,117 +3204,117 @@ není platným vymezením soustavy souřadnic
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="308"/>
<source>Migrating database from version 4 to 5.</source>
- <translation>Přestěhovat databázi z verze 4 na verzi 5.</translation>
+ <translation>Миграции базы данных с версии 4 до версии 5.</translation>
</message>
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="362"/>
<source>Migrating database from version 5 to 6.</source>
- <translation>Přestěhovat databázi z verze 5 na verzi 6.</translation>
+ <translation>Миграции базы данных с версии 5 до версии 6.</translation>
</message>
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="420"/>
<source>Migrating database from version 6 to 7.</source>
- <translation>Přestěhovat databázi z verze 6 na verzi 7.</translation>
+ <translation>Миграции базы данных с версии 6 до версии 7.</translation>
</message>
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="486"/>
<source>Migrating database from version 7 to 8.</source>
- <translation>Přestěhovat databázi z verze 7 na verzi 8.</translation>
+ <translation>Миграции базы данных с версии 7 до версии 8.</translation>
</message>
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="515"/>
<source>Migrating database from version 8 to 9.</source>
- <translation>Přestěhovat databázi z verze 8 na verzi 9.</translation>
+ <translation>Миграции базы данных с версии 8 до версии 9.</translation>
</message>
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="538"/>
<source>Open database: %1</source>
- <translation>Otevřít databázi: %1</translation>
+ <translation>Открыть базы данных: %1</translation>
</message>
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="547"/>
<source>Folders: %1</source>
- <translation>Složky: %1</translation>
+ <translation>Папки: %1</translation>
</message>
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="556"/>
<source>Tracks: %1</source>
- <translation>Stopy: %1</translation>
+ <translation>Треки: %1</translation>
</message>
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="564"/>
<source>Routes: %1 (Only the basic route will be copied)</source>
- <translation>Cesty: %1 (Bude koírována pouze základní cesta)</translation>
+ <translation>Маршруты: %1 (скопируется только основной маршрут)</translation>
</message>
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="572"/>
<source>Waypoints: %1</source>
- <translation>Cestovní body: %1</translation>
+ <translation>Маршрутные точки: %1</translation>
</message>
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="580"/>
<source>Overlays: %1 (areas will be converted as areas, distance lines will be converted to tracks, all other overlay items will be lost)</source>
- <translation>Překrytí: %1 (oblasti budou převáděny jako oblasti, vzdálenostní čáry budou převedeny do stop, všechny ostatní překrývající prvky budou ztraceny)</translation>
+ <translation>Наложения: %1 (области будут преобразованы в области, линии расстояния будут преобразованы в треки, все остальные элементы наложения будут потеряны)</translation>
</message>
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="587"/>
<source>Diaries: %1</source>
- <translation>Deníky: %1</translation>
+ <translation>Дневники: %1</translation>
</message>
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="594"/>
<source>Map selections: %1 (can't be converted to QMapShack)</source>
- <translation>Výběry map: %1 (nelze převést do QMapShack)</translation>
+ <translation>Выборки карт: %1 (невозможно преобразовать в QMapShack)</translation>
</message>
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="600"/>
<source>------ Start to convert database to %1------</source>
- <translation>------ Začít převádět databázi do %1------</translation>
+ <translation>------ Начиная преобразовать базу данных до %1------</translation>
</message>
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="604"/>
<source>Failed to create target database.</source>
- <translation>Nepodařilo se vytvořit cílovou databázi.</translation>
+ <translation>Не удалось создать целевую базу данных.</translation>
</message>
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="605"/>
<source>------ Abort ------</source>
- <translation>------ Zrušit ------</translation>
+ <translation>------Прекращение------</translation>
</message>
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="633"/>
<source>------ Done ------</source>
- <translation>------ Hotovo ------</translation>
+ <translation>------Сделано!------</translation>
</message>
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="641"/>
<source>Restore folders...</source>
- <translation>Obnovit složky...</translation>
+ <translation>Восстановить папки...</translation>
</message>
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="661"/>
<source>Imported %1 folders and %2 diaries</source>
- <translation>Zavedeno %1 složek a %2 deníků</translation>
+ <translation>Импортированы %1 папок и %2 дневников</translation>
</message>
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="667"/>
<source>Copy items...</source>
- <translation>Kopírovat prvky...</translation>
+ <translation>Копировать элементы ...</translation>
</message>
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="685"/>
<source>Imported %1 tracks, %2 waypoints, %3 routes, %4 areas</source>
- <translation>Zavedeno %1 stop, %2 cestovních bodů, %3 cest, %4 oblastí</translation>
+ <translation>Импортированы %1 треков, %2 маршрутных точек, %3 маршрутов, %4 областей</translation>
</message>
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="686"/>
<source>Import folders...</source>
- <translation>Zavést složky...</translation>
+ <translation>Импортировать папки...</translation>
</message>
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="751"/>
<source>Overlay of type '%1' cant be converted</source>
- <translation>Překrytí typu '%1' nelze převést</translation>
+ <translation>Наложение типа '%1' не может быть преобразовано</translation>
</message>
</context>
<context>
@@ -3279,23 +3325,23 @@ není platným vymezením soustavy souřadnic
<location filename="../qlgt/CQlgtTrack.cpp" line="265"/>
<location filename="../qlgt/CQlgtTrack.cpp" line="291"/>
<source>Corrupt track ...</source>
- <translation>Poškozená stopa...</translation>
+ <translation>Поврежденный трек...</translation>
</message>
<message>
<location filename="../qlgt/CQlgtTrack.cpp" line="164"/>
<source>Number of trackpoints is not equal the number of training data trackpoints.</source>
- <translation>Počet bodů stopy neodpovídá počtu bodů stopy cvičebních dat.</translation>
+ <translation>Количество точек трека не равно количеству точек трека в данных тренировки.</translation>
</message>
<message>
<location filename="../qlgt/CQlgtTrack.cpp" line="218"/>
<source>Number of trackpoints is not equal the number of extended data trackpoints.</source>
- <translation>Počet bodů stopy neodpovídá počtu rozšířených bodů stopy.</translation>
+ <translation>Количество точек трека не равно количеству расширенных точек трека.</translation>
</message>
<message>
<location filename="../qlgt/CQlgtTrack.cpp" line="265"/>
<location filename="../qlgt/CQlgtTrack.cpp" line="291"/>
<source>Number of trackpoints is not equal the number of shadow data trackpoints.</source>
- <translation>Počet bodů stopy neodpovídá počtu stínových bodů stopy.</translation>
+ <translation>Количество точек трека не равно количеству затененных точек трека.</translation>
</message>
</context>
<context>
@@ -3303,22 +3349,22 @@ není platným vymezením soustavy souřadnic
<message>
<location filename="../qlgt/CQmsDb.cpp" line="47"/>
<source>Existing file...</source>
- <translation>Stávající soubor...</translation>
+ <translation>Файл существует...</translation>
</message>
<message>
<location filename="../qlgt/CQmsDb.cpp" line="47"/>
<source>Remove existing %1?</source>
- <translation>Odstranit stávající %1?</translation>
+ <translation>Удалить существующий %1?</translation>
</message>
<message>
<location filename="../qlgt/CQmsDb.cpp" line="52"/>
<source>Remove existing file %1</source>
- <translation>Odstranit stávající soubor %1</translation>
+ <translation>Удалить существующий файл %1</translation>
</message>
<message>
<location filename="../qlgt/CQmsDb.cpp" line="164"/>
<source>%1: drop item with QLGT DB ID %2</source>
- <translation>%1: Zahodit prvek s ID DB QLGT %2</translation>
+ <translation>%1: удалить элемент с QLGT DB ID %2</translation>
</message>
</context>
<context>
@@ -3327,412 +3373,863 @@ není platným vymezením soustavy souřadnic
<location filename="../gis/qms/CQmsProject.cpp" line="48"/>
<location filename="../gis/qms/CQmsProject.cpp" line="80"/>
<source>Failed to open...</source>
- <translation>Nepodařilo se otevřít...</translation>
+ <translation>Не удалось открыть...</translation>
</message>
<message>
<location filename="../gis/qms/CQmsProject.cpp" line="48"/>
<location filename="../gis/qms/CQmsProject.cpp" line="80"/>
<source>Failed to open %1</source>
- <translation>Nepodařilo se otevřít %1</translation>
+ <translation>Не удалось открыть %1</translation>
</message>
</context>
<context>
- <name>CRouterMapQuest</name>
+ <name>CRouterBRouter</name>
<message>
- <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="37"/>
- <source>Fastest</source>
- <translation>Nejrychlejší</translation>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="49"/>
+ <source>original</source>
+ <translation>Оригинал</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="38"/>
- <source>Shortest</source>
- <translation>Nejkratší</translation>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="50"/>
+ <source>first alternative</source>
+ <translation>Первая альтернатива</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="39"/>
- <source>Bicycle</source>
- <translation>Jízdní kolo</translation>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="51"/>
+ <source>second alternative</source>
+ <translation>Вторая альтернатива</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="40"/>
- <source>Pedestrian</source>
- <translation>Chodec</translation>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="52"/>
+ <source>third alternative</source>
+ <translation>Третья альтернатива</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="42"/>
- <source>US English</source>
- <translation>Angličtina (USA)</translation>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="147"/>
+ <source>BRouter (offline)</source>
+ <translation>BRouter (без Интернета)</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="43"/>
- <source>British English</source>
- <translation>Angličtina (britská)</translation>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="152"/>
+ <source>BRouter (online)</source>
+ <translation>BRouter (требуется связь с Интернетом)</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="44"/>
- <source>Danish</source>
- <translation>Dánský</translation>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="180"/>
+ <source>profile: %1, alternative: %2</source>
+ <translation>Профиль: %1, альтернатива: %2</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="45"/>
- <source>Dutch</source>
- <translation>Holandský</translation>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="267"/>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="381"/>
+ <source>response is empty</source>
+ <translation>Ответ пуст</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="46"/>
- <source>French</source>
- <translation>Francouzský</translation>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="304"/>
+ <source>Bad response from server: %1</source>
+ <translation>Плохой ответ от сервера: %1</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="47"/>
- <source>German</source>
- <translation>Německý</translation>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="352"/>
+ <source><b>BRouter</b><br/>Routing request sent to server. Please wait...</source>
+ <translation><b>BRouter</b><br/>Запрос маршрутизации отправлен на сервер. Пожалуйста, подождите...</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="48"/>
- <source>Italian</source>
- <translation>Italský</translation>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="246"/>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="355"/>
+ <source>Calculate route with %1</source>
+ <translation>Вычислить маршрут с %1</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="49"/>
- <source>Norwegian</source>
- <translation>Norský</translation>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="415"/>
+ <source><b>BRouter</b><br/>Bad response from server:<br/>%1</source>
+ <translation><b>BRouter</b><br/>Плохой ответ от сервер:<br/>%1</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="50"/>
- <source>Spanish</source>
- <translation>Španělský</translation>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="405"/>
+ <source><br/>Calculation time: %1s</source>
+ <translation><br/>Время расчета: %1 сек.</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="51"/>
- <source>Swedish</source>
- <translation>Švédský</translation>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="509"/>
+ <source>Error</source>
+ <translation>Ошибка</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="110"/>
- <source>mode "%1"</source>
- <translation>Režim "%1"</translation>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="561"/>
+ <source>running</source>
+ <translation>Запущено</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="114"/>
- <source>no highways</source>
- <translation>Žádné rychlostní silnice</translation>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="553"/>
+ <source>starting</source>
+ <translation>Идет запуск</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="125"/>
- <source>no toll roads</source>
- <translation>Žádné silnice s mýtem</translation>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="515"/>
+ <source>QMapShack communicates with BRouter via a network connection. Usually this is done on a special address that can't be reached from outside your device. However BRouter listens for connections on all available interfaces. If you are in your own private network with an active firewall, this is not much of a problem. If you are in a public network every open port is a risk as it can be used by someone else to compromise your system. We do not recommend to use the local [...]
+ <translation>QMapShack взаимодействует с BRouter через сетевое соединение. Обычно это делается по специальному адресу, который не может быть достигнут вне вашего устройства. Однако BRouter слушает соединения на всех доступных интерфейсах. Если вы находитесь в своей частной сети с активным брандмауэром, это не проблема. Если вы находитесь в общедоступной сети, каждый открытый порт представляет собой риск, так как он может быть использован кем-то другим для компрометации вашей сист [...]
</message>
<message>
- <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="136"/>
- <source>no seasonal</source>
- <translation>Žádné sezonní silnice</translation>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="542"/>
+ <source>Warning...</source>
+ <translation>Предупреждение...</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="147"/>
- <source>no unpaved</source>
- <translation>Žádné nezpevněné silnice</translation>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="547"/>
+ <source>I understand the risk. Don't tell me again.</source>
+ <translation>Я понимаю риск. Больше не говорите.</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="158"/>
- <source>no ferry</source>
- <translation>Žádné přívozy</translation>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="568"/>
+ <source>stopped</source>
+ <translation>Остановлено</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="169"/>
- <source>no crossing of country borders</source>
- <translation>Žádný přechod zemské hranice</translation>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="579"/>
+ <source>not installed</source>
+ <translation>Не установлено</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="301"/>
- <source><b>MapQuest</b><br/>Routing request sent to server. Please wait...</source>
- <translation><b>MapQuest</b><br/>Požadavek na stanovením cesty poslán serveru. Počkejte, prosím...</translation>
+ <location filename="../gis/rte/router/CRouterBRouter.cpp" line="590"/>
+ <source>online</source>
+ <translation>Онлайн</translation>
</message>
+</context>
+<context>
+ <name>CRouterBRouterSetup</name>
<message>
- <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="312"/>
- <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="346"/>
- <source><b>MapQuest</b><br/>Bad response from server:<br/>%1</source>
- <translation><b>MapQuest</b><br/>Špatná odpověď od serveru:<br/>%1</translation>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="479"/>
+ <source>%1 not accessible</source>
+ <translation>%1 не доступно</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="363"/>
- <source><br/>Calculation time: %1s</source>
- <translation><br/>Doba výpočtu: %1 s</translation>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="489"/>
+ <source>%1 invalid result</source>
+ <translation>%1 неверный ресультат</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="533"/>
+ <source>Error parsing online-config:</source>
+ <translation>Ошибка при анализе онлайн конфигурации:</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="538"/>
+ <source>Network error:</source>
+ <translation>Ошибка сети:</translation>
</message>
</context>
<context>
- <name>CRouterRoutino</name>
+ <name>CRouterBRouterSetupWizard</name>
<message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="78"/>
- <source>Foot</source>
- <translation>Chodec</translation>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="38"/>
+ <source>Restore Default Values</source>
+ <translation>Восстановить умолчание</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="79"/>
- <source>Horse</source>
- <translation>Jezdec</translation>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="371"/>
+ <source>Open Directory</source>
+ <translation>Открыть папку</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="80"/>
- <source>Wheelchair</source>
- <translation>Invalidní vozík</translation>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="378"/>
+ <source>select Java Executable</source>
+ <translation>Выбрать исполняемый файл Java</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="81"/>
- <source>Bicycle</source>
- <translation>Jízdní kolo</translation>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="414"/>
+ <source>please select BRouter installation directory</source>
+ <translation>Выбрать папку установки BRouter</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="82"/>
- <source>Moped</source>
- <translation>Moped</translation>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="419"/>
+ <source>selected directory does not exist</source>
+ <translation>Выбранная папка не существует</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="83"/>
- <source>Motorcycle</source>
- <translation>Motorka</translation>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="420"/>
+ <source>create directory and install BRouter there</source>
+ <translation>Создать папку и установить там BRouter</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="84"/>
- <source>Motorcar</source>
- <translation>Automobil</translation>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="427"/>
+ <source>existing BRouter installation</source>
+ <translation>Существующая установка BRouter</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="85"/>
- <source>Goods</source>
- <translation>Nákladní automobil</translation>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="428"/>
+ <source>update existing BRouter installation</source>
+ <translation>Обновить существующую установку BRouter</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="59"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="433"/>
+ <source>empty directory, create new BRouter installation here</source>
+ <translation>Пустая папка, создать там новую установку BRouter</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="434"/>
+ <source>create new BRouter installation</source>
+ <translation>Создать новую установку BRouter</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="442"/>
+ <source>seems to be a valid Java-executable</source>
+ <translation>Вероятно, является допустимым исполняемым файлом Java</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="446"/>
+ <source>doesn't seem to be a valid Java-executable</source>
+ <translation>Не похоже на допустый исполняемый файл Java</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="451"/>
+ <source>Java Executable not found</source>
+ <translation>Исполняемый файл Java не найден</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="496"/>
+ <source>Error loading installation-page at %1</source>
+ <translation>Ошибка загрузки страницы установки в %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="505"/>
+ <source>no brouter-version to install selected</source>
+ <translation>Версия BRouter для установки не выбрана</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="513"/>
+ <source>selected %1 for download and installation</source>
+ <translation>Выбрано %1 для загрузки и установки</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="524"/>
+ <source>Warning...</source>
+ <translation>Предупреждение...</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="529"/>
+ <source>Download: %1<br/><br/>This will download and install a zip file from a download location that is not secured by any standard at all, using plain HTTP. Usually this should be HTTPS. The risk is someone redirecting the request and sending you a replacement zip with malware. There is no way for QMapShack to detect this. <br/>If you do not understand this or if you are in doubt, do not proceed and abort. Use the Web version of BRouter instead.</source>
+ <translation>Загузка:%1 <br/>Это загрузит и установит файл ZIP из места загрузки, которое не защищено никаким стандартом вообще, используя простой HTTP. Обычно это должно быть HTTPS. Риск заключается в том, что кто-то перенаправляет запрос и отправляет вам заменяющий ZIP с помощью вредоносной программы. QMapShack не может обнаружить это. <br/> Если вы не понимаете этого или если у вас есть сомнения, не начинайте и прерываете. Вместо этого используйте веб-версию BRoute [...]
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="541"/>
+ <source>I understand the risk and wish to proceed.</source>
+ <translation>Я понимаю риск и хочу продолжить.</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="553"/>
+ <source>download %1 started</source>
+ <translation>Загрузка %1 началась</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="565"/>
+ <source>Network Error: %1</source>
+ <translation>Ошибка сети: %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="586"/>
+ <source>download %1 finished</source>
+ <translation>Загрузка %1 завершена</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="588"/>
+ <source>unzipping:</source>
+ <translation>Распаковка:</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="593"/>
+ <source>ready.</source>
+ <translation>Готово.</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="613"/>
+ <source>download of brouter failed: %1</source>
+ <translation>Загрузка BRouter не удалась: %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="623"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="630"/>
+ <source>retrieving available profiles from %1</source>
+ <translation>Получить доступные профили из %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="654"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="736"/>
+ <source>content of profile</source>
+ <translation>Содержание профиля</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="729"/>
+ <source>Error:</source>
+ <translation>Ошибка: </translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="466"/>
+ <source>Error creating directory %1</source>
+ <translation>Ошибка создания папки %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="571"/>
+ <source>Error directory %1 does not exist</source>
+ <translation>Ошибка: папка %1 не существует</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="578"/>
+ <source>Error creating file %1</source>
+ <translation>Ошибка создания файла %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="582"/>
+ <source>Error writing to file %1</source>
+ <translation>Ошибка записи в файл %1</translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterTilesPage</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesPage.cpp" line="82"/>
+ <source>Continue with Setup</source>
+ <translation>Продолжать настройку</translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterTilesSelect</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="98"/>
+ <source>available routing-data is being determined.</source>
+ <translation>Определяются доступные данные маршрутизации.</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="108"/>
+ <source>Select outdated</source>
+ <translation>Выбрать устаревшее</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="109"/>
+ <source>Clear Selection</source>
+ <translation>Очистить выделение</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="110"/>
+ <source>Delete selection</source>
+ <translation>Удалить выделение</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="111"/>
+ <source>Download</source>
+ <translation>Загрузка</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="281"/>
+ <source>Error creating segments directory %1</source>
+ <translation>Ошибка создания каталога сегментов %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="365"/>
+ <source>cannot parse: %1 is not a date</source>
+ <translation>Невозможно разобрать: %1 не является допустимой датой</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="390"/>
+ <source>cannot parse: %1 is not a valid size</source>
+ <translation>Невозможно разобрать: %1 не является допустимым размером</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="409"/>
+ <source>Error retrieving available routing data from %1: %2</source>
+ <translation>Ошибка получения доступных данных маршрутизации из %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="490"/>
+ <source>segments directory does not exist: </source>
+ <translation>Папка сегментов не существует:</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="504"/>
+ <source>error creating file %1: %2</source>
+ <translation>Ошибка создания файла сегментов %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="536"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="576"/>
+ <source>no valid request for filename %1</source>
+ <translation>Недействительный запрос имени файла %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="541"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="584"/>
+ <source>no open file assigned to request for %1</source>
+ <translation>К запросу для %1 не был назначен открытый файл</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="551"/>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="594"/>
+ <source>error writing to file %1: %2</source>
+ <translation>Ошибка записи в файл %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="602"/>
+ <source>error renaming file %1 to %2: %3</source>
+ <translation>Ошибка переименования файла %1 до %2: %3</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="685"/>
+ <source>up-to-date: %1 (%2), outdated: %3 (%4), to be downloaded: %5 (%6)</source>
+ <translation>Верно: %1 (%2), устарело: %3 (%4), загрузить: %5 (%6)</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="783"/>
+ <source>being downloaded: %1 of %2</source>
+ <translation>Загружено: %1 от %2</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="803"/>
+ <source>no local data, online available: %1 (%2)</source>
+ <translation>Нет локальных данных, доступно в Интернете: %1 (%2)</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="789"/>
+ <source>local data outdated (%1, %2 - remote %3, %4)</source>
+ <translation>Локальные данные устарелы (%1, %2 - удаленные %3, %4)</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="190"/>
+ <source>Error removing %1: %2</source>
+ <translation>Ошибка удаления %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="321"/>
+ <source>Network Error</source>
+ <translation>Ошибка сети</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="330"/>
+ <source>invalid result, no files found</source>
+ <translation>Неверный результат, файлы не найдены</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="797"/>
+ <source>local data up to date (%1, %2)</source>
+ <translation>Локальные данные верны (%1, %2)</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="809"/>
+ <source>no routing-data available</source>
+ <translation>Нет доступных данных маршрутизации</translation>
+ </message>
+</context>
+<context>
+ <name>CRouterBRouterToolShell</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="74"/>
+ <source>!!! done !!!
+</source>
+ <translation>Сделано!</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="79"/>
+ <source>!!! failed !!!
+</source>
+ <translation>Не удалось!</translation>
+ </message>
+</context>
+<context>
+ <name>CRouterMapQuest</name>
+ <message>
+ <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="37"/>
+ <source>Fastest</source>
+ <translation>Самый быстрый</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="38"/>
<source>Shortest</source>
- <translation>Nejkratší</translation>
+ <translation>Самый короткий</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="39"/>
+ <source>Bicycle</source>
+ <translation>Велосипед</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="40"/>
+ <source>Pedestrian</source>
+ <translation>Пешеход</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="42"/>
+ <source>US English</source>
+ <translation>Английский (США)</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="43"/>
+ <source>British English</source>
+ <translation>Английский (Британский)</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="44"/>
+ <source>Danish</source>
+ <translation>Датский</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="45"/>
+ <source>Dutch</source>
+ <translation>Голландский</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="46"/>
+ <source>French</source>
+ <translation>Французский</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="47"/>
+ <source>German</source>
+ <translation>Немецкий</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="48"/>
+ <source>Italian</source>
+ <translation>Итальянский</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="49"/>
+ <source>Norwegian</source>
+ <translation>Норвежский</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="50"/>
+ <source>Spanish</source>
+ <translation>Испанский</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="51"/>
+ <source>Swedish</source>
+ <translation>Шведский</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="110"/>
+ <source>mode "%1"</source>
+ <translation>режим "%1"</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="114"/>
+ <source>no highways</source>
+ <translation>без шоссе</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="125"/>
+ <source>no toll roads</source>
+ <translation>без платных дорог</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="136"/>
+ <source>no seasonal</source>
+ <translation>без сезонных</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="147"/>
+ <source>no unpaved</source>
+ <translation>нет без покрытия</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="158"/>
+ <source>no ferry</source>
+ <translation>без парома</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="169"/>
+ <source>no crossing of country borders</source>
+ <translation>без пересечений государственных границ</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="301"/>
+ <source><b>MapQuest</b><br/>Routing request sent to server. Please wait...</source>
+ <translation><b>MapQuest</b><br/>Запрос маршрутизации отправленный до сервера. Пожалуйста, подождите...</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="312"/>
+ <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="346"/>
+ <source><b>MapQuest</b><br/>Bad response from server:<br/>%1</source>
+ <translation><b>MapQuest</b><br/>Плохой ответ от сервера:<br/>%1</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="363"/>
+ <source><br/>Calculation time: %1s</source>
+ <translation><br/>Время расчета: %1 сек.</translation>
+ </message>
+</context>
+<context>
+ <name>CRouterRoutino</name>
+ <message>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="55"/>
+ <source>Warning...</source>
+ <translation>Предупреждение...</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="55"/>
<source>Found Routino with a wrong version. Expected %1 found %2</source>
- <translation>Nalezeno Routino s nesprávnou verzí. Očekávána %1, nalezena %2</translation>
+ <translation>Найдено Routino с неправильной версией. Ожидаема %1б найдена %2</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="59"/>
+ <source>Shortest</source>
+ <translation>Самый короткий</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="60"/>
<source>Quickest</source>
- <translation>Nejrychlejší</translation>
+ <translation>Самый быстрый</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="78"/>
+ <source>Foot</source>
+ <translation>Пешком</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="79"/>
+ <source>Horse</source>
+ <translation>Лошадь</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="80"/>
+ <source>Wheelchair</source>
+ <translation>Инвалидная коляска</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="81"/>
+ <source>Bicycle</source>
+ <translation>Велосипед</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="82"/>
+ <source>Moped</source>
+ <translation>Мопед</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="83"/>
+ <source>Motorcycle</source>
+ <translation>Мотоцикл</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="84"/>
+ <source>Motorcar</source>
+ <translation>Автомобиль</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="85"/>
+ <source>Goods</source>
+ <translation>Товары</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="87"/>
<source>English</source>
- <translation>Anglický</translation>
+ <translation>Английский</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="88"/>
<source>German</source>
- <translation>Německý</translation>
+ <translation>Немецкий</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="89"/>
<source>French</source>
- <translation>Francouzský</translation>
+ <translation>Французский</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="90"/>
<source>Hungarian</source>
- <translation>Maďarský</translation>
+ <translation>Венгерский</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="91"/>
<source>Dutch</source>
- <translation>Holandský</translation>
+ <translation>Голландский</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="92"/>
<source>Russian</source>
- <translation>Ruský</translation>
+ <translation>Русский</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="93"/>
<source>Polish</source>
- <translation>Polský</translation>
+ <translation>Польский</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="128"/>
<source>A function was called without the database variable set.</source>
- <translation>Byla zavolána funkce, aniž by byla nastavena proměnná databáze.</translation>
+ <translation>Функция была вызвана без переменной для базы данных.</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="131"/>
<source>A function was called without the profile variable set.</source>
- <translation>Byla zavolána funkce, aniž by byla nastavena proměnná profilu.</translation>
+ <translation>Функция была вызвана без переменной профиля.</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="134"/>
<source>A function was called without the translation variable set.</source>
- <translation>Byla zavolána funkce, aniž by byla nastavena proměnná jazyka.</translation>
+ <translation>Функция была вызвана без переменной перевода.</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="137"/>
<source>The specified database to load did not exist.</source>
- <translation>Databáze zadaná k nahrání neexistuje.</translation>
+ <translation>Указанная к загрузке база данных не существует.</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="140"/>
<source>The specified database could not be loaded.</source>
- <translation>Zadanou databázi se nepodařilo nahrát.</translation>
+ <translation>Указанная база данных не может быть загружена.</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="143"/>
<source>The specified profiles XML file did not exist.</source>
- <translation>Zadaný soubor s profilem XML neexistuje.</translation>
+ <translation>Указанный XML файл профилей не существует.</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="146"/>
<source>The specified profiles XML file could not be loaded.</source>
- <translation>Zadaný soubor s profilem XML se nepodařilo nahrát.</translation>
+ <translation>Указанный XML файл профилей невозможно загрузить.</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="149"/>
<source>The specified translations XML file did not exist.</source>
- <translation>Zadaný soubor s jazykem XML neexistuje.</translation>
+ <translation>Указанный XML файл перевода не существует.</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="152"/>
<source>The specified translations XML file could not be loaded.</source>
- <translation>Zadaný soubor s jazykem XML se nepodařilo nahrát.</translation>
+ <translation>Указанный XML файл перевода невозможно загрузить.</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="155"/>
<source>The requested profile name does not exist in the loaded XML file.</source>
- <translation>Požadovaný název profilu v nahraném souboru XML není.</translation>
+ <translation>Запрошенное имя профиля не существует в загруженном XML файле.</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="158"/>
<source>The requested translation language does not exist in the loaded XML file.</source>
- <translation>Požadovaný jazyk v nahraném souboru XML není.</translation>
+ <translation>Запрошенный язык перевода не существует в загруженном XML файле.</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="161"/>
+ <source>In the routing database there is no highway near the coordinates to place a waypoint.</source>
+ <translation>В базе данных маршрутизации нет дороги вблизи координат данной маршрутной точки.</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="164"/>
<source>The profile and database do not work together.</source>
- <translation>Profil a databáze dohromady nepracují.</translation>
+ <translation>Профиль и базы данных не работают совместно.</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="167"/>
<source>The profile being used has not been validated.</source>
- <translation>Používaný profil nebyl schválen.</translation>
+ <translation>Использованный профиль не был подтвержден.</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="170"/>
<source>The user specified profile contained invalid data.</source>
- <translation>Uživatelem stanovený profil obsahoval neplatná data.</translation>
+ <translation>Указанный профиль содержит недопустимые данные.</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="173"/>
<source>The routing options specified are not consistent with each other.</source>
- <translation>Zadané volby pro stanovení cesty si vzájemně neodpovídají.</translation>
+ <translation>Параметры маршрутизации несовместимы между собой.</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="176"/>
<source>There is a mismatch between the library and caller API version.</source>
- <translation>Knihovna a verze API si vzájemně neodpovídají.</translation>
+ <translation>Есть несоответствие между API версиями библиотеки и абонента.</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="179"/>
<source>Route calculation was aborted by user.</source>
- <translation>Výpočet cesty byl přerušen uživatelem.</translation>
+ <translation>Расчет маршрута был прерван пользователем.</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="185"/>
<source>A route could not be found to waypoint %1.</source>
- <translation>Nepodařilo se najít žádnou cestu k cestovnímu bodu %1.</translation>
+ <translation>Невозможно найти маршрут к маршрутной точке %1.</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="188"/>
<source>Unknown error: %1</source>
- <translation>Neznámá chyba: %1</translation>
+ <translation>Неизвестная ошибка: %1</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="200"/>
<source>profile "%1"</source>
- <translation>Profil "%1"</translation>
+ <translation>профиль "%1"</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterRoutino.cpp" line="201"/>
<source>, mode "%1"</source>
- <translation>, režim "%1"</translation>
- </message>
- <message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="55"/>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="238"/>
- <source>Warning...</source>
- <translation>Varování...</translation>
+ <translation>, режим "%1"</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="161"/>
- <source>In the routing database there is no highway near the coordinates to place a waypoint.</source>
- <translation>V databázi cest není žádná hlavní silnice poblíž souřadnic k umístění cestovního bodu.</translation>
- </message>
- <message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="238"/>
- <source>%1: Due to limitations in the Windows POSIX API Routino can't handle files larger than 4GB.</source>
- <translation>%1: Kvůli omezením Windows POSIX API Routino nedokáže zpracovat soubory větší než 4 GB.</translation>
- </message>
- <message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="338"/>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="425"/>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="332"/>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="419"/>
<source>Calculate route with %1</source>
- <translation>Spočítat cestu s %1</translation>
+ <translation>Вычислить маршрут с %1</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutino.cpp" line="346"/>
+ <location filename="../gis/rte/router/CRouterRoutino.cpp" line="340"/>
<source><br/>Calculation time: %1s</source>
- <translation><br/>Doba výpočtu: %1 s</translation>
+ <translation><br/>Время расчета: %1 сек.</translation>
</message>
</context>
<context>
<name>CRouterRoutinoPathSetup</name>
<message>
- <location filename="../gis/rte/router/CRouterRoutinoPathSetup.cpp" line="40"/>
+ <location filename="../gis/rte/router/routino/CRouterRoutinoPathSetup.cpp" line="40"/>
<source>Add or remove paths containing Routino data. There can be multiple databases in a path but no sub-path is parsed.</source>
- <translation>Přidat nebo odstranit cesty obsahující data Routino. V cestě může být více databází, ale žádná podcesta není zpracována.</translation>
+ <translation>Добавить или удалить пути, содержащие данные Routino. Несколько баз данных возможно в папке, но вложенные папки не просматриваются.</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterRoutinoPathSetup.cpp" line="55"/>
+ <location filename="../gis/rte/router/routino/CRouterRoutinoPathSetup.cpp" line="55"/>
<source>Select routing data file path...</source>
- <translation>Vybrat cestu k souboru s daty se stanovením cesty...</translation>
+ <translation>Выбрать путь к файлу с данными маршрутизации...</translation>
</message>
</context>
<context>
<name>CRouterSetup</name>
<message>
- <location filename="../gis/rte/router/CRouterSetup.cpp" line="36"/>
+ <location filename="../gis/rte/router/CRouterSetup.cpp" line="38"/>
<source>Routino (offline)</source>
- <translation>Routino (nepřipojeno)</translation>
+ <translation>Routino (без Интернета)</translation>
</message>
<message>
- <location filename="../gis/rte/router/CRouterSetup.cpp" line="37"/>
+ <location filename="../gis/rte/router/CRouterSetup.cpp" line="39"/>
<source>MapQuest (online)</source>
- <translation>MapQuest (nepřipojeno)</translation>
+ <translation>MapQuest (требуется связь с Интернетом)</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/CRouterSetup.cpp" line="40"/>
+ <source>BRouter (online)</source>
+ <translation>BRouter (требуется связь с Интернетом)</translation>
</message>
</context>
<context>
<name>CRoutinoDatabaseBuilder</name>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="32"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="33"/>
<source>Create Routino Database</source>
- <translation>Vytvořit databázi Routino</translation>
+ <translation>Создать базу данных Routino</translation>
</message>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="56"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="57"/>
<source>Select files...</source>
- <translation>Vybrat soubory...</translation>
+ <translation>Выбрать файлы...</translation>
</message>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="80"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="81"/>
<source>Select target path...</source>
- <translation>Vybrat cílovou cestu...</translation>
+ <translation>Выбрать целевой путь...</translation>
</message>
<message>
- <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="141"/>
+ <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="142"/>
<source>!!! done !!!
</source>
- <translation>Hotovo!</translation>
+ <translation>Сделано!</translation>
</message>
</context>
<context>
@@ -3740,7 +4237,7 @@ není platným vymezením soustavy souřadnic
<message>
<location filename="../mouse/CScrOptRangeTrk.cpp" line="38"/>
<source>No range selected</source>
- <translation type="unfinished"></translation>
+ <translation>Не выбран интервал</translation>
</message>
</context>
<context>
@@ -3748,52 +4245,52 @@ není platným vymezením soustavy souřadnic
<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>Přesný režim</b><br/>Všechny vybrané prvky musí být úplně uvnitř vybrané oblasti.<br/></translation>
+ <translation><b>Точный режим</b><br/> Все выбранные элементы должны полностью находиться внутри выбранной области<br/></translation>
</message>
<message>
<location filename="../mouse/CScrOptSelect.cpp" line="97"/>
<source><b>Intersecting Mode</b><br/>All selected items have to be inside or at least intersect the selected area.<br/></source>
- <translation><b>Protínající se režim</b><br/>Všechny vybrané prvky musí být uvnitř nebo alespoň protínat vybranou oblast.<br/></translation>
+ <translation><b>Режим пересечения </b><br/> Все выбранные элементы должны пересекать выбранную область<br/></translation>
</message>
<message>
<location filename="../mouse/CScrOptSelect.cpp" line="101"/>
<source><b>Add Tracks</b><br/>Add tracks to list of selected items<br/></source>
- <translation><b>Přidat stopy</b><br/>Přidat stopy do seznamu vybraných prvků.<br/></translation>
+ <translation><b>Добавить треки </b><br/>Добавить треки к списку выбранных элементов<br/></translation>
</message>
<message>
<location filename="../mouse/CScrOptSelect.cpp" line="105"/>
<source><b>Add Waypoints</b><br/>Add waypoints to list of selected items<br/></source>
- <translation><b>Přidat cestovní body</b><br/>Přidat cestovní body do seznamu vybraných prvků.<br/></translation>
+ <translation><b>Добавить маршрутные точки </b><br/>Добавить маршрутные точки к списку выбранных элементов<br/></translation>
</message>
<message>
<location filename="../mouse/CScrOptSelect.cpp" line="109"/>
<source><b>Add Routes</b><br/>Add routes to list of selected items<br/></source>
- <translation><b>Přidat cesty</b><br/>Přidat cesty do seznamu vybraných prvků.<br/></translation>
+ <translation><b>Добавить маршруты </b><br/>Добавить маршруты к списку выбранных элементов<br/></translation>
</message>
<message>
<location filename="../mouse/CScrOptSelect.cpp" line="113"/>
<source><b>Add Areas</b><br/>Add areas to list of selected items<br/></source>
- <translation><b>Přidat oblasti</b><br/>Přidat oblasti do seznamu vybraných prvků.<br/></translation>
+ <translation><b>Добавить области </b><br/>Добавить области к списку выбранных элементов<br/></translation>
</message>
<message>
<location filename="../mouse/CScrOptSelect.cpp" line="124"/>
<source><b>Ignore Tracks</b><br/>Ignore tracks in list of selected items<br/></source>
- <translation><b>Přehlížet stopy</b><br/>Přehlížet stopy v seznamu vybraných prvků.<br/></translation>
+ <translation><b>Игнорировать треки </b><br/> Игнорировать треки в списке выбранных элементов<br/></translation>
</message>
<message>
<location filename="../mouse/CScrOptSelect.cpp" line="128"/>
<source><b>Ignore Waypoints</b><br/>Ignore waypoints in list of selected items<br/></source>
- <translation><b>Přehlížet cestovní body</b><br/>Přehlížet cestovní body v seznamu vybraných prvků.<br/></translation>
+ <translation><b>Игнорировать маршрутные точки </b><br/> Игнорировать маршрутные точки в списке выбранных элементов<br/></translation>
</message>
<message>
<location filename="../mouse/CScrOptSelect.cpp" line="132"/>
<source><b>Ignore Routes</b><br/>Ignore routes in list of selected items<br/></source>
- <translation><b>Přehlížet cesty</b><br/>Přehlížet cesty v seznamu vybraných prvků.<br/></translation>
+ <translation><b>Игнорировать маршруты </b><br/> Игнорировать маршруты в списке выбранных элементов<br/></translation>
</message>
<message>
<location filename="../mouse/CScrOptSelect.cpp" line="136"/>
<source><b>Ignore Areas</b><br/>Ignore areas in list of selected items<br/></source>
- <translation><b>Přehlížet oblasti</b><br/>Přehlížet oblasti v seznamu vybraných prvků.<br/></translation>
+ <translation><b>Игнорировать области </b><br/> Игнорировать области в списке выбранных элементов<br/></translation>
</message>
</context>
<context>
@@ -3801,7 +4298,7 @@ není platným vymezením soustavy souřadnic
<message>
<location filename="../gis/db/CSearchDatabase.cpp" line="38"/>
<source>Search database '%1':</source>
- <translation>Prohledat databázi '%1':</translation>
+ <translation>Искать в базе данных '%1':</translation>
</message>
</context>
<context>
@@ -3809,12 +4306,12 @@ není platným vymezením soustavy souřadnic
<message>
<location filename="../gis/search/CSearchGoogle.cpp" line="118"/>
<source>Unknown response</source>
- <translation>Neznámá odpověď</translation>
+ <translation>Неизвестный ответ</translation>
</message>
<message>
<location filename="../gis/search/CSearchGoogle.cpp" line="128"/>
<source>Error: </source>
- <translation>Chyba: </translation>
+ <translation>Ошибка: </translation>
</message>
</context>
<context>
@@ -3822,32 +4319,32 @@ není platným vymezením soustavy souřadnic
<message>
<location filename="../gis/db/CSetupDatabase.cpp" line="47"/>
<source>Missing Requirement</source>
- <translation>Chybí požadavek</translation>
+ <translation>Отсутствует требование</translation>
</message>
<message>
<location filename="../gis/db/CSetupDatabase.cpp" line="48"/>
<source>MySQL cannot be used at this point, because the corresponding driver (QMYSQL) is not available.<br />Please make sure you have installed the corresponding package.<br />If you don't know what to do now you should have <a href="%1">a look at the wiki</a>.</source>
- <translation>MySQL nemůže být toho času použita, protože není dostupný odpovídající ovladač (QMYSQL).<br />Ujistěte se, prosím, že byl nainstalován odpovídající balíček.<br />Pokud nevíte, co se má dělat, podívejte se na dokumentaci na <a href="%1">Wiki</a>.</translation>
+ <translation>MySQL не может сейчас использован, так как соответствующий драйвер (QMYSQL) не доступен. <br />Пожалуйста, убедитесь, что установлен соответствующий пакет.<br/> Если вы не знаете, что делать, вам следует просмотреть <a href="%1">Wiki</a>.</translation>
</message>
<message>
<location filename="../gis/db/CSetupDatabase.cpp" line="102"/>
<source>Error...</source>
- <translation>Chyba...</translation>
+ <translation>Ошибка...</translation>
</message>
<message>
<location filename="../gis/db/CSetupDatabase.cpp" line="102"/>
<source>There is already a database with name '%1'</source>
- <translation>Již je databáze s názvem '%1'</translation>
+ <translation>База данных с именем '%1' уже существует</translation>
</message>
<message>
<location filename="../gis/db/CSetupDatabase.cpp" line="115"/>
<source>New database...</source>
- <translation>Nová databáze...</translation>
+ <translation>Новая база данных...</translation>
</message>
<message>
<location filename="../gis/db/CSetupDatabase.cpp" line="140"/>
<source>Open database...</source>
- <translation>Otevřít databázi...</translation>
+ <translation>Открыть базу данных...</translation>
</message>
</context>
<context>
@@ -3855,12 +4352,12 @@ není platným vymezením soustavy souřadnic
<message>
<location filename="../gis/db/CSetupWorkspace.cpp" line="55"/>
<source>Setup database...</source>
- <translation>Nastavit databázi...</translation>
+ <translation>Настройка базы данных...</translation>
</message>
<message>
<location filename="../gis/db/CSetupWorkspace.cpp" line="55"/>
<source>Changes will become active after an application's restart.</source>
- <translation>Změny budou uvedeny v činnost po opětovném spuštění programu.</translation>
+ <translation>Изменения вступит в силу после перезапуска приложения.</translation>
</message>
</context>
<context>
@@ -3868,7 +4365,7 @@ není platným vymezením soustavy souřadnic
<message>
<location filename="../gis/slf/CSlfProject.cpp" line="42"/>
<source>Failed to load file %1...</source>
- <translation>Nepodařilo se nahrát soubor %1...</translation>
+ <translation>Не удалось загрузить файл %1...</translation>
</message>
</context>
<context>
@@ -3876,46 +4373,46 @@ není platným vymezením soustavy souřadnic
<message>
<location filename="../gis/slf/CSlfReader.cpp" line="63"/>
<source>Failed to parse timestamp `%1`</source>
- <translation>Nepodařilo se zpracovat časové razítko `%1`</translation>
+ <translation>Не удалось проанализировать метку времени `%1`</translation>
</message>
<message>
<location filename="../gis/slf/CSlfReader.cpp" line="76"/>
<source>%1 does not exist</source>
- <translation>%1: Neexistuje</translation>
+ <translation>%1 не существует</translation>
</message>
<message>
<location filename="../gis/slf/CSlfReader.cpp" line="81"/>
<source>Failed to open %1</source>
- <translation>Nepodařilo se otevřít %1</translation>
+ <translation>Не удалось открыть %1</translation>
</message>
<message>
<location filename="../gis/slf/CSlfReader.cpp" line="92"/>
<source>Failed to read: %1
line %2, column %3:
%4</source>
- <translation>Chyba při čtení: %1
-Řádek %2, Sloupec %3:
+ <translation>Не удалось читать %1
+строка %2, столбец %3:
%4</translation>
</message>
<message>
<location filename="../gis/slf/CSlfReader.cpp" line="99"/>
<source>Not a SLF file: %1</source>
- <translation>Není souborem SLF: %1</translation>
+ <translation>Это не файл SLF: %1</translation>
</message>
<message>
<location filename="../gis/slf/CSlfReader.cpp" line="106"/>
<source>Unsupported revision %1: %2</source>
- <translation>Nepodporovaná změna %1: %2</translation>
+ <translation>Версия не поддерживается: %1: %2</translation>
</message>
<message>
<location filename="../gis/slf/CSlfReader.cpp" line="181"/>
<source>Break %1</source>
- <translation>Přestávka %1</translation>
+ <translation>Прерывание %1</translation>
</message>
<message>
<location filename="../gis/slf/CSlfReader.cpp" line="185"/>
<source>Lap %1</source>
- <translation>Kolo %1</translation>
+ <translation>Круг %1</translation>
</message>
</context>
<context>
@@ -3923,7 +4420,7 @@ line %2, column %3:
<message>
<location filename="../gis/trk/CTableTrk.cpp" line="99"/>
<source>Double click to edit elevation value</source>
- <translation>Dvakrát klepněte pro upravení hodnoty výšky</translation>
+ <translation>Двойной щелчок для изменения высоты</translation>
</message>
<message>
<location filename="../gis/trk/CTableTrk.cpp" line="125"/>
@@ -3937,16 +4434,114 @@ line %2, column %3:
</message>
</context>
<context>
+ <name>CTcxProject</name>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="51"/>
+ <source>Failed to load file %1...</source>
+ <translation>Не удалось загрузить файл %1...</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="73"/>
+ <source>Failed to open %1</source>
+ <translation>Не удалось открыть %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="84"/>
+ <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+ <translation>Не удалось читать %1
+строка %2, столбец %3:
+%4</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="91"/>
+ <source>Not a TCX file: %1</source>
+ <translation>Это не файл TCX: %1</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="101"/>
+ <source>This TCX file contains at least 1 workout, but neither an activity nor a course. As workouts do not contain position data, they can not be imported to QMapShack.</source>
+ <translation>Этот файл TCX содержит по крайней мере 1 тренировку, но нет ни активности, ни курса. Поскольку тренировки не содержат данных позиции, они не могут быть импортированы в QMapShack.</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="106"/>
+ <source>This TCX file does not contain any activity or course: %1</source>
+ <translation>В файле TCX %1 нет мероприятий или курсов</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="275"/>
+ <source>File exists ...</source>
+ <translation>Файл существует...</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="276"/>
+ <source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file. Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
+ <translation>Файл существует и не создан в QMapShack. Если нажать 'да' все данные в этом файле будут потеряны. Даже если этот файл содержит данные GPX и был загружен в QMapShack, QMapShack не может загрузить и сохранить все элементы этого файла. Такие элементы будут потеряны. Рекомендуется использовать другой файл. <b>Вы действительно хотите перезаписать этот файл?</b></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="315"/>
+ <source>The track <b>%1</b> you have selected contains trackpoints with invalid timestamps. Device might not accept the generated TCX course file if left as is. <b>Do you want to apply a filter with constant speed (10 m/s) and continue?</b></source>
+ <translation>Выбранный трек <b>%1</b> содержит точки трека с недопустимыми временными метками. Устройство может не принять сгенерированный файл курса TCX, если оставить его как есть. <b>Хотите вы применить фильтр с постоянной скоростью (10 м/с) и продолжить?</b></translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="339"/>
+ <source>Course</source>
+ <translation>Курс</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="340"/>
+ <source>Activity</source>
+ <translation>Мероприятие</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="341"/>
+ <source>Cancel</source>
+ <translation>Отменить</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="314"/>
+ <source>Track with invalid timestamps...</source>
+ <translation>Трек с неверными метками времени...</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="334"/>
+ <source>Activity or course?</source>
+ <translation>Мероприятие или курс?</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="335"/>
+ <source>QMapShack does not know how track <b>%1</b> should be saved. <b>Do you want to save it as a course or as an activity? </b>Remember that only waypoints close enough to the track will be saved when saving as a course. Waypoints will not be saved when saving as an activity.</source>
+ <translation>QMapShack не знает, как следует сохранить трек <b>%1</b>.<b> Сохранить его как курс или как мероприятие? </b>Помните, что только путевые точки, достаточно близкие к треку, будут сохранены при сохранении в качестве курса. Путевые точки не сохраняются при сохранении в качестве мероприятия.</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="432"/>
+ <source>Failed to create file '%1'</source>
+ <translation>Не удалось создать файл '%1'</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="453"/>
+ <source>Failed to write file '%1'</source>
+ <translation>Не удалось записать файл '%1'</translation>
+ </message>
+ <message>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="435"/>
+ <location filename="../gis/tcx/CTcxProject.cpp" line="454"/>
+ <source>Saving GIS data failed...</source>
+ <translation>Не удалось сохранить данные GIS...</translation>
+ </message>
+</context>
+<context>
<name>CTextEditWidget</name>
<message>
<location filename="../widgets/CTextEditWidget.cpp" line="70"/>
<source>&Color...</source>
- <translation>B&arva...</translation>
+ <translation>&Цвет...</translation>
</message>
<message>
<location filename="../widgets/CTextEditWidget.cpp" line="113"/>
<source>Reset format</source>
- <translation>Nastavit formát znovu</translation>
+ <translation>Сбросить форматирование</translation>
</message>
</context>
<context>
@@ -3961,32 +4556,32 @@ line %2, column %3:
<location filename="../gis/tnv/CTwoNavProject.cpp" line="88"/>
<location filename="../gis/tnv/CTwoNavProject.cpp" line="192"/>
<source>Error...</source>
- <translation>Chyba...</translation>
+ <translation>Ошибка...</translation>
</message>
<message>
<location filename="../gis/tnv/serialization.cpp" line="560"/>
<location filename="../gis/tnv/CTwoNavProject.cpp" line="88"/>
<location filename="../gis/tnv/CTwoNavProject.cpp" line="192"/>
<source>Failed to open %1.</source>
- <translation>Nepodařilo se otevřít %1.</translation>
+ <translation>Не удалось открыть %1.</translation>
</message>
<message>
<location filename="../gis/tnv/CTwoNavProject.cpp" line="160"/>
<source>Save GIS data to...</source>
- <translation>Uložit data GIS do...</translation>
+ <translation>Сохранить данные ГИС в...</translation>
</message>
<message>
<location filename="../gis/tnv/serialization.cpp" line="588"/>
<location filename="../gis/tnv/serialization.cpp" line="599"/>
<source>Only support lon/lat WGS 84 format.</source>
- <translation>Jako formát je podporován jen lon/lat WGS 84.</translation>
+ <translation>Поддерживается долгота/широта только в формате WGS 84.</translation>
</message>
<message>
<location filename="../gis/tnv/serialization.cpp" line="617"/>
<location filename="../gis/tnv/serialization.cpp" line="645"/>
<location filename="../gis/tnv/serialization.cpp" line="719"/>
<source>Failed to read data.</source>
- <translation>Nepodařilo se přečíst data.</translation>
+ <translation>Не удалось читать данные.</translation>
</message>
</context>
<context>
@@ -3994,7 +4589,7 @@ line %2, column %3:
<message>
<location filename="../helpers/CWptIconDialog.cpp" line="161"/>
<source>Path to user icons...</source>
- <translation>Cesta k uživatelským symbolům...</translation>
+ <translation>Путь к пользовательскими пиктограммами...</translation>
</message>
</context>
<context>
@@ -4002,148 +4597,160 @@ line %2, column %3:
<message>
<location filename="../IAbout.ui" line="14"/>
<source>About....</source>
- <translation>O programu...</translation>
+ <translation>О программе....</translation>
</message>
<message>
<location filename="../IAbout.ui" line="55"/>
<source><b>QMapShack</b>, Version</source>
- <translation><b>QMapShack</b>, verze</translation>
+ <translation><b>QMapShack</b>, версия</translation>
</message>
<message>
<location filename="../IAbout.ui" line="62"/>
- <location filename="../IAbout.ui" line="106"/>
- <location filename="../IAbout.ui" line="120"/>
- <location filename="../IAbout.ui" line="134"/>
- <location filename="../IAbout.ui" line="148"/>
+ <location filename="../IAbout.ui" line="113"/>
+ <location filename="../IAbout.ui" line="127"/>
+ <location filename="../IAbout.ui" line="141"/>
+ <location filename="../IAbout.ui" line="155"/>
<source>TextLabel</source>
- <translation>Textový štítek</translation>
+ <translation>Метка текста</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="99"/>
+ <location filename="../IAbout.ui" line="106"/>
<source>Qt</source>
<translation>Qt</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="113"/>
+ <location filename="../IAbout.ui" line="120"/>
<source>GDAL</source>
<translation>GDAL</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="127"/>
+ <location filename="../IAbout.ui" line="134"/>
<source>Proj4</source>
<translation>Proj4</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="141"/>
+ <location filename="../IAbout.ui" line="148"/>
<source>Routino</source>
<translation>Routino</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="172"/>
+ <location filename="../IAbout.ui" line="179"/>
<source>Czech:</source>
- <translation>Čeština:</translation>
+ <translation>Чешский:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="195"/>
+ <location filename="../IAbout.ui" line="189"/>
+ <source>Pavel Fric</source>
+ <translation>Pavel Fric</translation>
+ </message>
+ <message>
+ <location filename="../IAbout.ui" line="202"/>
<source>German:</source>
- <translation>Němčina:</translation>
+ <translation>Немецкий:</translation>
+ </message>
+ <message>
+ <location filename="../IAbout.ui" line="212"/>
+ <source>Oliver Eichler</source>
+ <translation>Oliver Eichler</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="218"/>
+ <location filename="../IAbout.ui" line="225"/>
<source>Dutch:</source>
- <translation>Nizozemština:</translation>
+ <translation>Голландский:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="241"/>
+ <location filename="../IAbout.ui" line="235"/>
+ <source>Harrie Klomp</source>
+ <translation>Harrie Klomp</translation>
+ </message>
+ <message>
+ <location filename="../IAbout.ui" line="248"/>
<source>French:</source>
- <translation>Francouzština:</translation>
+ <translation>Французский:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="251"/>
+ <location filename="../IAbout.ui" line="258"/>
<source>Rainer Unseld </source>
<translation>Rainer Unseld</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="381"/>
- <source>Christian Eichler (qms at christian-eichler.de)
-Ivo Kronenberg</source>
- <translation>Christian Eichler (qms at christian-eichler.de)
-Ivo Kronenberg</translation>
+ <location filename="../IAbout.ui" line="265"/>
+ <source>Jose Luis Domingo Lopez</source>
+ <translation>Jose Luis Domingo Lopez</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="182"/>
- <source>Pavel Fric</source>
- <translation>Pavel Fric</translation>
+ <location filename="../IAbout.ui" line="278"/>
+ <source>Spanish:</source>
+ <translation>Испанский:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="281"/>
+ <location filename="../IAbout.ui" line="288"/>
<source><b>Translation:</b></source>
- <translation><b>Překlad</b></translation>
+ <translation><b>Перевод:</b></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="228"/>
- <source>Harrie Klomp</source>
- <translation>Harrie Klomp</translation>
+ <location filename="../IAbout.ui" line="295"/>
+ <source>Russian:</source>
+ <translation>Русский:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="271"/>
- <source>Spanish:</source>
- <translation>Španělština:</translation>
+ <location filename="../IAbout.ui" line="302"/>
+ <source>Wolfgang Thämelt</source>
+ <translation>Wolfgang Thämelt</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="305"/>
+ <location filename="../IAbout.ui" line="326"/>
<source>Win64:</source>
<translation>Win64:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="321"/>
+ <location filename="../IAbout.ui" line="342"/>
<source>OS X:</source>
<translation>OS X:</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="345"/>
- <source><b>Binaries:</b></source>
- <translation><b>Spustitelné soubory:</b></translation>
- </message>
- <message>
- <location filename="../IAbout.ui" line="374"/>
- <source><b>Contributors:</b></source>
- <translation><b>Přispěvatelé</b></translation>
- </message>
- <message>
- <location filename="../IAbout.ui" line="205"/>
- <source>Josef Latt</source>
- <translation>Josef Latt</translation>
- </message>
- <message>
- <location filename="../IAbout.ui" line="258"/>
- <source>Jose Luis Domingo Lopez</source>
- <translation>Jose Luis Domingo Lopez</translation>
- </message>
- <message>
- <location filename="../IAbout.ui" line="338"/>
+ <location filename="../IAbout.ui" line="352"/>
+ <source>Helmut Schmidt</source>
+ <translation>Helmut Schmidt</translation>
+ </message>
+ <message>
+ <location filename="../IAbout.ui" line="359"/>
<source>Ivo Kronenberg</source>
<translation>Ivo Kronenberg</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="331"/>
- <source>Helmut Schmidt</source>
- <translation>Helmut Schmidt</translation>
+ <location filename="../IAbout.ui" line="366"/>
+ <source><b>Binaries:</b></source>
+ <translation><b>Бинарники:</b></translation>
</message>
<message>
- <location filename="../IAbout.ui" line="354"/>
+ <location filename="../IAbout.ui" line="375"/>
<source>...and thanks to all Linux binary maintainers for doing a great job. Special thanks to Dan Horák and Bas Couwenberg for showing presence on the mailing list to discuss distribution related topics.</source>
- <translation>... a poděkování všem tvůrcům spustitelných souborů pro Linux za jejich dobrou práci. Zvláštní poděkování Danovi Horákovi a Basi Couwenbergovi za účast v diskuzi v poštovním seznamu.</translation>
+ <translation>... и благодарность всем поставщикам пакетов для дистрибутивов Linux за отличную работу. Особая благодарность Dan Horák и Bas Couwenberg за участие в дискуссиях о распределении QMapShack в списке рассылки.</translation>
+ </message>
+ <message>
+ <location filename="../IAbout.ui" line="395"/>
+ <source><b>Contributors:</b></source>
+ <translation><b>Участники:</b></translation>
+ </message>
+ <message>
+ <location filename="../IAbout.ui" line="402"/>
+ <source>Christian Eichler (qms at christian-eichler.de)
+Ivo Kronenberg
+Norbert Truchsess (norbert.truchsess at t-online.de)</source>
+ <translation>Christian Eichler (qms at christian-eichler.de)
+Ivo Kronenberg
+Norbert Truchsess (norbert.truchsess at t-online.de)</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="399"/>
+ <location filename="../IAbout.ui" line="421"/>
<source>This software is licensed under GPL3 or any later version</source>
- <translation>Tento program je licencován pod GPL3 nebo kteroukoli pozdější verzí</translation>
+ <translation>Это программное обеспечение лицензировано под GPL3 или любой более поздней версией</translation>
</message>
<message>
- <location filename="../IAbout.ui" line="406"/>
- <source>© 2014 Oliver Eichler (oliver.eichler at gmx.de)</source>
- <translation>© 2014 Oliver Eichler (oliver.eichler at gmx.de)</translation>
+ <location filename="../IAbout.ui" line="428"/>
+ <source>© 2017 Oliver Eichler (oliver.eichler at gmx.de)</source>
+ <translation>© 2017 Oliver Eichler (oliver.eichler at gmx.de)</translation>
</message>
</context>
<context>
@@ -4151,12 +4758,12 @@ Ivo Kronenberg</translation>
<message>
<location filename="../canvas/ICanvasSetup.ui" line="14"/>
<source>Setup Map View...</source>
- <translation>Nastavit pohled na mapu...</translation>
+ <translation>Настройка вида карт...</translation>
</message>
<message>
<location filename="../canvas/ICanvasSetup.ui" line="22"/>
<source>Projection & Datum</source>
- <translation>Promítání a datum</translation>
+ <translation>Проекция и датум</translation>
</message>
<message>
<location filename="../canvas/ICanvasSetup.ui" line="32"/>
@@ -4166,17 +4773,17 @@ Ivo Kronenberg</translation>
<message>
<location filename="../canvas/ICanvasSetup.ui" line="53"/>
<source>Scales</source>
- <translation>Měřítka</translation>
+ <translation>Масштаб</translation>
</message>
<message>
<location filename="../canvas/ICanvasSetup.ui" line="59"/>
<source>Logarithmic</source>
- <translation>Logaritmické</translation>
+ <translation>Логарифмический</translation>
</message>
<message>
<location filename="../canvas/ICanvasSetup.ui" line="66"/>
<source>Square (optimized for TMS and WTMS tiles)</source>
- <translation>Čtvereční (vyladěné pro dlaždice TMS a WTMS)</translation>
+ <translation>Квадратичный (оптимальный для карт TMS и WTMS)</translation>
</message>
</context>
<context>
@@ -4184,7 +4791,7 @@ Ivo Kronenberg</translation>
<message>
<location filename="../widgets/IColorChooser.ui" line="14"/>
<source>Dialog</source>
- <translation>Dialog</translation>
+ <translation>Диалог</translation>
</message>
</context>
<context>
@@ -4192,38 +4799,48 @@ Ivo Kronenberg</translation>
<message>
<location filename="../gis/trk/ICombineTrk.ui" line="14"/>
<source>Combine Tracks...</source>
- <translation>Spojit stopy...</translation>
+ <translation>Объединить треки...</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/ICombineTrk.ui" line="24"/>
+ <source>Available Tracks</source>
+ <translation>Доступные треки</translation>
</message>
<message>
- <location filename="../gis/trk/ICombineTrk.ui" line="43"/>
- <location filename="../gis/trk/ICombineTrk.ui" line="70"/>
- <location filename="../gis/trk/ICombineTrk.ui" line="117"/>
- <location filename="../gis/trk/ICombineTrk.ui" line="144"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="54"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="81"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="139"/>
+ <location filename="../gis/trk/ICombineTrk.ui" line="166"/>
<source>...</source>
<translation>...</translation>
</message>
+ <message>
+ <location filename="../gis/trk/ICombineTrk.ui" line="109"/>
+ <source>Combined Tracks</source>
+ <translation>Объединенные треки</translation>
+ </message>
</context>
<context>
<name>ICoordFormatSetup</name>
<message>
<location filename="../units/ICoordFormatSetup.ui" line="14"/>
<source>Coordinate Format...</source>
- <translation>Formát souřadnic...</translation>
+ <translation>Формат координат...</translation>
</message>
<message>
- <location filename="../units/ICoordFormatSetup.ui" line="36"/>
- <source>N48° 53.660 E013° 31.113</source>
- <translation>N48° 53.660 E013° 31.113</translation>
+ <location filename="../units/ICoordFormatSetup.ui" line="22"/>
+ <source>N48° 53' 39.6" E13° 31' 6.78"</source>
+ <translation>С48° 53' 39.6" В13° 31' 6.78"</translation>
</message>
<message>
<location filename="../units/ICoordFormatSetup.ui" line="29"/>
<source>N48.8943° E013.51855°</source>
- <translation>N48.8943° E013.51855°</translation>
+ <translation>С48.8943° В013.51855°</translation>
</message>
<message>
- <location filename="../units/ICoordFormatSetup.ui" line="22"/>
- <source>N48° 53' 39.6" E13° 31' 6.78"</source>
- <translation>N48° 53' 39.6" E13° 31' 6.78"</translation>
+ <location filename="../units/ICoordFormatSetup.ui" line="36"/>
+ <source>N48° 53.660 E013° 31.113</source>
+ <translation>С48° 53.660 В013° 31.113</translation>
</message>
</context>
<context>
@@ -4231,7 +4848,7 @@ Ivo Kronenberg</translation>
<message>
<location filename="../gis/rte/ICreateRouteFromWpt.ui" line="14"/>
<source>Create Route from Waypoints</source>
- <translation>Vytvořit cestu z cestovních bodů</translation>
+ <translation>Создать маршрут с маршрутных точек</translation>
</message>
<message>
<location filename="../gis/rte/ICreateRouteFromWpt.ui" line="30"/>
@@ -4245,40 +4862,46 @@ Ivo Kronenberg</translation>
<message>
<location filename="../gis/trk/ICutTrk.ui" line="14"/>
<source>Cut Track</source>
- <translation>Rozkrojit stopu</translation>
+ <translation>Вырезать трек</translation>
</message>
<message>
<location filename="../gis/trk/ICutTrk.ui" line="20"/>
<source>Delete first part of the track and keep second one</source>
- <translation>Smazat první část stopy a zachovat druhou</translation>
+ <translation>Удалить первую часть трека и сохранить вторую</translation>
</message>
<message>
- <location filename="../gis/trk/ICutTrk.ui" line="27"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="30"/>
<source>Keep both parts of the track</source>
- <translation>Zachovat obě části stopy</translation>
+ <translation>Сохранить обе части трека</translation>
</message>
<message>
- <location filename="../gis/trk/ICutTrk.ui" line="37"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="43"/>
<source>Keep first part of the track and delete second one</source>
- <translation>Zachovat první část stopy a smazat druhou</translation>
+ <translation>Сохранить первую часть трека и удалить вторую</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/ICutTrk.ui" line="55"/>
+ <source>Cut Mode:</source>
+ <translation>Режим вырезания:</translation>
</message>
<message>
- <location filename="../gis/trk/ICutTrk.ui" line="60"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="136"/>
<source>Check this to store the result into a new track.
If you keep both parts of the track you have to create new ones.
If you want to keep just one half you can simply remove the points, or check this to create a new track.</source>
- <translation>Toto zaškrtněte pro uložení výsledku do nové stopy.
+ <translation>Выбрать, чтобы сохранить результат в новый трек.
-Pokud zachováte obě části stopy, musíte vytvořit nové.
+Если вы сохраните обе части трека, вы должны создать новые.
-Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body, nebo toto zaškrtnout pro vytvoření nové stopy.</translation>
+Если вы желаете сохранить только одну часть вы можете просто удалить точки или выбрать это, чтобы создать новый трек.
+</translation>
</message>
<message>
- <location filename="../gis/trk/ICutTrk.ui" line="67"/>
+ <location filename="../gis/trk/ICutTrk.ui" line="143"/>
<source>Create a new track</source>
- <translation>Vytvořit novou stopu</translation>
+ <translation>Создать новый трек</translation>
</message>
</context>
<context>
@@ -4286,58 +4909,58 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/db/IDB.cpp" line="60"/>
<source>The internal database format of '%1' has changed. QMapShack will migrate your database, now. After the migration the database won't be usable with older versions of QMapShack. It is recommended to backup the database first.</source>
- <translation>Vnitřní formát databáze '%1' se změnil. QMapShack nyní vaši databázi přestěhuje. Po přestěhování databáze se staršími verzemi QMapShack nebude použitelná. Doporučuje se databázi nejprve zazálohovat.</translation>
+ <translation>Внутренний формат базы данных '%1' изменился. Сейчас QMapShack будет мигрировать вашу базу данных. После миграции база данных не будет работать с более старыми версиями QMapShack. Рекомендуется создать резервную копию базы данных.</translation>
</message>
<message>
<location filename="../gis/db/IDB.cpp" line="64"/>
<source>Migrate database...</source>
- <translation>Přestěhovat databázi...</translation>
+ <translation>Перенести базу данных...</translation>
</message>
<message>
<location filename="../gis/db/IDB.cpp" line="69"/>
<source>Migration aborted by user</source>
- <translation>Přestěhování přerušeno uživatelem</translation>
+ <translation>Перенесение прервано пользователем</translation>
</message>
<message>
<location filename="../gis/db/IDB.cpp" line="75"/>
<source>Failed to migrate '%1'.</source>
- <translation>Nepodařilo se přestěhovat '%1'.</translation>
+ <translation>Не удалось перенести %1.</translation>
</message>
<message>
<location filename="../gis/db/IDB.cpp" line="77"/>
<location filename="../gis/db/IDB.cpp" line="106"/>
<source>Error...</source>
- <translation>Chyba...</translation>
+ <translation>Ошибка...</translation>
</message>
<message>
<location filename="../gis/db/IDB.cpp" line="81"/>
<source>Migration failed</source>
- <translation>Přestěhování se nepodařilo</translation>
+ <translation>Не удалось перенесение</translation>
</message>
<message>
<location filename="../gis/db/IDB.cpp" line="88"/>
<source>The database version of '%1' is more advanced as the one understood by your QMapShack installation. This won't work.</source>
- <translation>Verze databáze '%1'je pokročilejší než ta, jíž rozumí vaše instalace QMapShacku. Toto nebude pracovat.</translation>
+ <translation>Версия базы данных '%1' является более продвинутой чем та, которую знает ваша установка. Это не будет работать.</translation>
</message>
<message>
<location filename="../gis/db/IDB.cpp" line="110"/>
<source>Initialization failed</source>
- <translation>Nepodařilo se inicializovat</translation>
+ <translation>Инициализация не удалось</translation>
</message>
<message>
<location filename="../gis/db/IDB.cpp" line="91"/>
<source>Wrong database version...</source>
- <translation>Nesprávná verze databáze...</translation>
+ <translation>Неверная версия базы данных...</translation>
</message>
<message>
<location filename="../gis/db/IDB.cpp" line="95"/>
<source>Database created by newer version of QMapShack</source>
- <translation>Databáze vytvořena novější verzí QMapShack</translation>
+ <translation>База данных создан при помощи более новой версии QMapShack</translation>
</message>
<message>
<location filename="../gis/db/IDB.cpp" line="104"/>
<source>Failed to initialize '%1'.</source>
- <translation>Nepodařilo se inicializovat '%1'.</translation>
+ <translation>Не удалось инициализировать %1.</translation>
</message>
</context>
<context>
@@ -4345,17 +4968,17 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/db/IDBMysql.cpp" line="60"/>
<source>Password...</source>
- <translation>Heslo...</translation>
+ <translation>Пароль...</translation>
</message>
<message>
<location filename="../gis/db/IDBMysql.cpp" line="60"/>
<source>Password for database '%1':</source>
- <translation>Heslo pro databázi '%1':</translation>
+ <translation>Пароль для базы данных '%1':</translation>
</message>
<message>
<location filename="../gis/db/IDBMysql.cpp" line="222"/>
<source>Update to database version 5. Migrate all GIS items.</source>
- <translation>Aktualizovat na verzi databáze 5. Přestěhovat všechny položky GIS.</translation>
+ <translation>Обновить базы данных к версии 5. Перенести все элементы ГИС.</translation>
</message>
</context>
<context>
@@ -4363,17 +4986,17 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/db/IDBSqlite.cpp" line="306"/>
<source>Update to database version 3. Migrate all GIS items.</source>
- <translation>Aktualizovat na verzi databáze 3. Přestěhovat všechny položky GIS.</translation>
+ <translation>Обновить базы данных к версии 3. Перенести все элементы ГИС.</translation>
</message>
<message>
<location filename="../gis/db/IDBSqlite.cpp" line="375"/>
<source>Update to database version 5. Migrate all GIS items.</source>
- <translation>Aktualizovat na verzi databáze 5. Přestěhovat všechny položky GIS.</translation>
+ <translation>Обновить базы данных к версии 5. Перенести все элементы ГИС.</translation>
</message>
<message>
<location filename="../gis/db/IDBSqlite.cpp" line="449"/>
<source>Update to database version 6. Migrate all GIS items.</source>
- <translation>Aktualizovat na verzi databáze 6. Přestěhovat všechny položky GIS.</translation>
+ <translation>Обновить базы данных к версии 6. Перенести все элементы ГИС.</translation>
</message>
</context>
<context>
@@ -4381,7 +5004,7 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../dem/IDemPathSetup.ui" line="14"/>
<source>Setup DEM file paths</source>
- <translation>Stanovit cesty k souborům s výškovými modely</translation>
+ <translation>Настройка путей ЦМР</translation>
</message>
<message>
<location filename="../dem/IDemPathSetup.ui" line="31"/>
@@ -4400,17 +5023,17 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../dem/IDemPropSetup.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../dem/IDemPropSetup.ui" line="35"/>
<source><html><head/><body><p>Change opacity of map</p></body></html></source>
- <translation><html><head/><body><p>Změnit neprůhlednost mapy</p></body></html></translation>
+ <translation><html><head/><body><p>Изменить прозрачность карты</p></body></html></translation>
</message>
<message>
<location filename="../dem/IDemPropSetup.ui" line="50"/>
<source><html><head/><body><p>Click to use current scale as minimum scale to display the map.</p></body></html></source>
- <translation><html><head/><body><p>Klepněte pro použití nynějšího měřítka jako nejmenšího měřítka pro zobrazení mapy.</p></body></html></translation>
+ <translation><html><head/><body><p>Нажать, чтобы использовать текущий масштаб как минимальный масштаб для отображения карты.</p></body></html></translation>
</message>
<message>
<location filename="../dem/IDemPropSetup.ui" line="53"/>
@@ -4421,22 +5044,22 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../dem/IDemPropSetup.ui" line="74"/>
<source><html><head/><body><p>Control the range of scale the map is displayed. Use the two buttons left and right to define the actual scale as either minimum or maximum scale.</p></body></html></source>
- <translation><html><head/><body><p>Je zobrazeno ovládání rozmezí měřítka mapy. Použijte tlačítka vlevo a vpravo pro stanovení skutečného měřítka jako buď nejmenšího nebo největšího měřítka.</p></body></html></translation>
+ <translation><html><head/><body><p>Контролировать диапазон масштаба отображения карты. С помощью двух кнопок слева и справа определить данный масштаб как минимальный или максимальный масштаб.</p></body></html></translation>
</message>
<message>
<location filename="../dem/IDemPropSetup.ui" line="87"/>
<source><html><head/><body><p>Click to use current scale as maximum scale to display the map.</p></body></html></source>
- <translation><html><head/><body><p>Klepněte pro použití nynějšího měřítka jako nejmenšího měřítka pro zobrazení mapy.</p></body></html></translation>
+ <translation><html><head/><body><p>Нажать, чтобы использовать текущий масштаб как максимальный масштаб для отображения карты.</p></body></html></translation>
</message>
<message>
<location filename="../dem/IDemPropSetup.ui" line="118"/>
<source>Hillshading</source>
- <translation>Stínování kopců</translation>
+ <translation>Затенения холмов</translation>
</message>
<message>
<location filename="../dem/IDemPropSetup.ui" line="144"/>
<source>Slope </source>
- <translation>Sklon</translation>
+ <translation>Наклон </translation>
</message>
<message>
<location filename="../dem/IDemPropSetup.ui" line="226"/>
@@ -4463,7 +5086,7 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<location filename="../dem/IDemPropSetup.ui" line="438"/>
<location filename="../dem/IDemPropSetup.ui" line="522"/>
<source>TextLabel</source>
- <translation>Textový štítek</translation>
+ <translation>Метка текста</translation>
</message>
</context>
<context>
@@ -4471,47 +5094,47 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../dem/IDemList.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../dem/IDemList.ui" line="118"/>
<source>To add files with elevation data use <b>File->Setup DEM Paths</b>. Or click <a href='setup'><b>here</b></a></source>
- <translation>Pro přidání souborů s údaji o výšce použijte <b>Soubor → Nastavit cesty k výškovým modelům</b>. Nebo klepněte <a href='setup'><b>sem</b></a></translation>
+ <translation>Чтобы добавить файлы с высотными данными использовать <b>Файл->Настройка пути к ЦМР</b>. Или нажать <a href='setup'><b>здесь</b></a></translation>
</message>
<message>
<location filename="../dem/IDemList.ui" line="131"/>
<source>Use the context menu (right mouse button click on entry) to activate a file. Use drag-n-drop to move the activated file in the process order. </source>
- <translation>Použijte související nabídku (klepnutí pravým tlačítkem myši na položku) pro zapnutí souboru. Použijte přetažení a upuštění pro posunutí zapnutého souboru v pořadí procesů. </translation>
+ <translation>Использовать контекстное меню (нажать правой кнопкой мышки на элемент), чтобы активировать файл. Использовать перетаскивание мышкой, чтобы переместить активированный файл в порядке обработки.</translation>
</message>
<message>
<location filename="../dem/IDemList.ui" line="156"/>
<source>Activate</source>
- <translation>Zapnout</translation>
+ <translation>Активировать</translation>
</message>
<message>
<location filename="../dem/IDemList.ui" line="165"/>
<source>Move Up</source>
- <translation>Posunout nahoru</translation>
+ <translation>Переместить вверх</translation>
</message>
<message>
<location filename="../dem/IDemList.ui" line="168"/>
<source>Hide DEM behind previous one</source>
- <translation>Skrýt výškový model za předchozí</translation>
+ <translation>Скрыть ЦМР за предыдущей</translation>
</message>
<message>
<location filename="../dem/IDemList.ui" line="177"/>
<source>Move down</source>
- <translation>Posunout dolů</translation>
+ <translation>Переместить вниз</translation>
</message>
<message>
<location filename="../dem/IDemList.ui" line="180"/>
<source>Show DEM on top of next one</source>
- <translation>Výškový model překrývá další</translation>
+ <translation>Показать ЦМР над следующей</translation>
</message>
<message>
<location filename="../dem/IDemList.ui" line="189"/>
<source>Reload DEM</source>
- <translation>Nahrát výškový model znovu</translation>
+ <translation>Перезагрузить ЦМР</translation>
</message>
</context>
<context>
@@ -4519,7 +5142,12 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/wpt/IDetailsGeoCache.ui" line="20"/>
<source>Dialog</source>
- <translation>Dialog</translation>
+ <translation>Диалог</translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/IDetailsGeoCache.ui" line="40"/>
+ <source>Position:</source>
+ <translation>Позиция:</translation>
</message>
<message>
<location filename="../gis/wpt/IDetailsGeoCache.ui" line="47"/>
@@ -4538,29 +5166,19 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<translation>-</translation>
</message>
<message>
- <location filename="../gis/wpt/IDetailsGeoCache.ui" line="267"/>
- <source>about:blank</source>
- <translation>o:prázdný</translation>
- </message>
- <message>
- <location filename="../gis/wpt/IDetailsGeoCache.ui" line="40"/>
- <source>Position:</source>
- <translation>Poloha:</translation>
- </message>
- <message>
<location filename="../gis/wpt/IDetailsGeoCache.ui" line="60"/>
<source>Difficulty</source>
- <translation>Obtížnost</translation>
+ <translation>Сложность</translation>
</message>
<message>
<location filename="../gis/wpt/IDetailsGeoCache.ui" line="138"/>
<source>Terrain</source>
- <translation>Terén</translation>
+ <translation>Местность</translation>
</message>
<message>
<location filename="../gis/wpt/IDetailsGeoCache.ui" line="214"/>
<source>Update spoilers</source>
- <translation>Nahrát spoiler znovu</translation>
+ <translation>Обновить спойлеры</translation>
</message>
<message>
<location filename="../gis/wpt/IDetailsGeoCache.ui" line="217"/>
@@ -4569,14 +5187,19 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<translation>...</translation>
</message>
<message>
+ <location filename="../gis/wpt/IDetailsGeoCache.ui" line="267"/>
+ <source>about:blank</source>
+ <translation>about:blank</translation>
+ </message>
+ <message>
<location filename="../gis/wpt/IDetailsGeoCache.ui" line="293"/>
<source>Hint:</source>
- <translation>Rada:</translation>
+ <translation>Подсказка:</translation>
</message>
<message>
<location filename="../gis/wpt/IDetailsGeoCache.ui" line="324"/>
<source>TextLabel</source>
- <translation>Textový štítek</translation>
+ <translation>Метка текста</translation>
</message>
</context>
<context>
@@ -4584,17 +5207,17 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/ovl/IDetailsOvlArea.ui" line="14"/>
<source>Dialog</source>
- <translation>Dialog</translation>
+ <translation>Диалог</translation>
</message>
<message>
<location filename="../gis/ovl/IDetailsOvlArea.ui" line="132"/>
- <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>
+ <source>The area was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+ <translation>Область была импортирована в QMapShack и была изменена. Она больше не показывает исходные данные. Пожалуйста, смотрите в историю изменений.</translation>
</message>
<message>
<location filename="../gis/ovl/IDetailsOvlArea.ui" line="148"/>
<source>Toggle read only mode. You have to open the lock to edit the item.</source>
- <translation>Přepnout režim pouze pro čtení. Musíte otevřít zámek, abyste mohl prvek upravovat.</translation>
+ <translation>Переключить режим 'только чтение'. Вы должны открыть замок для изменения элемента.</translation>
</message>
<message>
<location filename="../gis/ovl/IDetailsOvlArea.ui" line="151"/>
@@ -4604,42 +5227,42 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/ovl/IDetailsOvlArea.ui" line="181"/>
<source>Color</source>
- <translation>Barva</translation>
+ <translation>Цвет</translation>
</message>
<message>
<location filename="../gis/ovl/IDetailsOvlArea.ui" line="202"/>
<source>Border width</source>
- <translation>Šířka okraje</translation>
+ <translation>Ширина границы</translation>
</message>
<message>
<location filename="../gis/ovl/IDetailsOvlArea.ui" line="216"/>
<source>Style</source>
- <translation>Styl</translation>
+ <translation>Стиль</translation>
</message>
<message>
<location filename="../gis/ovl/IDetailsOvlArea.ui" line="235"/>
<source>Opacity</source>
- <translation>Neprůhlednost</translation>
+ <translation>Прозрачность</translation>
</message>
<message>
<location filename="../gis/ovl/IDetailsOvlArea.ui" line="248"/>
<source>Info</source>
- <translation>Informace</translation>
+ <translation>Сведение</translation>
</message>
<message>
<location filename="../gis/ovl/IDetailsOvlArea.ui" line="277"/>
<source>Points</source>
- <translation>Body</translation>
+ <translation>Точки</translation>
</message>
<message>
<location filename="../gis/ovl/IDetailsOvlArea.ui" line="304"/>
<source>Position</source>
- <translation>Poloha</translation>
+ <translation>Позиция</translation>
</message>
<message>
<location filename="../gis/ovl/IDetailsOvlArea.ui" line="313"/>
<source>Hist.</source>
- <translation>Hist.</translation>
+ <translation>История</translation>
</message>
</context>
<context>
@@ -4647,7 +5270,12 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/prj/IDetailsPrj.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/IDetailsPrj.ui" line="43"/>
+ <source>Keywords:</source>
+ <translation>Ключевые слова:</translation>
</message>
<message>
<location filename="../gis/prj/IDetailsPrj.ui" line="50"/>
@@ -4656,41 +5284,36 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<translation>-</translation>
</message>
<message>
- <location filename="../gis/prj/IDetailsPrj.ui" line="110"/>
- <source>Print diary</source>
- <translation>Tisk deníku</translation>
- </message>
- <message>
- <location filename="../gis/prj/IDetailsPrj.ui" line="89"/>
- <location filename="../gis/prj/IDetailsPrj.ui" line="113"/>
- <location filename="../gis/prj/IDetailsPrj.ui" line="133"/>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
<location filename="../gis/prj/IDetailsPrj.ui" line="71"/>
<source>Keep order of project</source>
- <translation>Zachovat pořadí projektu</translation>
+ <translation>Сохранить порядок проекта</translation>
</message>
<message>
<location filename="../gis/prj/IDetailsPrj.ui" line="76"/>
<source>Sort along track (multiple)</source>
- <translation>Třídit podle stopy (vícenásobně)</translation>
+ <translation>Отсортировать вдоль трека (кратно)</translation>
</message>
<message>
<location filename="../gis/prj/IDetailsPrj.ui" line="81"/>
<source>Sort along track (single)</source>
- <translation>Třídit podle stopy (jednorázově)</translation>
+ <translation>Отсортировать вдоль трека (одинарно)</translation>
</message>
<message>
- <location filename="../gis/prj/IDetailsPrj.ui" line="130"/>
- <source>Rebuild diary.</source>
- <translation>Sestavit deník znovu.</translation>
+ <location filename="../gis/prj/IDetailsPrj.ui" line="89"/>
+ <location filename="../gis/prj/IDetailsPrj.ui" line="113"/>
+ <location filename="../gis/prj/IDetailsPrj.ui" line="133"/>
+ <source>...</source>
+ <translation>...</translation>
</message>
<message>
- <location filename="../gis/prj/IDetailsPrj.ui" line="43"/>
- <source>Keywords:</source>
- <translation>Klíčová slova:</translation>
+ <location filename="../gis/prj/IDetailsPrj.ui" line="110"/>
+ <source>Print diary</source>
+ <translation>Печатать дневник</translation>
+ </message>
+ <message>
+ <location filename="../gis/prj/IDetailsPrj.ui" line="130"/>
+ <source>Rebuild diary.</source>
+ <translation>Перестроить дневник.</translation>
</message>
</context>
<context>
@@ -4698,22 +5321,17 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/rte/IDetailsRte.ui" line="36"/>
<source>Info</source>
- <translation>Informace</translation>
- </message>
- <message>
- <location filename="../gis/rte/IDetailsRte.ui" line="205"/>
- <source>-</source>
- <translation>-</translation>
+ <translation>Сведение</translation>
</message>
<message>
<location filename="../gis/rte/IDetailsRte.ui" line="154"/>
- <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>
+ <source>The route was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+ <translation>Маршрут импортирован в QMapShack и был изменен. Он больше не показывает исходные данные. Пожалуйста, смотрите в историю изменений.</translation>
</message>
<message>
<location filename="../gis/rte/IDetailsRte.ui" line="170"/>
<source>Toggle read only mode. You have to open the lock to edit the item.</source>
- <translation>Přepnout režim pouze pro čtení. Musíte otevřít zámek, abyste mohl prvek upravovat.</translation>
+ <translation>Переключить режим 'только чтение'. Вы должны открыть замок для изменения элемента.</translation>
</message>
<message>
<location filename="../gis/rte/IDetailsRte.ui" line="173"/>
@@ -4721,9 +5339,14 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<translation>...</translation>
</message>
<message>
+ <location filename="../gis/rte/IDetailsRte.ui" line="205"/>
+ <source>-</source>
+ <translation>-</translation>
+ </message>
+ <message>
<location filename="../gis/rte/IDetailsRte.ui" line="229"/>
<source>Hist.</source>
- <translation>Hist.</translation>
+ <translation>История</translation>
</message>
</context>
<context>
@@ -4731,7 +5354,7 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="81"/>
@@ -4742,19 +5365,9 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
-</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1029"/>
- <source>Profile</source>
- <translation>Profil</translation>
- </message>
- <message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1498"/>
- <source>Speed</source>
- <translation>Rychlost</translation>
- </message>
- <message>
<location filename="../gis/trk/IDetailsTrk.ui" line="287"/>
<source>Toggle read only mode. You have to open the lock to edit the item.</source>
- <translation>Přepnout režim pouze pro čtení. Musíte otevřít zámek, abyste mohl prvek upravovat.</translation>
+ <translation>Переключить режим 'только чтение'. Вы должны открыть замок для изменения элемента.</translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="290"/>
@@ -4778,206 +5391,216 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<translation>...</translation>
</message>
<message>
- <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>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="316"/>
+ <source>-</source>
+ <translation>-</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="355"/>
+ <source>Info</source>
+ <translation>Сведение</translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="387"/>
<source>Style</source>
- <translation>Styl</translation>
+ <translation>Стиль</translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="429"/>
<source>Source</source>
- <translation>Zdroj</translation>
+ <translation>Источник</translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="634"/>
<source>Maximum</source>
- <translation>Nejvyšší hodnota</translation>
+ <translation>Максимум</translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="451"/>
<source>Use/edit user defined visibility of arrows for this track</source>
- <translation>Použít/Upravit uživatelsky stanovenou viditelnost směrových šipek pro tuto stopu</translation>
+ <translation>Использовать/изменить определённая пользователем видимость стрелок направления для этого трека</translation>
</message>
<message>
<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>
+ <translation>Использовать/изменить системная видимость стрелок направления для всех треков</translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="774"/>
<source>Minimum</source>
- <translation>Nejnižší hodnota</translation>
+ <translation>Минимум</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="842"/>
+ <source>Graphs</source>
+ <translation>Графики</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1029"/>
+ <source>Profile</source>
+ <translation>Профиль</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="436"/>
+ <source>Width</source>
+ <translation>Ширина</translation>
</message>
<message>
<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>
+ <translation>Использовать/изменить пользовательский коэффициент масштабирования для этого трека</translation>
</message>
<message>
<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>
+ <translation>Использовать/изменить фактор по умолчанию система для всех треков</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="641"/>
+ <source>with arrows</source>
+ <translation>со стрелками</translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="648"/>
<source>x </source>
- <translation>x </translation>
+ <translation>х </translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="436"/>
- <source>Width</source>
- <translation>Šířka</translation>
+ <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>Определённые пользователем пределы для этого трека</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="641"/>
- <source>with arrows</source>
- <translation>se směrovými šipkami</translation>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="56"/>
+ <source>-
+-
+-</source>
+ <translation>-
+-
+-</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="842"/>
- <source>Graphs</source>
- <translation>Grafy</translation>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="265"/>
+ <source>The track was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+ <translation>Трек был импортирован в QMapShack и был изменен. Он больше не показывает исходные данные. Пожалуйста, смотрите в историю изменений.</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>Автоматическая установка пределов</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="600"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1108"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1205"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1302"/>
+ <source>User defined limits for all tracks</source>
+ <translation>Определённые пользователем пределы для всех треков</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="794"/>
+ <source>Color</source>
+ <translation>Цвет</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="855"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="875"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="961"/>
+ <source>max.</source>
+ <translation>макс.</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="994"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1001"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1015"/>
+ <source>min.</source>
+ <translation>мин.</translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="1334"/>
<source>Activity</source>
- <translation>Činnost</translation>
+ <translation>Мероприятия</translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="1357"/>
<source>Set Track Activity</source>
- <translation>Nastavit činnost stopy</translation>
+ <translation>Добавить мероприятие</translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="1364"/>
<source>Remove Track Activity</source>
- <translation>Odstranit činnost stopy</translation>
+ <translation>Сбросить мероприятия</translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="1403"/>
<source>To differentiate the track statistics select an activity from the list for the complete track. Or select a part of the track to assign an activity.</source>
- <translation>K rozlišení statistik stop zvolte v seznamu činnost pro celou stopu. Nebo vyberte část stopy a přiřaďte jí činnost.</translation>
+ <translation>Чтобы получить статистику трека выбрать мероприятие для полного трека из списка. Или выбрать часть трека, чтобы назначить мероприятие.</translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="1430"/>
<source>Points</source>
- <translation>Body</translation>
+ <translation>Точки</translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="1478"/>
<source>Time</source>
- <translation>Čas</translation>
+ <translation>Время</translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="1483"/>
<source>Ele.</source>
- <translation>Výška</translation>
+ <translation>Высота</translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="1488"/>
<source>Delta</source>
- <translation>Rozdíl</translation>
+ <translation>Разница</translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="1493"/>
<source>Dist.</source>
- <translation>Vzdál.</translation>
- </message>
- <message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1503"/>
- <source>Slope</source>
- <translation>Sklon</translation>
- </message>
- <message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1518"/>
- <source>Position</source>
- <translation>Poloha</translation>
- </message>
- <message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="355"/>
- <source>Info</source>
- <translation>Informace</translation>
- </message>
- <message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="316"/>
- <source>-</source>
- <translation>-</translation>
- </message>
- <message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="855"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="875"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="961"/>
- <source>max.</source>
- <translation>max.</translation>
- </message>
- <message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="994"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1001"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1015"/>
- <source>min.</source>
- <translation>min.</translation>
- </message>
- <message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="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="56"/>
- <source>-
--
--</source>
- <translation>-
--
--</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>
+ <translation>Расстояние</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="600"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1108"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1205"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1302"/>
- <source>User defined limits for all tracks</source>
- <translation>Uživatelsky stanovené hraniční hodnoty pro všechny stopy</translation>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1498"/>
+ <source>Speed</source>
+ <translation>Скорость</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="794"/>
- <source>Color</source>
- <translation>Barva</translation>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1503"/>
+ <source>Slope</source>
+ <translation>Наклон</translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="1508"/>
<source>Ascent</source>
- <translation type="unfinished"></translation>
+ <translation>Подъем</translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="1513"/>
<source>Descent</source>
- <translation type="unfinished"></translation>
+ <translation>Спуск</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1518"/>
+ <source>Position</source>
+ <translation>Позиция</translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="1527"/>
<source>Filter</source>
- <translation>Filtr</translation>
+ <translation>Фильтр</translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="1564"/>
<source>Hist.</source>
- <translation>Historie</translation>
+ <translation>История</translation>
</message>
</context>
<context>
@@ -4985,30 +5608,17 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/wpt/IDetailsWpt.ui" line="14"/>
<source>Dialog</source>
- <translation>Dialog</translation>
- </message>
- <message>
- <location filename="../gis/wpt/IDetailsWpt.ui" line="284"/>
- <source>Toggle read only mode. You have to open the lock to edit the item.</source>
- <translation>Přepnout režim pouze pro čtení. Musíte otevřít zámek, abyste mohl prvek upravovat.</translation>
+ <translation>Диалог</translation>
</message>
<message>
- <location filename="../gis/wpt/IDetailsWpt.ui" line="287"/>
- <location filename="../gis/wpt/IDetailsWpt.ui" line="342"/>
- <location filename="../gis/wpt/IDetailsWpt.ui" line="362"/>
- <location filename="../gis/wpt/IDetailsWpt.ui" line="394"/>
- <source>...</source>
- <translation>...</translation>
+ <location filename="../gis/wpt/IDetailsWpt.ui" line="43"/>
+ <source>Info</source>
+ <translation>Сведение</translation>
</message>
<message>
<location filename="../gis/wpt/IDetailsWpt.ui" line="77"/>
<source>Position:</source>
- <translation>Poloha:</translation>
- </message>
- <message>
- <location filename="../gis/wpt/IDetailsWpt.ui" line="43"/>
- <source>Info</source>
- <translation>Informace</translation>
+ <translation>Позиция:</translation>
</message>
<message>
<location filename="../gis/wpt/IDetailsWpt.ui" line="84"/>
@@ -5021,37 +5631,50 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/wpt/IDetailsWpt.ui" line="97"/>
<source>Ele.</source>
- <translation>Výška</translation>
+ <translation>Высота</translation>
</message>
<message>
<location filename="../gis/wpt/IDetailsWpt.ui" line="123"/>
<source>Proximity:</source>
- <translation>Blízkost:</translation>
+ <translation>Близость:</translation>
</message>
<message>
<location filename="../gis/wpt/IDetailsWpt.ui" line="268"/>
- <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>
+ <source>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+ <translation>Маршрутная точка была импортирована в QMapShack и была изменена. Она больше не показывает исходные данные. Пожалуйста, смотрите в историю изменений.</translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/IDetailsWpt.ui" line="284"/>
+ <source>Toggle read only mode. You have to open the lock to edit the item.</source>
+ <translation>Переключить режим 'только чтение'. Вы должны открыть замок для изменения элемента.</translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/IDetailsWpt.ui" line="287"/>
+ <location filename="../gis/wpt/IDetailsWpt.ui" line="342"/>
+ <location filename="../gis/wpt/IDetailsWpt.ui" line="362"/>
+ <location filename="../gis/wpt/IDetailsWpt.ui" line="394"/>
+ <source>...</source>
+ <translation>...</translation>
</message>
<message>
- <location filename="../gis/wpt/IDetailsWpt.ui" line="413"/>
- <source>Hist.</source>
- <translation>Historie</translation>
+ <location filename="../gis/wpt/IDetailsWpt.ui" line="321"/>
+ <source>Date/Time:</source>
+ <translation>Дата/время:</translation>
</message>
<message>
<location filename="../gis/wpt/IDetailsWpt.ui" line="339"/>
<source>Add images.</source>
- <translation>Přidat obrázky.</translation>
+ <translation>Добавить изображения.</translation>
</message>
<message>
<location filename="../gis/wpt/IDetailsWpt.ui" line="359"/>
<source>Delete selected image.</source>
- <translation>Smazat vybraný obrázek.</translation>
+ <translation>Удалить выбранное изображение.</translation>
</message>
<message>
- <location filename="../gis/wpt/IDetailsWpt.ui" line="321"/>
- <source>Date/Time:</source>
- <translation>Datum/Čas:</translation>
+ <location filename="../gis/wpt/IDetailsWpt.ui" line="413"/>
+ <source>Hist.</source>
+ <translation>История</translation>
</message>
</context>
<context>
@@ -5059,7 +5682,7 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../device/IDevice.cpp" line="292"/>
<source>There is another project with the same name. If you press 'ok' it will be removed and replaced.</source>
- <translation>Je jiný projekt se stejným názvem. Pokud stisknete OK, bude odstraněn a nahrazen.</translation>
+ <translation>Существует другой проект с таким же именем. Если нажать кнопку 'ОК', он будет удален и заменен.</translation>
</message>
</context>
<context>
@@ -5067,12 +5690,12 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../helpers/IElevationDialog.ui" line="14"/>
<source>Edit elevation...</source>
- <translation>Upravit výšku...</translation>
+ <translation>Изменить высоту...</translation>
</message>
<message>
<location filename="../helpers/IElevationDialog.ui" line="22"/>
<source>Elevation</source>
- <translation>Výška</translation>
+ <translation>Высота</translation>
</message>
<message>
<location filename="../helpers/IElevationDialog.ui" line="32"/>
@@ -5082,7 +5705,7 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../helpers/IElevationDialog.ui" line="39"/>
<source>Get elevation from active digital elevation model.</source>
- <translation>Získat výšku z činného digitálního výškového modelu.</translation>
+ <translation>Получить высоту из активной цифровой модели рельефа.</translation>
</message>
<message>
<location filename="../helpers/IElevationDialog.ui" line="42"/>
@@ -5095,42 +5718,42 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/db/IExportDatabase.ui" line="14"/>
<source>Export database to GPX...</source>
- <translation type="unfinished"></translation>
+ <translation>Экспортировать в GPX...</translation>
</message>
<message>
<location filename="../gis/db/IExportDatabase.ui" line="22"/>
<source>...</source>
- <translation type="unfinished">...</translation>
+ <translation>...</translation>
</message>
<message>
<location filename="../gis/db/IExportDatabase.ui" line="33"/>
<source>Export Path:</source>
- <translation type="unfinished"></translation>
+ <translation>Путь для экспорта:</translation>
</message>
<message>
<location filename="../gis/db/IExportDatabase.ui" line="46"/>
<source>-</source>
- <translation type="unfinished">-</translation>
+ <translation>-</translation>
</message>
<message>
<location filename="../gis/db/IExportDatabase.ui" line="55"/>
<source>GPX 1.1 without extensions</source>
- <translation type="unfinished"></translation>
+ <translation>GPX 1.1 без расширений</translation>
</message>
<message>
<location filename="../gis/db/IExportDatabase.ui" line="83"/>
<source>Start</source>
- <translation type="unfinished">Spustit</translation>
+ <translation>Начать</translation>
</message>
<message>
<location filename="../gis/db/IExportDatabase.ui" line="93"/>
<source>Abort</source>
- <translation type="unfinished">Přerušit</translation>
+ <translation>Прервать</translation>
</message>
<message>
<location filename="../gis/db/IExportDatabase.ui" line="100"/>
<source>Close</source>
- <translation type="unfinished">Zavřít</translation>
+ <translation>Закрыть</translation>
</message>
</context>
<context>
@@ -5138,17 +5761,17 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/trk/filter/IFilterDelete.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterDelete.ui" line="51"/>
<source><b>Remove Track Points</b></source>
- <translation><b>Odstranit body stopy</b></translation>
+ <translation><b>Удалить точки трека</b></translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterDelete.ui" line="63"/>
<source>Remove all hidden track points permanently.</source>
- <translation>Odstranit trvale všechny skryté body stopy.</translation>
+ <translation>Удалить все скрытые точки безвозвратно.</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterDelete.ui" line="70"/>
@@ -5161,22 +5784,22 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/trk/filter/IFilterDeleteExtension.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterDeleteExtension.ui" line="51"/>
<source><b>Remove Extension from all Track Points</b></source>
- <translation><b>Odstranit rozšíření ze všech bodů stopy</b></translation>
+ <translation><b>Удалить расширение от всех маршрутных точек</b></translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterDeleteExtension.ui" line="63"/>
<source>Remove </source>
- <translation>Odstranit</translation>
+ <translation>Удалить </translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterDeleteExtension.ui" line="83"/>
<source>from all Track Points</source>
- <translation>ze všech bodů stopy</translation>
+ <translation>от всех точек трека</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterDeleteExtension.ui" line="103"/>
@@ -5189,27 +5812,27 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/trk/filter/IFilterDouglasPeuker.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterDouglasPeuker.ui" line="45"/>
<source><b>Hide Points (Douglas Peuker)</b></source>
- <translation><b>Skrýt cestovní body (Douglas Peuker)</b></translation>
+ <translation><b>Скрыть точки (Douglas Peuker)</b></translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterDouglasPeuker.ui" line="57"/>
<source>Hide track points if the distance to a line between neighboring points is less than</source>
- <translation>Skrýt body stopy, když je vzdálenost k čáře mezi sousedícími body méně než</translation>
+ <translation>Скрыть точки трека если расстояние до линии между соседними точками меньше чем</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterDouglasPeuker.ui" line="70"/>
<source>m</source>
- <translation>m</translation>
+ <translation> м</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterDouglasPeuker.ui" line="93"/>
<source>Apply filter now.</source>
- <translation>Použít filtr nyní.</translation>
+ <translation>Применить фильтр.</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterDouglasPeuker.ui" line="96"/>
@@ -5222,32 +5845,32 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="14"/>
<source>Form</source>
- <translation type="unfinished">Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="51"/>
<source><b>Interpolate Elevation Data</b></source>
- <translation type="unfinished"></translation>
+ <translation><b>Интерполировать высотные данные</b></translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="69"/>
<source>Replace elevation of track points with interpolated data.</source>
- <translation type="unfinished"></translation>
+ <translation>Заменить высоты точек трека интерполированными значениями.</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="76"/>
<source>Quality</source>
- <translation type="unfinished"></translation>
+ <translation>Качество</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="105"/>
<source>Preview</source>
- <translation type="unfinished"></translation>
+ <translation>Предпросмотр</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="112"/>
<source>...</source>
- <translation type="unfinished">...</translation>
+ <translation>...</translation>
</message>
</context>
<context>
@@ -5255,17 +5878,17 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/trk/filter/IFilterInvalid.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterInvalid.ui" line="41"/>
<source>Hide Invalid Points</source>
- <translation>Skrýt neplatné body</translation>
+ <translation>Скрыть неверные точки</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterInvalid.ui" line="56"/>
<source>Hide points with invalid data.</source>
- <translation>Skrýt body s neplatnými daty.</translation>
+ <translation>Скрыть точки с неверными данными.</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterInvalid.ui" line="63"/>
@@ -5278,22 +5901,22 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/trk/filter/IFilterMedian.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterMedian.ui" line="51"/>
<source><b>Smooth Profile (Median Method)</b></source>
- <translation><b>Vyhladit profil (Metoda střední hodnoty)</b></translation>
+ <translation><b>Сгладить профиль (метод медиана)</b></translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterMedian.ui" line="63"/>
<source>Smooth deviation of the track points elevation with a Median filter of size </source>
- <translation>Zmenšit odchylku výšky bodů stopy pomocí filtru střední hodnoty o velikosti </translation>
+ <translation>Сгладить отклонение высот точек используя фильтр медиана размера </translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterMedian.ui" line="76"/>
<source>points</source>
- <translation>Body</translation>
+ <translation> точек</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterMedian.ui" line="105"/>
@@ -5306,22 +5929,22 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/trk/filter/IFilterNewDate.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterNewDate.ui" line="35"/>
<source><b>Change Time</b></source>
- <translation><b>Změnit čas</b></translation>
+ <translation><b>Изменить метки времени</b></translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterNewDate.ui" line="44"/>
<source>Change start of track to </source>
- <translation>Změnit začáteční čas stopy na </translation>
+ <translation>Изменить начало трека на</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterNewDate.ui" line="51"/>
<source>dd.MM.yy HH:mm:ss</source>
- <translation>dd.MM.yy HH:mm:ss</translation>
+ <translation>дд.ММ.гг ЧЧ.мм.сс</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterNewDate.ui" line="61"/>
@@ -5339,27 +5962,27 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/trk/filter/IFilterObscureDate.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterObscureDate.ui" line="45"/>
<source><b>Obscure Timestamps</b></source>
- <translation><b>Zastřít časová razítka</b></translation>
+ <translation><b>Скрыть метки времени</b></translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterObscureDate.ui" line="54"/>
<source>Increase timestamp by</source>
- <translation>Zvětšit časové razítko o </translation>
+ <translation>Увеличить метку времени на</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterObscureDate.ui" line="61"/>
<source> sec.</source>
- <translation> s</translation>
+ <translation> сек.</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterObscureDate.ui" line="68"/>
<source>with each track point. 0 sec. will remove timestamps.</source>
- <translation>pro každý cestovní bod. 0 s odstraní všechna časová razítka.</translation>
+ <translation>для каждой точки трека. Значение 0 сек.: удалить метки времени.</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterObscureDate.ui" line="88"/>
@@ -5372,22 +5995,22 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/trk/filter/IFilterOffsetElevation.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterOffsetElevation.ui" line="51"/>
<source><b>Offset Elevation</b></source>
- <translation><b>Vyrovnat výšku</b></translation>
+ <translation><b>Сместить высоту</b></translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterOffsetElevation.ui" line="69"/>
<source>Add offset of</source>
- <translation>Přidat posun </translation>
+ <translation>Добавить смещение</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterOffsetElevation.ui" line="95"/>
<source>to track points elevation.</source>
- <translation>ke každé výšce bodu stopy.</translation>
+ <translation>к высотам точек трека.</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterOffsetElevation.ui" line="115"/>
@@ -5400,17 +6023,17 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/trk/filter/IFilterReplaceElevation.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterReplaceElevation.ui" line="51"/>
<source><b>Replace Elevation Data</b></source>
- <translation><b>Nahradit data výšky</b></translation>
+ <translation><b>Заменить высотные данные</b></translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterReplaceElevation.ui" line="63"/>
<source>Replace elevation of track points with the values from loaded DEM files.</source>
- <translation>Nahradit výšková data bodů stopy daty z nahraných souborů s digitálními výškovými modely.</translation>
+ <translation>Заменить высотные данные данными файлов ЦМР.</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterReplaceElevation.ui" line="70"/>
@@ -5423,17 +6046,17 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/trk/filter/IFilterReset.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterReset.ui" line="35"/>
<source><b>Reset Hidden Track Points</b></source>
- <translation><b>Nastavit znovu skryté body stopy</b></translation>
+ <translation><b>Восстановить скрытые точки трека</b></translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterReset.ui" line="47"/>
<source>Make all trackpoints visible again.</source>
- <translation>Udělat všechny body stopy znovu viditelnými.</translation>
+ <translation>Восстановить все скрытые точки трека.</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterReset.ui" line="54"/>
@@ -5446,22 +6069,22 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/trk/filter/IFilterSpeed.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterSpeed.ui" line="35"/>
<source><b>Change Speed</b></source>
- <translation><b>Změnit rychlost</b></translation>
+ <translation><b>Изменить скорость</b></translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterSpeed.ui" line="44"/>
<source>Set speed to </source>
- <translation>Změnit rychlost na </translation>
+ <translation>Установить скорость в</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterSpeed.ui" line="51"/>
<source> km/h</source>
- <translation> km/h</translation>
+ <translation> км/ч</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterSpeed.ui" line="102"/>
@@ -5474,17 +6097,17 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/trk/filter/IFilterSplitSegment.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterSplitSegment.ui" line="51"/>
<source><html><head/><body><p><span style=" font-weight:600;">Split Segments into Tracks</span></p></body></html></source>
- <translation><html><head/><body><p><span style=" font-weight:600;">Rozdělit části do stop</span></p></body></html></translation>
+ <translation><html><head/><body><p><span style=" font-weight:600;">Разделить сегменты в треки</span></p></body></html></translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterSplitSegment.ui" line="63"/>
<source>Creates a new track for every segment within this track.</source>
- <translation>Pro každou část v této stopě se vytvoří nová stopa.</translation>
+ <translation>Создать новый трек для каждого сегмента трека.</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterSplitSegment.ui" line="70"/>
@@ -5497,22 +6120,22 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/trk/filter/IFilterSubPt2Pt.ui" line="14"/>
<source>Form</source>
- <translation type="unfinished">Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterSubPt2Pt.ui" line="35"/>
<source><b>Convert track subpoints to points</b></source>
- <translation type="unfinished"></translation>
+ <translation><b>Преобразовать подточки трека в точки трека</b></translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterSubPt2Pt.ui" line="47"/>
<source>Convert subpoints obtained from routing to ordinary track points </source>
- <translation type="unfinished"></translation>
+ <translation>Преобразовать подточки полученные от маршрутизации в точки трека</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterSubPt2Pt.ui" line="54"/>
<source>...</source>
- <translation type="unfinished">...</translation>
+ <translation>...</translation>
</message>
</context>
<context>
@@ -5520,7 +6143,7 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/fit/decoder/IFitDecoderState.cpp" line="32"/>
<source>FIT decoding error: Decoder not in correct state %1 after last data byte in file.</source>
- <translation>Chyba při dekódování FIT: Nesprávný stav dekodéru %1 po posledním bytu dat v souboru.</translation>
+ <translation>Ошибка декодирования FIT: декодер в неверном состоянии %1 после последнего байта в файле.</translation>
</message>
</context>
<context>
@@ -5528,159 +6151,159 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<message>
<location filename="../gis/IGisItem.cpp" line="44"/>
<source>[no name]</source>
- <translation>[žádný název]</translation>
+ <translation>[нет имени]</translation>
</message>
<message>
<location filename="../gis/IGisItem.cpp" line="316"/>
<source>The item is not part of the project in the database.</source>
- <translation>Prvek není částí projektu v databázi.</translation>
+ <translation>Элемент не является частью проекта в базе данных.</translation>
</message>
<message>
<location filename="../gis/IGisItem.cpp" line="317"/>
<source>
It is either a new item or it has been deleted in the database by someone else.</source>
<translation>
-Buď je to nový symbol nebo byl v databázi někým smazán.</translation>
+Это или новый элемент, или элемент был удален с базы данных кем-то другим.</translation>
</message>
<message>
<location filename="../gis/IGisItem.cpp" line="323"/>
<source>The item is not in the database.</source>
- <translation>Prvek není v databázi.</translation>
+ <translation>Элемент не в базе данных.</translation>
</message>
<message>
<location filename="../gis/IGisItem.cpp" line="329"/>
<source>The item might need to be saved</source>
- <translation>Může být potřeba prvek uložit.</translation>
+ <translation>Возможно нужно сохранить элемент</translation>
</message>
<message>
<location filename="../gis/IGisItem.cpp" line="413"/>
<source>Initial version.</source>
- <translation>Počáteční verze.</translation>
+ <translation>Исходная версия.</translation>
</message>
<message>
<location filename="../gis/IGisItem.cpp" line="521"/>
<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>
+ <translation><h3>%1</h3> Вероятно, это элемент доступен только для чтения, потому что он не был создан внутри QMapShack. Обычно нет необходимости изменить импортированные данные. Но если для вас это приемлемо нажмите "Да".</translation>
</message>
<message>
<location filename="../gis/IGisItem.cpp" line="522"/>
<source>Read Only Mode...</source>
- <translation>Režim pouze pro čtení...</translation>
+ <translation>Режим 'только чтения'...</translation>
</message>
<message>
<location filename="../gis/IGisItem.cpp" line="692"/>
<location filename="../gis/IGisItem.cpp" line="745"/>
<source><h4>Description:</h4></source>
- <translation><h4>Popis:</h4></translation>
+ <translation><h4>Описание:</h4></translation>
</message>
<message>
<location filename="../gis/IGisItem.cpp" line="695"/>
<location filename="../gis/IGisItem.cpp" line="748"/>
<source><p>--- no description ---</p></source>
- <translation><p>--- žádný popis ---</p></translation>
+ <translation><p>---нет описания---</p></translation>
</message>
<message>
<location filename="../gis/IGisItem.cpp" line="706"/>
<source><h4>Comment:</h4></source>
- <translation><h4>Poznámka:</h4></translation>
+ <translation><h4>Комментарий:</h4></translation>
</message>
<message>
<location filename="../gis/IGisItem.cpp" line="709"/>
<source><p>--- no comment ---</p></source>
- <translation><p>--- žádná poznámka ---</p></translation>
+ <translation><p>---нет комментария---</p></translation>
</message>
<message>
<location filename="../gis/IGisItem.cpp" line="720"/>
<location filename="../gis/IGisItem.cpp" line="759"/>
<source><h4>Links:</h4></source>
- <translation><h4>Odkazy:</h4></translation>
+ <translation><h4>Ссылки:</h4></translation>
</message>
<message>
<location filename="../gis/IGisItem.cpp" line="723"/>
<location filename="../gis/IGisItem.cpp" line="762"/>
<source><p>--- no links ---</p></source>
- <translation><p>--- žádné odkazy ---</p></translation>
+ <translation><p>---нет ссылок---</p></translation>
</message>
<message>
<location filename="../gis/IGisItem.cpp" line="838"/>
<source>Edit name...</source>
- <translation>Upravit název...</translation>
+ <translation>Изменить имя...</translation>
</message>
<message>
<location filename="../gis/IGisItem.cpp" line="838"/>
<source>Enter new %1 name.</source>
- <translation>Zadat nový název %1.</translation>
+ <translation>Задать новое имя (%1).</translation>
</message>
</context>
<context>
<name>IGisProject</name>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="109"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="155"/>
<source>Save project?</source>
- <translation>Uložit projekt?</translation>
+ <translation>Сохранить проект?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="109"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="155"/>
<source><h3>%1</h3>The project was changed. Save before closing it?</source>
- <translation><h3>%1</h3>Projekt byl změněn. Uložit jej před zavřením?</translation>
+ <translation><h3>%1</h3> Проект изменен. Сохранить его перед закрытием?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="283"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="329"/>
<source>%1: Correlate tracks and waypoints.</source>
- <translation>%1: Svázat stopy a cestovní body.</translation>
+ <translation>%1: коррелировать треки и маршрутные точки.</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="293"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="339"/>
<source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
- <translation><h3>%1</h3>Trvalo to moc dlouho? Chcete svázání stop a cestovních bodů pro tento projekt přeskočit i v budoucnu?</translation>
+ <translation><h3>%1</h3> Было слишком долго? Желаете ли вы пропускать корреляцию треков и маршрутных точек для этого проекта в будущем?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="294"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="340"/>
<source>Canceled correlation...</source>
- <translation>Svázání zrušeno...</translation>
+ <translation>Корреляция отменена ...</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="339"/>
- <location filename="../gis/prj/IGisProject.cpp" line="392"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="385"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="442"/>
<source>Save "%1" to...</source>
- <translation>Uložit "%1" do...</translation>
+ <translation>Сохранить "%1" в...</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="477"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="527"/>
<source><br/>
Filename: %1</source>
<translation><br/>
-Název souboru: %1</translation>
+Имя файла: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="482"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="532"/>
<source>Waypoints: %1</source>
- <translation>Cestovní body: %1</translation>
+ <translation>Маршрутные точки: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="486"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="536"/>
<source>Tracks: %1</source>
- <translation>Stopy: %1</translation>
+ <translation>Треки: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="490"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="540"/>
<source>Routes: %1</source>
- <translation>Cesty: %1</translation>
+ <translation>Маршруты: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="494"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="544"/>
<source>Areas: %1</source>
- <translation>Oblasti: %1</translation>
+ <translation>Области: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="614"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="664"/>
<source>Are you sure you want to delete '%1' from project '%2'?</source>
- <translation>Jste si jistý, že chcete smazat '%1' z projektu '%2'?</translation>
+ <translation>Вы уверены что хотите удалить '%1' из проекта '%2'?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="615"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="665"/>
<source>Delete...</source>
- <translation>Smazat...</translation>
+ <translation>Удалить...</translation>
</message>
</context>
<context>
@@ -5688,33 +6311,33 @@ Název souboru: %1</translation>
<message>
<location filename="../gis/IGisWidget.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="37"/>
+ <location filename="../gis/IGisWidget.ui" line="49"/>
<source>Opacity</source>
- <translation type="unfinished">Neprůhlednost</translation>
+ <translation>Прозрачность</translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="44"/>
+ <location filename="../gis/IGisWidget.ui" line="56"/>
<source>Change the opacity of all GIS Items on the map.</source>
- <translation type="unfinished"></translation>
+ <translation>Изменить прозрачность всех элементов ГИС на карте.</translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="96"/>
- <location filename="../gis/IGisWidget.ui" line="126"/>
+ <location filename="../gis/IGisWidget.ui" line="108"/>
+ <location filename="../gis/IGisWidget.ui" line="138"/>
<source>Name</source>
- <translation>Název</translation>
+ <translation>Имя</translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="131"/>
+ <location filename="../gis/IGisWidget.ui" line="143"/>
<source>Age</source>
- <translation>Věk</translation>
+ <translation>Срок</translation>
</message>
<message>
- <location filename="../gis/IGisWidget.ui" line="165"/>
+ <location filename="../gis/IGisWidget.ui" line="177"/>
<source>To add a database do a right click on the database list above.</source>
- <translation>Pro přidání databáze klepněte pravým tlačítkem myši na seznam s databázemi výše.</translation>
+ <translation>Для добавления базы данных сделайте щелчок правой кнопкой мышки на списке баз данных.</translation>
</message>
</context>
<context>
@@ -5722,17 +6345,17 @@ Název souboru: %1</translation>
<message>
<location filename="../grid/IGridSetup.ui" line="14"/>
<source>Setup Grid...</source>
- <translation>Nastavení mřížky...</translation>
+ <translation>Настройка координатной сетки...</translation>
</message>
<message>
<location filename="../grid/IGridSetup.ui" line="22"/>
<source>Projection</source>
- <translation>Promítání</translation>
+ <translation>Проекция</translation>
</message>
<message>
<location filename="../grid/IGridSetup.ui" line="37"/>
<source>restore default</source>
- <translation>Obnovit výchozí</translation>
+ <translation>восстановить умолчание</translation>
</message>
<message>
<location filename="../grid/IGridSetup.ui" line="40"/>
@@ -5745,22 +6368,22 @@ Název souboru: %1</translation>
<message>
<location filename="../grid/IGridSetup.ui" line="63"/>
<source>Get projection from current map.</source>
- <translation>Promítání převzít z nynější mapy.</translation>
+ <translation>Получить проекцию с текущей карты.</translation>
</message>
<message>
<location filename="../grid/IGridSetup.ui" line="89"/>
<source>projection wizzard</source>
- <translation>Průvodce pro promítání</translation>
+ <translation>Мастер проекций</translation>
</message>
<message>
<location filename="../grid/IGridSetup.ui" line="130"/>
<source>Grid color</source>
- <translation>Barva mřížky</translation>
+ <translation>Цвет координатной сетки</translation>
</message>
<message>
<location filename="../grid/IGridSetup.ui" line="143"/>
<source>setup grid color</source>
- <translation>Nastavení barvy mřížky</translation>
+ <translation>настройка цвета координатной сетки</translation>
</message>
</context>
<context>
@@ -5768,12 +6391,18 @@ Název souboru: %1</translation>
<message>
<location filename="../tool/IImportDatabase.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
+ </message>
+ <message>
+ <location filename="../tool/IImportDatabase.ui" line="22"/>
+ <location filename="../tool/IImportDatabase.ui" line="63"/>
+ <source>...</source>
+ <translation>...</translation>
</message>
<message>
<location filename="../tool/IImportDatabase.ui" line="45"/>
<source>Source Database:</source>
- <translation>Zdrojová databáze:</translation>
+ <translation>Исходная база данных:</translation>
</message>
<message>
<location filename="../tool/IImportDatabase.ui" line="52"/>
@@ -5782,20 +6411,14 @@ Název souboru: %1</translation>
<translation>-</translation>
</message>
<message>
- <location filename="../tool/IImportDatabase.ui" line="22"/>
- <location filename="../tool/IImportDatabase.ui" line="63"/>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
<location filename="../tool/IImportDatabase.ui" line="86"/>
<source>Target Database:</source>
- <translation>Cílová databáze:</translation>
+ <translation>Целевая база данных:</translation>
</message>
<message>
<location filename="../tool/IImportDatabase.ui" line="102"/>
<source>Start</source>
- <translation>Spustit</translation>
+ <translation>Начать</translation>
</message>
</context>
<context>
@@ -5803,20 +6426,20 @@ Název souboru: %1</translation>
<message>
<location filename="../helpers/IInputDialog.ui" line="14"/>
<source>Edit...</source>
- <translation>Upravit...</translation>
+ <translation>Изменить...</translation>
</message>
<message>
<location filename="../helpers/IInputDialog.ui" line="20"/>
<source>TextLabel</source>
- <translation>Textový štítek</translation>
+ <translation>Метка текста</translation>
</message>
</context>
<context>
<name>ILineOp</name>
<message>
- <location filename="../mouse/line/ILineOp.cpp" line="211"/>
+ <location filename="../mouse/line/ILineOp.cpp" line="212"/>
<source>Routing</source>
- <translation>Cesta</translation>
+ <translation>Маршрутизация</translation>
</message>
</context>
<context>
@@ -5824,17 +6447,17 @@ Název souboru: %1</translation>
<message>
<location filename="../helpers/ILinksDialog.ui" line="14"/>
<source>Links...</source>
- <translation>Odkazy...</translation>
+ <translation>Ссылки...</translation>
</message>
<message>
<location filename="../helpers/ILinksDialog.ui" line="23"/>
<source>Type</source>
- <translation>Typ</translation>
+ <translation>Тип</translation>
</message>
<message>
<location filename="../helpers/ILinksDialog.ui" line="28"/>
<source>Text</source>
- <translation>Text</translation>
+ <translation>Текст</translation>
</message>
<message>
<location filename="../helpers/ILinksDialog.ui" line="33"/>
@@ -5858,345 +6481,351 @@ Název souboru: %1</translation>
<message>
<location filename="../IMainWindow.ui" line="63"/>
<source>File</source>
- <translation>Soubor</translation>
+ <translation>Файл</translation>
</message>
<message>
<location filename="../IMainWindow.ui" line="80"/>
<source>View</source>
- <translation>Pohled</translation>
+ <translation>Вид</translation>
</message>
<message>
<location filename="../IMainWindow.ui" line="103"/>
<source>Window</source>
- <translation>Okno</translation>
+ <translation>Окно</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="109"/>
+ <location filename="../IMainWindow.ui" line="110"/>
<source>?</source>
- <translation>Nápověda</translation>
+ <translation>?</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="116"/>
+ <location filename="../IMainWindow.ui" line="118"/>
<source>Project</source>
- <translation>Projekt</translation>
+ <translation>Проект</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="127"/>
+ <location filename="../IMainWindow.ui" line="129"/>
<source>Tool</source>
- <translation>Nástroj</translation>
+ <translation>Инструмент</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="152"/>
+ <location filename="../IMainWindow.ui" line="154"/>
<source>Maps</source>
- <translation>Mapy</translation>
+ <translation>Карты</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="195"/>
+ <location filename="../IMainWindow.ui" line="197"/>
<source>Dig. Elev. Model (DEM)</source>
- <translation>Digitální výškový model</translation>
+ <translation>Цифровая модель рельефа (ЦМР)</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="234"/>
+ <location filename="../IMainWindow.ui" line="236"/>
<source>Data</source>
- <translation>Data</translation>
+ <translation>Данные</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="292"/>
+ <location filename="../IMainWindow.ui" line="254"/>
+ <source>Route</source>
+ <translation>Маршрутизация</translation>
+ </message>
+ <message>
+ <location filename="../IMainWindow.ui" line="288"/>
+ <location filename="../IMainWindow.ui" line="291"/>
+ <source>Add Map View</source>
+ <translation>Добавить окно карты</translation>
+ </message>
+ <message>
+ <location filename="../IMainWindow.ui" line="294"/>
<source>Ctrl+T</source>
<translation>Ctrl+T</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="307"/>
+ <location filename="../IMainWindow.ui" line="309"/>
<source>Show Scale</source>
- <translation>Ukázat měřítko</translation>
+ <translation>Показать масштаб</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="319"/>
+ <location filename="../IMainWindow.ui" line="321"/>
<source>Setup Map Font</source>
- <translation>Nastavit písmo mapy</translation>
+ <translation>Настройка шрифта карты</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="334"/>
+ <location filename="../IMainWindow.ui" line="336"/>
<source>Show Grid</source>
- <translation>Ukázat mřížku</translation>
+ <translation>Показать координатную сетку</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="337"/>
+ <location filename="../IMainWindow.ui" line="339"/>
<source>Ctrl+G</source>
<translation>Ctrl+G</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="349"/>
+ <location filename="../IMainWindow.ui" line="351"/>
<source>Setup Grid</source>
- <translation>Nastavit mřížku</translation>
+ <translation>Настройка координатной сетки</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="352"/>
+ <location filename="../IMainWindow.ui" line="354"/>
<source>Ctrl+Alt+G</source>
<translation>Ctrl+Alt+G</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="367"/>
+ <location filename="../IMainWindow.ui" line="369"/>
<source>Flip Mouse Wheel</source>
- <translation>Obrátit kolečko myši</translation>
+ <translation>Флип колесо мышки</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="379"/>
- <location filename="../IMainWindow.ui" line="382"/>
+ <location filename="../IMainWindow.ui" line="381"/>
+ <location filename="../IMainWindow.ui" line="384"/>
<source>Setup Map Paths</source>
- <translation>Nastavit cesty k mapám</translation>
+ <translation>Настройка пути к картам</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="397"/>
+ <location filename="../IMainWindow.ui" line="399"/>
<source>POI Text</source>
- <translation>Text POI</translation>
+ <translation>Текст для точек интереса</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="412"/>
+ <location filename="../IMainWindow.ui" line="414"/>
<source>Night / Day</source>
- <translation>Noc/Den</translation>
+ <translation>Ночь/день</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="427"/>
+ <location filename="../IMainWindow.ui" line="429"/>
<source>Map Tool Tip</source>
- <translation>Rada k nástroji pro mapu</translation>
+ <translation>Подсказка карты</translation>
+ </message>
+ <message>
+ <location filename="../IMainWindow.ui" line="432"/>
+ <source>Ctrl+I</source>
+ <translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="442"/>
+ <location filename="../IMainWindow.ui" line="444"/>
<source>Setup DEM Paths</source>
- <translation>Nastavit cesty k výškovým modelům</translation>
+ <translation>Настройка пути к ЦМР</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="454"/>
+ <location filename="../IMainWindow.ui" line="456"/>
<source>About</source>
- <translation>O programu</translation>
+ <translation>О программе</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="466"/>
+ <location filename="../IMainWindow.ui" line="468"/>
<source>Help</source>
- <translation>Nápověda</translation>
- </message>
- <message>
- <location filename="../IMainWindow.ui" line="252"/>
- <source>Route</source>
- <translation>Cesta</translation>
- </message>
- <message>
- <location filename="../IMainWindow.ui" line="286"/>
- <location filename="../IMainWindow.ui" line="289"/>
- <source>Add Map View</source>
- <translation>Přidat pohled na mapu</translation>
+ <translation>Справки</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="430"/>
- <source>Ctrl+I</source>
- <translation>Ctrl+I</translation>
- </message>
- <message>
- <location filename="../IMainWindow.ui" line="469"/>
+ <location filename="../IMainWindow.ui" line="471"/>
<source>F1</source>
<translation>F1</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="481"/>
- <location filename="../IMainWindow.ui" line="484"/>
+ <location filename="../IMainWindow.ui" line="483"/>
+ <location filename="../IMainWindow.ui" line="486"/>
<source>Setup Map View</source>
- <translation>Nastavit pohled na mapu</translation>
+ <translation>Настройка вида карт</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="496"/>
+ <location filename="../IMainWindow.ui" line="498"/>
<source>Load GIS Data</source>
- <translation>Nahrát data GIS</translation>
+ <translation>Загрузить данные ГИС</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="499"/>
+ <location filename="../IMainWindow.ui" line="501"/>
<source>Load projects from file</source>
- <translation>Nahrát projekty ze souboru</translation>
+ <translation>Загрузить проекты с файла</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="502"/>
+ <location filename="../IMainWindow.ui" line="504"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="514"/>
+ <location filename="../IMainWindow.ui" line="516"/>
<source>Save All GIS Data</source>
- <translation>Uložit všechna data GIS</translation>
+ <translation>Сохранить все данные ГИС</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="517"/>
+ <location filename="../IMainWindow.ui" line="519"/>
<source>Save all projects in the workspace</source>
- <translation>Uložit všechny projekty nacházející se v pracovním prostoru</translation>
+ <translation>Сохранить все проекты в рабочей области</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="520"/>
+ <location filename="../IMainWindow.ui" line="522"/>
<source>Ctrl+S</source>
<translation>Ctrl+S</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="532"/>
+ <location filename="../IMainWindow.ui" line="534"/>
<source>Setup Time Zone</source>
- <translation>Nastavit časové pásmo</translation>
+ <translation>Настройка часового пояса</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="544"/>
+ <location filename="../IMainWindow.ui" line="546"/>
<source>Add empty project</source>
- <translation>Přidat prázdný projekt</translation>
+ <translation>Добавить пустой проект</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="559"/>
+ <location filename="../IMainWindow.ui" line="561"/>
<source>Search Google</source>
- <translation>Hledat pomocí Google</translation>
+ <translation>Поиск в Google</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="571"/>
+ <location filename="../IMainWindow.ui" line="573"/>
<source>Close all projects</source>
- <translation>Zavřít všechny projekty</translation>
+ <translation>Закрыть все проекты</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="574"/>
+ <location filename="../IMainWindow.ui" line="576"/>
<source>F8</source>
<translation>F8</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="586"/>
+ <location filename="../IMainWindow.ui" line="588"/>
<source>Setup Units</source>
- <translation>Nastavit jednotky</translation>
+ <translation>Настройка единиц</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="598"/>
+ <location filename="../IMainWindow.ui" line="600"/>
<source>Setup Workspace</source>
- <translation>Nastavit pracovní prostor</translation>
+ <translation>Настройка рабочей области</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="601"/>
+ <location filename="../IMainWindow.ui" line="603"/>
<source>Setup save on exit.</source>
- <translation>Nastavit uložení při ukončení.</translation>
+ <translation>Настройка рабочей области.</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="613"/>
+ <location filename="../IMainWindow.ui" line="615"/>
<source>Import Database from QLandkarte</source>
- <translation>Zavést databázi z QLandkarte</translation>
+ <translation>Импортировать базу данных QLandkarte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="616"/>
+ <location filename="../IMainWindow.ui" line="618"/>
<source>Import QLandkarte GT database</source>
- <translation>Zavést databázi GT QLandkarte</translation>
+ <translation>Импортировать базу данных QLandkarte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="628"/>
+ <location filename="../IMainWindow.ui" line="630"/>
<source>VRT Builder</source>
- <translation>Sestavovač VRT</translation>
+ <translation>Создать файл VRT</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="631"/>
+ <location filename="../IMainWindow.ui" line="633"/>
<source>GUI front end to gdalbuildvrt</source>
- <translation>Rozhraní pro gdalbuildvrt</translation>
+ <translation>Графический интерфейс к gdalbuildvrt</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="643"/>
+ <location filename="../IMainWindow.ui" line="645"/>
<source>Store Map View</source>
- <translation>Uložit pohled na mapu</translation>
+ <translation>Сохранить вид карты</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="646"/>
+ <location filename="../IMainWindow.ui" line="648"/>
<source>Write current active map and DEM list including the properties to a file</source>
- <translation>Zapsat nynější činnou mapu a seznam výškových modelů včetně vlastností do souboru</translation>
+ <translation>Сохранить вид карты</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="658"/>
+ <location filename="../IMainWindow.ui" line="660"/>
<source>Load Map View</source>
- <translation>Nahrát pohled na mapu</translation>
+ <translation>Загрузить вид карты</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="661"/>
+ <location filename="../IMainWindow.ui" line="663"/>
<source>Restore view with active map and DEM list including the properties from a file</source>
- <translation>Obnovit pohled s činnou mapou a seznam výškových modelů včetně vlastností ze souboru</translation>
+ <translatorcomment>Tooltip??</translatorcomment>
+ <translation>Загрузить вид карты</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="676"/>
+ <location filename="../IMainWindow.ui" line="678"/>
<source>Ext. Profile</source>
- <translation>Ext. Profil</translation>
+ <translation>Расширенный профиль</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="679"/>
+ <location filename="../IMainWindow.ui" line="681"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="691"/>
+ <location filename="../IMainWindow.ui" line="693"/>
<source>Close</source>
- <translation>Zavřít</translation>
+ <translation>Закрыть</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="694"/>
+ <location filename="../IMainWindow.ui" line="696"/>
<source>Ctrl+Q</source>
<translation>Ctrl+Q</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="706"/>
+ <location filename="../IMainWindow.ui" line="708"/>
<source>Clone Map View</source>
- <translation>Klonovat pohled na mapu</translation>
+ <translation>Клонировать вид карты</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="709"/>
+ <location filename="../IMainWindow.ui" line="711"/>
<source>Ctrl+Shift+T</source>
<translation>Ctrl+Shift+T</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="721"/>
+ <location filename="../IMainWindow.ui" line="723"/>
<source>Create Routino Database</source>
- <translation>Vytvořit databázi Routino</translation>
+ <translation>Создать базу данных Routino</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="733"/>
+ <location filename="../IMainWindow.ui" line="735"/>
<source>Save(Print) Map Screenshot</source>
- <translation>Uložit (vytisknout) snímek obrazovky s mapou</translation>
+ <translation>Сохранить (Печатать) снимок экрана карты</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="736"/>
+ <location filename="../IMainWindow.ui" line="738"/>
<source>Print a selected area of the map</source>
- <translation>Vytisknout vybranou oblast mapy</translation>
+ <translation>Печатать выбранную область карты</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="739"/>
+ <location filename="../IMainWindow.ui" line="741"/>
<source>Ctrl+P</source>
<translation>Ctrl+P</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="751"/>
+ <location filename="../IMainWindow.ui" line="753"/>
<source>Setup Coord. Format</source>
- <translation>Nastavit formát souřadnic</translation>
+ <translation>Настройка формата координат</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="754"/>
+ <location filename="../IMainWindow.ui" line="756"/>
<source>Change the format coordinates are displayed</source>
- <translation>Změnit formát, v němž jsou souřadnice zobrazeny</translation>
+ <translation>Изменить формат отображения координат</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="766"/>
+ <location filename="../IMainWindow.ui" line="768"/>
<source>Setup Map Background</source>
- <translation>Nastavit pozadí mapy</translation>
+ <translation>Настройка фона карт</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="778"/>
+ <location filename="../IMainWindow.ui" line="780"/>
<source>Setup Waypoint Icons</source>
- <translation>Stanovit ikony cestovních bodů</translation>
+ <translation>Настройка пиктограмм для маршрутных точек</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="781"/>
+ <location filename="../IMainWindow.ui" line="783"/>
<source>Setup path to custom icons</source>
- <translation>Stanovit cestu k vlastním ikonám</translation>
+ <translation>Настройка пути к пользовательским пиктограммам</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="790"/>
+ <location filename="../IMainWindow.ui" line="792"/>
<source>Close Tab</source>
- <translation type="unfinished"></translation>
+ <translation>Закрыть вкладку</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="793"/>
+ <location filename="../IMainWindow.ui" line="795"/>
<source>Ctrl+W</source>
- <translation type="unfinished"></translation>
+ <translation>Ctrl+W</translation>
+ </message>
+ <message>
+ <location filename="../IMainWindow.ui" line="804"/>
+ <source>Quickstart Help</source>
+ <translation>Помощь для быстрого старта</translation>
</message>
</context>
<context>
@@ -6204,54 +6833,54 @@ Název souboru: %1</translation>
<message>
<location filename="../map/IMapList.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>форма</translation>
</message>
<message>
<location filename="../map/IMapList.ui" line="103"/>
<source>To add maps use <b>File->Setup Map Paths</b>. Or click <a href='setup'><b>here</b></a></source>
- <translation>Pro přidání map použijte <b>Soubor → Nastavit cesty k mapám</b>. Nebo klepněte <a href='setup'><b>sem</b></a></translation>
+ <translation>Чтобы добавить карты использовать <b>Файл->Настройка пути к картам</b>. Или нажать <a href='setup'><b>здесь</b></a></translation>
</message>
<message>
<location filename="../map/IMapList.ui" line="116"/>
<source>Use the context menu (right mouse button click on entry) to activate a map. Use drag-n-drop to move the activated map in the draw order. </source>
- <translation>Použijte související nabídku (klepnutí pravým tlačítkem myši na položku) pro zapnutí mapy. Použijte přetažení a upuštění pro posunutí zapnuté mapy v pořadí kreslení. </translation>
+ <translation>Использовать контекстное меню (нажать правой кнопкой мышки на элемент), чтобы активировать карту. Использовать перетаскивание мышкой, для перемещения активированной карты в порядке рисования.</translation>
</message>
<message>
<location filename="../map/IMapList.ui" line="129"/>
<source>Help! I want maps!
I don't want to read the documentation!</source>
- <translation>Pomoc! Chci mapy!
-Nechce se mi číst dokumentaci!</translation>
+ <translation>Помогите! Я хочу карты!
+Мне не хочется читать документацию!</translation>
</message>
<message>
<location filename="../map/IMapList.ui" line="149"/>
<source>Activate</source>
- <translation>Zapnout</translation>
+ <translation>Активировать</translation>
</message>
<message>
<location filename="../map/IMapList.ui" line="158"/>
<source>Move Up</source>
- <translation>Posunout nahoru</translation>
+ <translation>Переместить вверх</translation>
</message>
<message>
<location filename="../map/IMapList.ui" line="161"/>
<source>Hide map behind previous map</source>
- <translation>Skrýt mapu za předchozí mapou</translation>
+ <translation>Скрыть карту за предыдущей картой</translation>
</message>
<message>
<location filename="../map/IMapList.ui" line="170"/>
<source>Move down</source>
- <translation>Posunout dolů</translation>
+ <translation>Переместить вниз</translation>
</message>
<message>
<location filename="../map/IMapList.ui" line="173"/>
<source>Show map on top of next map</source>
- <translation>Mapa překrývá další</translation>
+ <translation>Показать карту над следующей картой</translation>
</message>
<message>
<location filename="../map/IMapList.ui" line="182"/>
<source>Reload Maps</source>
- <translation>Nahrát mapy znovu</translation>
+ <translation>Перезагрузить карты</translation>
</message>
</context>
<context>
@@ -6259,12 +6888,18 @@ Nechce se mi číst dokumentaci!</translation>
<message>
<location filename="../map/IMapPathSetup.ui" line="14"/>
<source>Setup map paths</source>
- <translation>Nastavit cesty k mapám</translation>
+ <translation>Настройка путей к картам</translation>
</message>
<message>
<location filename="../map/IMapPathSetup.ui" line="20"/>
<source>Root path of tile cache for online maps:</source>
- <translation>Kořenová cesta (root) vyrovnávací paměti dlaždic pro internetové mapy:</translation>
+ <translation>Корневой путь к кэшу плиток онлайновых карт:</translation>
+ </message>
+ <message>
+ <location filename="../map/IMapPathSetup.ui" line="29"/>
+ <location filename="../map/IMapPathSetup.ui" line="154"/>
+ <source>-</source>
+ <translation>-</translation>
</message>
<message>
<location filename="../map/IMapPathSetup.ui" line="36"/>
@@ -6277,14 +6912,8 @@ Nechce se mi číst dokumentaci!</translation>
<location filename="../map/IMapPathSetup.ui" line="185"/>
<source>Help! I want maps!
I don't want to read the documentation!</source>
- <translation>Pomoc! Chci mapy!
-Nechce se mi číst dokumentaci!</translation>
- </message>
- <message>
- <location filename="../map/IMapPathSetup.ui" line="29"/>
- <location filename="../map/IMapPathSetup.ui" line="154"/>
- <source>-</source>
- <translation>-</translation>
+ <translation>Помогите! Я хочу карты!
+Мне не хочется читать документацию!</translation>
</message>
</context>
<context>
@@ -6292,17 +6921,17 @@ Nechce se mi číst dokumentaci!</translation>
<message>
<location filename="../map/IMapPropSetup.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../map/IMapPropSetup.ui" line="35"/>
<source><html><head/><body><p>Change opacity of map</p></body></html></source>
- <translation><html><head/><body><p>Změnit neprůhlednost mapy</p></body></html></translation>
+ <translation><html><head/><body><p>Изменить прозрачность карты</p></body></html></translation>
</message>
<message>
<location filename="../map/IMapPropSetup.ui" line="50"/>
<source><html><head/><body><p>Click to use current scale as minimum scale to display the map.</p></body></html></source>
- <translation><html><head/><body><p>Klepněte pro použití nynějšího měřítka jako nejmenšího měřítka pro zobrazení mapy.</p></body></html></translation>
+ <translation><html><head/><body><p>Нажать, чтобы использовать текущий масштаб как минимальный масштаб для отображения карты.</p></body></html></translation>
</message>
<message>
<location filename="../map/IMapPropSetup.ui" line="53"/>
@@ -6313,47 +6942,52 @@ Nechce se mi číst dokumentaci!</translation>
<message>
<location filename="../map/IMapPropSetup.ui" line="74"/>
<source><html><head/><body><p>Control the range of scale the map is displayed. Use the two buttons left and right to define the actual scale as either minimum or maximum scale.</p></body></html></source>
- <translation><html><head/><body><p>Je zobrazeno ovládání rozmezí měřítka mapy. Použijte tlačítka vlevo a vpravo pro stanovení skutečného měřítka jako buď nejmenšího nebo největšího měřítka.</p></body></html></translation>
+ <translation><html><head/><body><p>Контролировать диапазон масштаба отображения карты. С помощью двух кнопок слева и справа определить данный масштаб как минимальный или максимальный масштаб.</p></body></html></translation>
</message>
<message>
<location filename="../map/IMapPropSetup.ui" line="87"/>
<source><html><head/><body><p>Click to use current scale as maximum scale to display the map.</p></body></html></source>
- <translation><html><head/><body><p>Klepněte pro použití nynějšího měřítka jako nejmenšího měřítka pro zobrazení mapy.</p></body></html></translation>
+ <translation><html><head/><body><p>Нажать, чтобы использовать текущий масштаб как максимальный масштаб для отображения карты.</p></body></html></translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="137"/>
+ <location filename="../map/IMapPropSetup.ui" line="139"/>
<source>Areas</source>
- <translation>Oblasti</translation>
+ <translation>Области</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="144"/>
+ <location filename="../map/IMapPropSetup.ui" line="146"/>
<source>Lines</source>
- <translation>Čáry</translation>
+ <translation>Линии</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="151"/>
+ <location filename="../map/IMapPropSetup.ui" line="153"/>
<source>Points</source>
- <translation>Body</translation>
- </message>
- <message>
- <location filename="../map/IMapPropSetup.ui" line="233"/>
- <source>-</source>
- <translation>-</translation>
+ <translation>Точки</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="240"/>
- <source>Cache Path</source>
- <translation>Cesta k vyrovnávací paměti</translation>
+ <location filename="../map/IMapPropSetup.ui" line="170"/>
+ <source>Details</source>
+ <translation>Деталь</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="196"/>
+ <location filename="../map/IMapPropSetup.ui" line="227"/>
<source>Cache Size (MB)</source>
- <translation>Velikost vyrovnávací paměti (MB)</translation>
+ <translation>Размер кэша (МБ)</translation>
</message>
<message>
- <location filename="../map/IMapPropSetup.ui" line="216"/>
+ <location filename="../map/IMapPropSetup.ui" line="247"/>
<source>Expiration (Days)</source>
- <translation>Datum vypršení (dny)</translation>
+ <translation>Срок хранения (дни)</translation>
+ </message>
+ <message>
+ <location filename="../map/IMapPropSetup.ui" line="264"/>
+ <source>-</source>
+ <translation>-</translation>
+ </message>
+ <message>
+ <location filename="../map/IMapPropSetup.ui" line="271"/>
+ <source>Cache Path</source>
+ <translation>Путь к кэшу</translation>
</message>
</context>
<context>
@@ -6361,7 +6995,7 @@ Nechce se mi číst dokumentaci!</translation>
<message>
<location filename="../tool/IMapVrtBuilder.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../tool/IMapVrtBuilder.ui" line="22"/>
@@ -6372,12 +7006,12 @@ Nechce se mi číst dokumentaci!</translation>
<message>
<location filename="../tool/IMapVrtBuilder.ui" line="39"/>
<source>Select source files:</source>
- <translation>Vybrat zdrojové soubory:</translation>
+ <translation>Выбрать исходные файлы:</translation>
</message>
<message>
<location filename="../tool/IMapVrtBuilder.ui" line="79"/>
<source>Target Filename:</source>
- <translation>Název cílového souboru:</translation>
+ <translation>Имя целевого файла:</translation>
</message>
<message>
<location filename="../tool/IMapVrtBuilder.ui" line="86"/>
@@ -6387,7 +7021,7 @@ Nechce se mi číst dokumentaci!</translation>
<message>
<location filename="../tool/IMapVrtBuilder.ui" line="95"/>
<source>Start</source>
- <translation>Spustit</translation>
+ <translation>Начать</translation>
</message>
</context>
<context>
@@ -6395,67 +7029,67 @@ Nechce se mi číst dokumentaci!</translation>
<message>
<location filename="../mouse/line/IMouseEditLine.cpp" line="249"/>
<source><b>New Line</b><br/>Move the mouse and use the left mouse button to drop points. When done use the right mouse button to stop.<br/></source>
- <translation><b>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>
+ <translation><b>Новая линия</b><br/>Переместить мышку и использовать левую кнопку мышки, чтобы создать точки. Когда это сделано остановить с помощью правой кнопки мышки.<br/></translation>
</message>
<message>
<location filename="../mouse/line/IMouseEditLine.cpp" line="289"/>
<source><b>Delete Point</b><br/>Move the mouse close to a point and press the left button to delete it.<br/></source>
- <translation><b>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>
+ <translation><b>Удалить точку</b><br/>Переместить мышку близко к точке и нажать левую кнопку, чтобы удалить её.<br/></translation>
</message>
<message>
<location filename="../mouse/line/IMouseEditLine.cpp" line="297"/>
<source><b>Select Range of Points</b><br/>Left click on first point to start selection. Left click second point to complete selection and choose from options. Use the right mouse button to cancel.<br/></source>
- <translation><b>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>
+ <translation><b>Выбрать интервал точек</b><br/>Нажать левой кнопкой на первой точке, чтобы начать выбор. Нажать левой кнопкой на второй точке, чтобы завершить выбор и выбрать параметры. Использовать правую кнопку мышки для отмены.<br/></translation>
</message>
<message>
<location filename="../mouse/line/IMouseEditLine.cpp" line="305"/>
<source><b>Move Point</b><br/>Move the mouse close to a point and press the left button to make it stick to the cursor. Move the mouse to move the point. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
- <translation><b>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>
+ <translation><b>Переместить точку</b><br/>Переместить мышку близко к точке и нажать левую кнопку. Точка будет прилипать к курсору, и вы можете переместить её. Использовать правую кнопку мышки для отмены.<br/></translation>
</message>
<message>
<location filename="../mouse/line/IMouseEditLine.cpp" line="313"/>
<source><b>Add Point</b><br/>Move the mouse close to a line segment and press the left button to add a point. The point will stick to the cursor and you can move it. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
- <translation><b>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>
+ <translation><b>Добавить точку</b><br/>Переместить мышку близко к сегменту линии и нажать левую кнопку, чтобы добавить точку. Точка будет прилипать к курсору, и вы можете переместить его. Отбросьте точку с помощью левой кнопки мышки. Использовать правую кнопку мышки для отмены.<br/></translation>
</message>
<message>
<location filename="../mouse/line/IMouseEditLine.cpp" line="321"/>
<source><b>No Routing</b><br/>All points will be connected with a straight line.<br/></source>
- <translation><b>Žádné stanovení cesty</b><br/>Všechny body budou spojeny přímou čarou.<br/></translation>
+ <translation><b>Без маршрутизации</b><br/>Все точки будут соединены прямыми линиями.<br/></translation>
</message>
<message>
<location filename="../mouse/line/IMouseEditLine.cpp" line="327"/>
<source><b>Auto Routing</b><br/>The current router setup is used to derive a route between points. <b>Note:</b> The selected router must be able to route on-the-fly. Offline routers usually can do, online routers can't.<br/></source>
- <translation><b>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>
+ <translation><b>Автоматическая маршрутизация</b><br/>Настройка маршрутизатора используется для вычисления маршрута между точками.<b>Замечание</b>Выбранный маршрутизатор должен быть способным вычислять маршруты налету. Оффлайновые маршрутизаторы обычно это могут, Интернет маршрутизаторы этого не могут.<br/></translation>
</message>
<message>
<location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
<source><b>Vector Routing</b><br/>Connect points with a line from a loaded vector map if possible.<br/></source>
- <translation><b>Vektorové stanovení cesty</b><br/>Spojuje body čárou z nahrané vektorové mapy, je-li to možné.<br/></translation>
+ <translation><b>Векторная маршрутизация</b><br/>Если возможно соединить точки линией с загруженной векторной карты.<br/></translation>
</message>
<message>
<location filename="../mouse/line/IMouseEditLine.cpp" line="504"/>
<source><b>%1 Metrics</b></source>
- <translation><b>%1 metrika</b></translation>
+ <translation><b>%1. Метрика</b></translation>
</message>
<message>
<location filename="../mouse/line/IMouseEditLine.cpp" line="507"/>
<source>Distance:</source>
- <translation>Vzdálenost:</translation>
+ <translation>Расстояние:</translation>
</message>
<message>
<location filename="../mouse/line/IMouseEditLine.cpp" line="509"/>
<source>Ascent:</source>
- <translation type="unfinished"></translation>
+ <translation>Подъем:</translation>
</message>
<message>
<location filename="../mouse/line/IMouseEditLine.cpp" line="511"/>
<source>Descent:</source>
- <translation type="unfinished"></translation>
+ <translation>Спуск:</translation>
</message>
<message>
<location filename="../mouse/line/IMouseEditLine.h" line="135"/>
<source><br/><b>Move the map</b><br/>If you keep the left mouse button pressed and move the mouse, you will move the map.<br/><br/></source>
- <translation type="unfinished"></translation>
+ <translation><br/><b>Переместить карту</b><br/>Если удержите нажатой левую кнопку мышки и переместите мышку, вы будете перемещать карту.<br/><br/></translation>
</message>
</context>
<context>
@@ -6463,7 +7097,7 @@ Nechce se mi číst dokumentaci!</translation>
<message>
<location filename="../widgets/IPhotoAlbum.ui" line="20"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../widgets/IPhotoAlbum.ui" line="50"/>
@@ -6477,38 +7111,44 @@ Nechce se mi číst dokumentaci!</translation>
<message>
<location filename="../plot/IPlot.cpp" line="94"/>
<source>Reset Zoom</source>
- <translation>Nastavit znovu zvětšení</translation>
+ <translation>Сбросить увеличение</translation>
</message>
<message>
<location filename="../plot/IPlot.cpp" line="95"/>
<source>Stop Range</source>
- <translation>Ukončit výběr oblasti</translation>
+ <translation>Отменить интервал</translation>
</message>
<message>
<location filename="../plot/IPlot.cpp" line="96"/>
<source>Save...</source>
- <translation>Uložit...</translation>
+ <translation>Сохранить...</translation>
</message>
<message>
<location filename="../plot/IPlot.cpp" line="98"/>
<source>Add Waypoint</source>
- <translation>Přidat cestovní bod</translation>
+ <translation>Добавить маршрутную точку</translation>
+ </message>
+ <message>
+ <location filename="../plot/IPlot.cpp" line="99"/>
+ <source>Cut...</source>
+ <translation>Вырезать...</translation>
</message>
<message>
- <location filename="../plot/IPlot.cpp" line="541"/>
+ <location filename="../plot/IPlot.cpp" line="542"/>
<source>Hold CTRL key for vertical zoom, only.
Hold ALT key for horizontal zoom, only.</source>
- <translation type="unfinished"></translation>
+ <translation>Удерживать клавишу CTRL для вертикального увеличения.
+Удерживать клавишу ALT для горизонтального увеличения.</translation>
</message>
<message>
- <location filename="../plot/IPlot.cpp" line="696"/>
+ <location filename="../plot/IPlot.cpp" line="697"/>
<source>No or bad data.</source>
- <translation>Žádné nebo špatné údaje.</translation>
+ <translation>Отсутствующие или неверные данные.</translation>
</message>
<message>
- <location filename="../plot/IPlot.cpp" line="1296"/>
+ <location filename="../plot/IPlot.cpp" line="1298"/>
<source>Select output file</source>
- <translation>Vybrat výstupní soubor</translation>
+ <translation>Выбрать выходной файл</translation>
</message>
</context>
<context>
@@ -6516,12 +7156,12 @@ Hold ALT key for horizontal zoom, only.</source>
<message>
<location filename="../helpers/IPositionDialog.ui" line="14"/>
<source>Position ...</source>
- <translation>Poloha...</translation>
+ <translation>Позиция ...</translation>
</message>
<message>
<location filename="../helpers/IPositionDialog.ui" line="20"/>
<source>Enter new position</source>
- <translation>Zadat novou polohu</translation>
+ <translation>Ввести новую позицию</translation>
</message>
<message>
<location filename="../helpers/IPositionDialog.ui" line="30"/>
@@ -6529,10 +7169,10 @@ Hold ALT key for horizontal zoom, only.</source>
"[N|S] ddd mm.sss [W|E] ddd mm.sss"
or
"[N|S] ddd.ddd [W|E] ddd.ddd"</source>
- <translation>Špatný polohový formát. Musí být:
-"[N|S] ddd mm.sss [W|E] ddd mm.sss"
-nebo
-"[N|S] ddd.ddd [W|E] ddd.ddd"</translation>
+ <translation>Неверный формат позиции. Должен быть:
+"[С|Ю] ddd mm.sss [З|В] ddd mm.sss"
+или
+"[С|Ю] ddd.ddd [З|В] ddd.ddd"</translation>
</message>
</context>
<context>
@@ -6540,139 +7180,396 @@ nebo
<message>
<location filename="../print/IPrintDialog.ui" line="20"/>
<source>Print map...</source>
- <translation>Tisk mapy...</translation>
+ <translation>Печатать карту...</translation>
</message>
<message>
- <location filename="../print/IPrintDialog.ui" line="79"/>
- <source>When printing online maps make sure that the map has been loaded into the cache for the extent to be printed.</source>
- <translation>Když tisknete výřez internetové mapy, ujistěte se, že mapa byla nahrána do vyrovnávací paměti.</translation>
+ <location filename="../print/IPrintDialog.ui" line="37"/>
+ <source>When saving online maps make sure that the map has been loaded into the cache for the extent to be saved.</source>
+ <translation>При сохранении онлайн-карты убедитесь, что карта была загружена в кэш в размере печати.</translation>
</message>
<message>
<location filename="../print/IPrintDialog.ui" line="60"/>
<source>Save</source>
- <translation>Uložit</translation>
+ <translation>Сохранить</translation>
</message>
<message>
- <location filename="../print/IPrintDialog.ui" line="37"/>
- <source>When saving online maps make sure that the map has been loaded into the cache for the extent to be saved.</source>
- <translation>Když ukládáte výřez internetové mapy, ujistěte se, že mapa byla nahrána do vyrovnávací paměti.</translation>
+ <location filename="../print/IPrintDialog.ui" line="79"/>
+ <source>When printing online maps make sure that the map has been loaded into the cache for the extent to be printed.</source>
+ <translation>При печати онлайн-карты убедитесь, что карта была загружена в кэш в размере печати.</translation>
+ </message>
+ <message>
+ <location filename="../print/IPrintDialog.ui" line="89"/>
+ <location filename="../print/IPrintDialog.ui" line="102"/>
+ <location filename="../print/IPrintDialog.ui" line="151"/>
+ <source>TextLabel</source>
+ <translation>Метка текста</translation>
+ </message>
+ <message>
+ <location filename="../print/IPrintDialog.ui" line="118"/>
+ <source>Print</source>
+ <translation>Печатать</translation>
+ </message>
+</context>
+<context>
+ <name>IProgressDialog</name>
+ <message>
+ <location filename="../helpers/IProgressDialog.ui" line="14"/>
+ <source>Please wait...</source>
+ <translation>Пожалуйста, подождите...</translation>
+ </message>
+ <message>
+ <location filename="../helpers/IProgressDialog.ui" line="20"/>
+ <location filename="../helpers/IProgressDialog.ui" line="27"/>
+ <source>TextLabel</source>
+ <translation>Метка текста</translation>
+ </message>
+</context>
+<context>
+ <name>IProjWizard</name>
+ <message>
+ <location filename="../grid/IProjWizard.ui" line="14"/>
+ <source>Proj4 Wizzard</source>
+ <translation>Проекции Proj4</translation>
+ </message>
+ <message>
+ <location filename="../grid/IProjWizard.ui" line="29"/>
+ <source>Mercator</source>
+ <translation>Меркатор</translation>
+ </message>
+ <message>
+ <location filename="../grid/IProjWizard.ui" line="38"/>
+ <source>UTM</source>
+ <translation>UTM</translation>
+ </message>
+ <message>
+ <location filename="../grid/IProjWizard.ui" line="45"/>
+ <source>zone</source>
+ <translation>Зона</translation>
+ </message>
+ <message>
+ <location filename="../grid/IProjWizard.ui" line="82"/>
+ <source>user defined</source>
+ <translation>Задание пользователя</translation>
+ </message>
+ <message>
+ <location filename="../grid/IProjWizard.ui" line="94"/>
+ <source>Datum</source>
+ <translation>Датум</translation>
+ </message>
+ <message>
+ <location filename="../grid/IProjWizard.ui" line="104"/>
+ <source>World Mercator (OSM)</source>
+ <translation>World Mercator(OSM)</translation>
+ </message>
+ <message>
+ <location filename="../grid/IProjWizard.ui" line="124"/>
+ <source>Result:</source>
+ <translation>Результат:</translation>
+ </message>
+ <message>
+ <location filename="../grid/IProjWizard.ui" line="138"/>
+ <source>UPS North (North Pole)</source>
+ <translation>UPS Север (Северный полюс)</translation>
+ </message>
+ <message>
+ <location filename="../grid/IProjWizard.ui" line="145"/>
+ <source>UPS South (South Pole)</source>
+ <translation>UPS Юг (Южный полюс)</translation>
+ </message>
+ <message>
+ <location filename="../grid/IProjWizard.ui" line="152"/>
+ <source>Projection</source>
+ <translation>Проекция</translation>
+ </message>
+</context>
+<context>
+ <name>IProjWpt</name>
+ <message>
+ <location filename="../gis/wpt/IProjWpt.ui" line="14"/>
+ <source>Waypoint Projection</source>
+ <translation>Переместить маршрутную точку</translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/IProjWpt.ui" line="22"/>
+ <source>...</source>
+ <translation>...</translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/IProjWpt.ui" line="45"/>
+ <source>-</source>
+ <translation>-</translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/IProjWpt.ui" line="54"/>
+ <source>Clone waypoint and move by:</source>
+ <translation>Клонировать маршрутную точку и переместить на:</translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/IProjWpt.ui" line="66"/>
+ <source>m</source>
+ <translation>м</translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/IProjWpt.ui" line="76"/>
+ <source>°</source>
+ <translation>°</translation>
+ </message>
+</context>
+<context>
+ <name>IRouterBRouter</name>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="20"/>
+ <source>Form</source>
+ <translation>Форма</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="28"/>
+ <source>Profile</source>
+ <translation>Профиль</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="35"/>
+ <source>Alternative</source>
+ <translation>Альтернатива</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="64"/>
+ <source>display selected routing profile</source>
+ <translation>Отобразить выбранный профиль маршрутизации</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="67"/>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="128"/>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="142"/>
+ <source>...</source>
+ <translation>...</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="87"/>
+ <source>on-the-fly routing</source>
+ <translation>Маршрутизация на лету</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="111"/>
+ <source>BRouter: </source>
+ <translation>BRouter:</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="118"/>
+ <source>not running</source>
+ <translation>Не запущено</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="125"/>
+ <source>start/stop BRouter</source>
+ <translation>Старт / стоп BRouter</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="139"/>
+ <source>show BRouter console</source>
+ <translation>Показать консоль BRouter</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="172"/>
+ <source>Setup</source>
+ <translation>Настройка</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/IRouterBRouter.ui" line="181"/>
+ <source>Caution! BRouter is listening on all ports for connections.</source>
+ <translation>Осторожно! BRouter прослушивает все порты для соединений.</translation>
+ </message>
+</context>
+<context>
+ <name>IRouterBRouterInfo</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterInfo.ui" line="14"/>
+ <source>BRouter Profile</source>
+ <translation>Профиль BRouter</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterInfo.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation>Метка текста</translation>
+ </message>
+</context>
+<context>
+ <name>IRouterBRouterSetupWizard</name>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="23"/>
+ <source>BRouter Setup</source>
+ <translation>Настройка BRouter</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="48"/>
+ <source>choose which BRouter to use</source>
+ <translation>Выберите, какой BRouter использовать</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="54"/>
+ <source>BRouter-Web (online)</source>
+ <translation>BRouter-Web (онлайн)</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="61"/>
+ <source>local Installation</source>
+ <translation>Локальная установка</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="68"/>
+ <source>Expert Mode</source>
+ <translation>Экспертный режим</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="91"/>
+ <source>local BRouter Installation directory:</source>
+ <translation>Папка для локальной установки:</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="103"/>
+ <source>select installation directory</source>
+ <translation>Выбрать папку установки</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="106"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="162"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="342"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="356"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="389"/>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="400"/>
+ <source>...</source>
+ <translation>...</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="119"/>
+ <source>labelLocalDirResult</source>
+ <translation>labelLocalDirResult</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="128"/>
+ <source>create or update installation</source>
+ <translation>Создать или обновить установку</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="152"/>
+ <source>Java Executable</source>
+ <translation>Исполняемый файл Java</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="175"/>
+ <source>labelLocalJavaResult</source>
+ <translation>labelLocalJavaResult</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="184"/>
+ <source>search for installed java</source>
+ <translation>Искать установленный Java</translation>
</message>
<message>
- <location filename="../print/IPrintDialog.ui" line="89"/>
- <location filename="../print/IPrintDialog.ui" line="102"/>
- <location filename="../print/IPrintDialog.ui" line="151"/>
- <source>TextLabel</source>
- <translation>Textový štítek</translation>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="241"/>
+ <source>Download and install BRouter Version</source>
+ <translation>Загрузить и установить версия BRouter</translation>
</message>
<message>
- <location filename="../print/IPrintDialog.ui" line="118"/>
- <source>Print</source>
- <translation>Tisk</translation>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="255"/>
+ <source>about:blank</source>
+ <translatorcomment>about:blank</translatorcomment>
+ <translation>about:blank</translation>
</message>
-</context>
-<context>
- <name>IProgressDialog</name>
<message>
- <location filename="../helpers/IProgressDialog.ui" line="14"/>
- <source>Please wait...</source>
- <translation>Počkejte, prosím...</translation>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="263"/>
+ <source>File to install</source>
+ <translation>Файл для установки</translation>
</message>
<message>
- <location filename="../helpers/IProgressDialog.ui" line="20"/>
- <location filename="../helpers/IProgressDialog.ui" line="27"/>
- <source>TextLabel</source>
- <translation>Textový štítek</translation>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="272"/>
+ <source>Download and Install</source>
+ <translation>Загрузить и установить</translation>
</message>
-</context>
-<context>
- <name>IProjWizard</name>
<message>
- <location filename="../grid/IProjWizard.ui" line="14"/>
- <source>Proj4 Wizzard</source>
- <translation>Průvodce pro Proj4</translation>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="321"/>
+ <source>available Profiles</source>
+ <translation>Доступные профили</translation>
</message>
<message>
- <location filename="../grid/IProjWizard.ui" line="29"/>
- <source>Mercator</source>
- <translation>Mercatorovo zobrazení</translation>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="339"/>
+ <source>install profile</source>
+ <translation>Установить профиль</translation>
</message>
<message>
- <location filename="../grid/IProjWizard.ui" line="38"/>
- <source>UTM</source>
- <translation>UTM</translation>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="353"/>
+ <source>remove profile</source>
+ <translation>Удалить профиль</translation>
</message>
<message>
- <location filename="../grid/IProjWizard.ui" line="45"/>
- <source>zone</source>
- <translation>Pásmo</translation>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="371"/>
+ <source>installed Profiles</source>
+ <translation>Установленные профили</translation>
</message>
<message>
- <location filename="../grid/IProjWizard.ui" line="82"/>
- <source>user defined</source>
- <translation>Stanoveno uživatelem</translation>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="415"/>
+ <source>content of profile</source>
+ <translation>Содержание профиля</translation>
</message>
<message>
- <location filename="../grid/IProjWizard.ui" line="94"/>
- <source>Datum</source>
- <translation>Datum</translation>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="451"/>
+ <source>BRouter-Web URL:</source>
+ <translation>BRouter-Web URL:</translation>
</message>
<message>
- <location filename="../grid/IProjWizard.ui" line="104"/>
- <source>World Mercator (OSM)</source>
- <translation>Světový Mercator (OSM)</translation>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="501"/>
+ <source>Service-URL</source>
+ <translation>URL для сервисов</translation>
</message>
<message>
- <location filename="../grid/IProjWizard.ui" line="124"/>
- <source>Result:</source>
- <translation>Výsledek:</translation>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="511"/>
+ <source>Profile-URL</source>
+ <translation>URL для профилей</translation>
</message>
<message>
- <location filename="../grid/IProjWizard.ui" line="138"/>
- <source>UPS North (North Pole)</source>
- <translation>UPS Sever (Severní pól)</translation>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="561"/>
+ <source>Hostname</source>
+ <translation>Имя узла </translation>
</message>
<message>
- <location filename="../grid/IProjWizard.ui" line="145"/>
- <source>UPS South (South Pole)</source>
- <translation>UPS Jih (Jižní pól)</translation>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="571"/>
+ <source>Port</source>
+ <translation>Порт</translation>
</message>
<message>
- <location filename="../grid/IProjWizard.ui" line="152"/>
- <source>Projection</source>
- <translation>Promítání</translation>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="581"/>
+ <source>Profile directory</source>
+ <translation>Папка для профилей</translation>
</message>
-</context>
-<context>
- <name>IProjWpt</name>
<message>
- <location filename="../gis/wpt/IProjWpt.ui" line="14"/>
- <source>Waypoint Projection</source>
- <translation>Promítnutí cestovního bodu</translation>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="591"/>
+ <source>Segments directory</source>
+ <translation>Папка для сегментов</translation>
</message>
<message>
- <location filename="../gis/wpt/IProjWpt.ui" line="22"/>
- <source>...</source>
- <translation>...</translation>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="601"/>
+ <source>Custom Profiles dir</source>
+ <translation>Папка для настраиваемого профиля</translation>
</message>
<message>
- <location filename="../gis/wpt/IProjWpt.ui" line="45"/>
- <source>-</source>
- <translation>-</translation>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="611"/>
+ <source>Max Runtime</source>
+ <translation>Максимальная продолжительность выполнения</translation>
</message>
<message>
- <location filename="../gis/wpt/IProjWpt.ui" line="54"/>
- <source>Clone waypoint and move by:</source>
- <translation>Klonovat cestovní bod a posunout o:</translation>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="621"/>
+ <source>Number Threads</source>
+ <translation>Количество потоков</translation>
</message>
<message>
- <location filename="../gis/wpt/IProjWpt.ui" line="66"/>
- <source>m</source>
- <translation>m</translation>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="631"/>
+ <source>Java Options</source>
+ <translation>Параметры Java</translation>
</message>
<message>
- <location filename="../gis/wpt/IProjWpt.ui" line="76"/>
- <source>°</source>
- <translation>°</translation>
+ <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="551"/>
+ <source>Profiles Url</source>
+ <translation>URL для профилей</translation>
</message>
</context>
<context>
@@ -6680,57 +7577,57 @@ nebo
<message>
<location filename="../gis/rte/router/IRouterMapQuest.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../gis/rte/router/IRouterMapQuest.ui" line="22"/>
<source>Highways</source>
- <translation>Rychlostní silnice</translation>
+ <translation>Автомагистрали</translation>
</message>
<message>
<location filename="../gis/rte/router/IRouterMapQuest.ui" line="29"/>
<source>Seasonal</source>
- <translation>Sezonní silnice</translation>
+ <translation>Сезонные дороги</translation>
</message>
<message>
<location filename="../gis/rte/router/IRouterMapQuest.ui" line="36"/>
<source>Language</source>
- <translation>Jazyk</translation>
+ <translation>Язык</translation>
</message>
<message>
<location filename="../gis/rte/router/IRouterMapQuest.ui" line="43"/>
<source>Country Border</source>
- <translation>Zemské hranice</translation>
+ <translation>Государственная граница</translation>
</message>
<message>
<location filename="../gis/rte/router/IRouterMapQuest.ui" line="53"/>
<source>Profile</source>
- <translation>Profil</translation>
+ <translation>Профиль</translation>
</message>
<message>
<location filename="../gis/rte/router/IRouterMapQuest.ui" line="60"/>
<source>Avoid:</source>
- <translation>Vyhnout se:</translation>
+ <translation>Избегать:</translation>
</message>
<message>
<location filename="../gis/rte/router/IRouterMapQuest.ui" line="67"/>
<source>Ferry</source>
- <translation>Přívoz</translation>
+ <translation>Парома</translation>
</message>
<message>
<location filename="../gis/rte/router/IRouterMapQuest.ui" line="74"/>
<source>Toll Road</source>
- <translation>Silnice s mýtem</translation>
+ <translation>Платные дороги</translation>
</message>
<message>
<location filename="../gis/rte/router/IRouterMapQuest.ui" line="84"/>
<source>Unpaved</source>
- <translation>Nezpevněné silnice</translation>
+ <translation>Дороги без покрытия</translation>
</message>
<message>
<location filename="../gis/rte/router/IRouterMapQuest.ui" line="106"/>
<source><p>Directions Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> </p></source>
- <translation><p>S přátelským povolením od <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> </p></translation>
+ <translation><p>Маршрутные направления с разрешением <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> </p></translation>
</message>
</context>
<context>
@@ -6738,27 +7635,27 @@ nebo
<message>
<location filename="../gis/rte/router/IRouterRoutino.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../gis/rte/router/IRouterRoutino.ui" line="31"/>
<source>Profile</source>
- <translation>Profil</translation>
+ <translation>Профиль</translation>
</message>
<message>
<location filename="../gis/rte/router/IRouterRoutino.ui" line="38"/>
<source>Mode</source>
- <translation>Režim</translation>
+ <translation>Режим</translation>
</message>
<message>
<location filename="../gis/rte/router/IRouterRoutino.ui" line="45"/>
<source>Database</source>
- <translation>Databáze</translation>
+ <translation>База данных</translation>
</message>
<message>
<location filename="../gis/rte/router/IRouterRoutino.ui" line="52"/>
<source>Add paths with Routino database.</source>
- <translation>Přidat cestu pomocí databáze Routino.</translation>
+ <translation>Добавить путь к базе данных Routino.</translation>
</message>
<message>
<location filename="../gis/rte/router/IRouterRoutino.ui" line="55"/>
@@ -6768,29 +7665,29 @@ nebo
<message>
<location filename="../gis/rte/router/IRouterRoutino.ui" line="66"/>
<source>Language</source>
- <translation>Jazyk</translation>
+ <translation>Язык</translation>
</message>
<message>
<location filename="../gis/rte/router/IRouterRoutino.ui" line="131"/>
<source>To use offline routing you need to define paths to local routing data. Use the setup tool button to register a path. You can create your own routing data with <b>Tool->Create Routino Database</b>.</source>
- <translation>Pro použití stanovení cesty bez připojení k internetu je potřeba stanovit cesty k místním datům se stanovením cest. Použijte nástrojové tlačítko pro nastavení k zaregistrování cesty. Svá vlastní data se stanovením cest vytvoříte pomocí <b>Nástroj → Vytvořit databázi Routino</b>.</translation>
+ <translation>Для использования маршрутизации без доступа к сети вам необходимо определить пути к локальным данным маршрутизации. Использовать кнопку настройки чтобы зарегистрировать пути. Вы можете создать свои собственные данные для маршрутизации с помощью <b>Инструмент->Создать базу данных Routino</b>.</translation>
</message>
</context>
<context>
<name>IRouterRoutinoPathSetup</name>
<message>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="14"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="14"/>
<source>Setup Routino database...</source>
- <translation>Nastavit databázi Routino...</translation>
+ <translation>Настройка базы данных Routino...</translation>
</message>
<message>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="27"/>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="47"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="27"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="47"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../gis/rte/router/IRouterRoutinoPathSetup.ui" line="99"/>
+ <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="99"/>
<source>-</source>
<translation>-</translation>
</message>
@@ -6800,7 +7697,7 @@ nebo
<message>
<location filename="../gis/rte/router/IRouterSetup.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
</context>
<context>
@@ -6808,7 +7705,7 @@ nebo
<message>
<location filename="../tool/IRoutinoDatabaseBuilder.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../tool/IRoutinoDatabaseBuilder.ui" line="22"/>
@@ -6819,17 +7716,17 @@ nebo
<message>
<location filename="../tool/IRoutinoDatabaseBuilder.ui" line="39"/>
<source>Select source files:</source>
- <translation>Vybrat zdrojové soubory:</translation>
+ <translation>Выбрать исходные файлы:</translation>
</message>
<message>
<location filename="../tool/IRoutinoDatabaseBuilder.ui" line="54"/>
<source>Start</source>
- <translation>Spustit</translation>
+ <translation>Начать</translation>
</message>
<message>
<location filename="../tool/IRoutinoDatabaseBuilder.ui" line="86"/>
<source>Target Path:</source>
- <translation>Cílová cesta:</translation>
+ <translation>Целевой путь:</translation>
</message>
<message>
<location filename="../tool/IRoutinoDatabaseBuilder.ui" line="93"/>
@@ -6839,7 +7736,7 @@ nebo
<message>
<location filename="../tool/IRoutinoDatabaseBuilder.ui" line="100"/>
<source>File Prefix</source>
- <translation>Předpona souboru</translation>
+ <translation>Префикс файла</translation>
</message>
</context>
<context>
@@ -6847,27 +7744,37 @@ nebo
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="32"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="40"/>
<source>Save to original</source>
- <translation>Uložit do předlohy</translation>
+ <translation>Сохранить в оригинал</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="47"/>
<source>Save as new</source>
- <translation>Uložit jako nový</translation>
+ <translation>Сохранить как новый</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="54"/>
<source>Abort</source>
- <translation>Přerušit</translation>
+ <translation>Прервать</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="89"/>
<source>Move points. (Ctrl+M)</source>
- <translation>Přesunout body. (Ctrl+M)</translation>
+ <translation>Переместить точки. (Ctrl+M)</translation>
+ </message>
+ <message>
+ <location filename="../mouse/line/IScrOptEditLine.ui" line="92"/>
+ <location filename="../mouse/line/IScrOptEditLine.ui" line="118"/>
+ <location filename="../mouse/line/IScrOptEditLine.ui" line="141"/>
+ <location filename="../mouse/line/IScrOptEditLine.ui" line="164"/>
+ <location filename="../mouse/line/IScrOptEditLine.ui" line="300"/>
+ <location filename="../mouse/line/IScrOptEditLine.ui" line="317"/>
+ <source>...</source>
+ <translation>...</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="99"/>
@@ -6877,7 +7784,7 @@ nebo
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="115"/>
<source>Add new points. (Ctrl++)</source>
- <translation>Přidat nové body. (Ctrl++)</translation>
+ <translation>Добавить новые точки. (Ctrl++)</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="125"/>
@@ -6887,7 +7794,7 @@ nebo
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="138"/>
<source>Select a range of points. (Ctrl+R)</source>
- <translation>Vybrat rozsah bodů. (Ctrl+R)</translation>
+ <translation>Выбрать интервал точек. (Ctrl+R)</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="148"/>
@@ -6897,7 +7804,7 @@ nebo
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="161"/>
<source>Delete a point. (Ctrl+D)</source>
- <translation>Smazat bod. (Ctrl+D)</translation>
+ <translation>Удалить точку. (Ctrl+D)</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="171"/>
@@ -6907,7 +7814,12 @@ nebo
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="215"/>
<source>No auto-routing or line snapping (Ctrl+O)</source>
- <translation>Žádné automatické stanovení cesty nebo přichycení k čáře (Ctrl+O)</translation>
+ <translation>Без автоматической маршрутизации и прикрепления к линии (Ctrl+O)</translation>
+ </message>
+ <message>
+ <location filename="../mouse/line/IScrOptEditLine.ui" line="218"/>
+ <source>0</source>
+ <translation>0</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="225"/>
@@ -6917,7 +7829,12 @@ nebo
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="238"/>
<source>Use auto-routing to between points. (Ctrl+A)</source>
- <translation>Použít automatické stanovení cesty mezi body. (Ctrl+A)</translation>
+ <translation>Использовать автоматическую маршрутизацию между точками. (Ctrl+A)</translation>
+ </message>
+ <message>
+ <location filename="../mouse/line/IScrOptEditLine.ui" line="241"/>
+ <source>A</source>
+ <translation>A</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="248"/>
@@ -6927,27 +7844,7 @@ nebo
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="261"/>
<source>Snap line along lines of a vector map. (Ctrl+V)</source>
- <translation>Přichytit čáru podél čáry vektorové mapy. (Ctrl+V)</translation>
- </message>
- <message>
- <location filename="../mouse/line/IScrOptEditLine.ui" line="92"/>
- <location filename="../mouse/line/IScrOptEditLine.ui" line="118"/>
- <location filename="../mouse/line/IScrOptEditLine.ui" line="141"/>
- <location filename="../mouse/line/IScrOptEditLine.ui" line="164"/>
- <location filename="../mouse/line/IScrOptEditLine.ui" line="300"/>
- <location filename="../mouse/line/IScrOptEditLine.ui" line="317"/>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
- <location filename="../mouse/line/IScrOptEditLine.ui" line="218"/>
- <source>0</source>
- <translation>0</translation>
- </message>
- <message>
- <location filename="../mouse/line/IScrOptEditLine.ui" line="241"/>
- <source>A</source>
- <translation>A</translation>
+ <translation>Прикрепления линии к линиям векторной карты. (Ctrl+V)</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="264"/>
@@ -6962,12 +7859,12 @@ nebo
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="297"/>
<source>Undo last change</source>
- <translation>Vrátit poslední změnu zpět</translation>
+ <translation>Отменить последнее изменение</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="314"/>
<source>Redo last change</source>
- <translation>Obnovit poslední změnu</translation>
+ <translation>Вернуть последнее изменение</translation>
</message>
</context>
<context>
@@ -6975,12 +7872,12 @@ nebo
<message>
<location filename="../gis/ovl/IScrOptOvlArea.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../gis/ovl/IScrOptOvlArea.ui" line="40"/>
<source>View details and edit.</source>
- <translation>Zobrazit podrobnosti a upravit.</translation>
+ <translation>Показать и изменить детали.</translation>
</message>
<message>
<location filename="../gis/ovl/IScrOptOvlArea.ui" line="43"/>
@@ -6993,22 +7890,22 @@ nebo
<message>
<location filename="../gis/ovl/IScrOptOvlArea.ui" line="54"/>
<source>Copy area into another project.</source>
- <translation>Kopírovat oblast do dalšího projektu.</translation>
+ <translation>Копировать область в другой проект.</translation>
</message>
<message>
<location filename="../gis/ovl/IScrOptOvlArea.ui" line="68"/>
<source>Delete area from project.</source>
- <translation>Smazat oblast z projektu.</translation>
+ <translation>Удалить область с проекта.</translation>
</message>
<message>
<location filename="../gis/ovl/IScrOptOvlArea.ui" line="89"/>
<source>Edit shape of the area.</source>
- <translation>Upravit tvar oblasti.</translation>
+ <translation>Изменить фигуру области.</translation>
</message>
<message>
<location filename="../gis/ovl/IScrOptOvlArea.ui" line="121"/>
<source>TextLabel</source>
- <translation>Textový štítek</translation>
+ <translation>Метка текста</translation>
</message>
</context>
<context>
@@ -7016,12 +7913,12 @@ nebo
<message>
<location filename="../mouse/IScrOptPrint.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../mouse/IScrOptPrint.ui" line="35"/>
<source>Save selected area as image.</source>
- <translation>Uložit vybranou oblast jako obrázek.</translation>
+ <translation>Сохранить выбранную область как изображение.</translation>
</message>
<message>
<location filename="../mouse/IScrOptPrint.ui" line="38"/>
@@ -7032,7 +7929,7 @@ nebo
<message>
<location filename="../mouse/IScrOptPrint.ui" line="55"/>
<source>Print selected area.</source>
- <translation>Tisk vybrané oblasti.</translation>
+ <translation>Печатать выбранную область.</translation>
</message>
</context>
<context>
@@ -7040,23 +7937,23 @@ nebo
<message>
<location filename="../mouse/line/IScrOptRangeLine.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="20"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="32"/>
<source>Delete all points between the first and last one.</source>
- <translation>Smazat všechny body mezi prvním a posledním bodem.</translation>
+ <translation>Удалить все точки между первой и последней.</translation>
</message>
<message>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="23"/>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="37"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="35"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="49"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../mouse/line/IScrOptRangeLine.ui" line="34"/>
+ <location filename="../mouse/line/IScrOptRangeLine.ui" line="46"/>
<source><html><head/><body><p>Calculate a route between the first and last selected point.</p></body></html></source>
- <translation><html><head/><body><p>Spočítat cestu mezi prvním a posledním vybraným bodem.</p></body></html></translation>
+ <translation><html><head/><body><p>Вычислить маршрут между первой и последней выбранной точками.</p></body></html></translation>
</message>
</context>
<context>
@@ -7064,12 +7961,12 @@ nebo
<message>
<location filename="../mouse/IScrOptRangeTrk.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../mouse/IScrOptRangeTrk.ui" line="40"/>
<source>Hide all points.</source>
- <translation>Skrýt všechny body.</translation>
+ <translation>Скрыть все точки.</translation>
</message>
<message>
<location filename="../mouse/IScrOptRangeTrk.ui" line="43"/>
@@ -7082,22 +7979,22 @@ nebo
<message>
<location filename="../mouse/IScrOptRangeTrk.ui" line="54"/>
<source>Show all points.</source>
- <translation>Ukázat všechny body.</translation>
+ <translation>Показать все точки.</translation>
</message>
<message>
<location filename="../mouse/IScrOptRangeTrk.ui" line="68"/>
<source>Select an activity for the selected range.</source>
- <translation>Vybrat činnost pro vybranou oblast.</translation>
+ <translation>Выбрать мероприятие для выбранного интервала.</translation>
</message>
<message>
<location filename="../mouse/IScrOptRangeTrk.ui" line="82"/>
<source>Copy track points as new track.</source>
- <translation>Kopírovat body stopy jako novou stopu.</translation>
+ <translation>Скопировать точки трека в новый трек.</translation>
</message>
<message>
<location filename="../mouse/IScrOptRangeTrk.ui" line="117"/>
<source>TextLabel</source>
- <translation>Textový štítek</translation>
+ <translation>Метка текста</translation>
</message>
</context>
<context>
@@ -7105,7 +8002,12 @@ nebo
<message>
<location filename="../gis/rte/IScrOptRte.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
+ </message>
+ <message>
+ <location filename="../gis/rte/IScrOptRte.ui" line="40"/>
+ <source>View details and edit.</source>
+ <translation>Показать и изменить детали.</translation>
</message>
<message>
<location filename="../gis/rte/IScrOptRte.ui" line="43"/>
@@ -7122,42 +8024,37 @@ nebo
<message>
<location filename="../gis/rte/IScrOptRte.ui" line="54"/>
<source>Copy route into another project.</source>
- <translation>Kopírovat cestu do dalšího projektu.</translation>
- </message>
- <message>
- <location filename="../gis/rte/IScrOptRte.ui" line="40"/>
- <source>View details and edit.</source>
- <translation>Zobrazit podrobnosti a upravit.</translation>
+ <translation>Скопировать маршрут в другой проект.</translation>
</message>
<message>
<location filename="../gis/rte/IScrOptRte.ui" line="68"/>
<source>Delete route from project.</source>
- <translation>Smazat cestu z projektu.</translation>
+ <translation>Удалить маршрут с проекта.</translation>
</message>
<message>
<location filename="../gis/rte/IScrOptRte.ui" line="103"/>
<source>Calculate route.</source>
- <translation>Spočítat cestu.</translation>
+ <translation>Вычислить маршрут.</translation>
</message>
<message>
<location filename="../gis/rte/IScrOptRte.ui" line="117"/>
<source>Reset route calculation.</source>
- <translation>Vynulovat spočítání cesty.</translation>
+ <translation>Сбросить маршрутизацию.</translation>
</message>
<message>
<location filename="../gis/rte/IScrOptRte.ui" line="131"/>
<source>Move route points.</source>
- <translation>Přesunout body cesty.</translation>
+ <translation>Переместить точки маршрута.</translation>
</message>
<message>
<location filename="../gis/rte/IScrOptRte.ui" line="145"/>
<source>Convert route to track</source>
- <translation>Převést cestu na stopu</translation>
+ <translation>Преобразовать маршрут в трек</translation>
</message>
<message>
<location filename="../gis/rte/IScrOptRte.ui" line="174"/>
<source>TextLabel</source>
- <translation>Textový štítek</translation>
+ <translation>Метка текста</translation>
</message>
</context>
<context>
@@ -7165,71 +8062,77 @@ nebo
<message>
<location filename="../mouse/IScrOptSelect.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../mouse/IScrOptSelect.ui" line="59"/>
<source>Copy all selected items to a project.</source>
- <translation>Kopírovat všechny vybrané prvky do projektu.</translation>
+ <translation>Скопировать все выбранные элементы в проект.</translation>
</message>
<message>
<location filename="../mouse/IScrOptSelect.ui" line="62"/>
<location filename="../mouse/IScrOptSelect.ui" line="82"/>
<location filename="../mouse/IScrOptSelect.ui" line="102"/>
<location filename="../mouse/IScrOptSelect.ui" line="122"/>
- <location filename="../mouse/IScrOptSelect.ui" line="176"/>
- <location filename="../mouse/IScrOptSelect.ui" line="205"/>
- <location filename="../mouse/IScrOptSelect.ui" line="265"/>
- <location filename="../mouse/IScrOptSelect.ui" line="292"/>
- <location filename="../mouse/IScrOptSelect.ui" line="319"/>
- <location filename="../mouse/IScrOptSelect.ui" line="346"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="142"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="196"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="225"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="285"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="312"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="339"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="366"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
<location filename="../mouse/IScrOptSelect.ui" line="79"/>
<source>Create a route from selected waypoints.</source>
- <translation>Vytvořit cestu z vybraných cestovních bodů.</translation>
+ <translation>Создать маршрут с выбранных маршрутных точек.</translation>
</message>
<message>
<location filename="../mouse/IScrOptSelect.ui" line="99"/>
- <source>Combine all selected tracks to a new one.</source>
- <translation>Spojit všechny vybrané stopy do nové.</translation>
+ <source>Change the icon of all selected waypoints.</source>
+ <translation>Изменить пиктограммы всех выбранных маршрутных точек.</translation>
</message>
<message>
<location filename="../mouse/IScrOptSelect.ui" line="119"/>
+ <source>Combine all selected tracks to a new one.</source>
+ <translation>Объединить все выбранные треки в новый трек.</translation>
+ </message>
+ <message>
+ <location filename="../mouse/IScrOptSelect.ui" line="139"/>
<source>Delete all selected items.</source>
- <translation>Smazat všechny vybrané prvky.</translation>
+ <translation>Удалить все выбранные элементы.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="173"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="193"/>
<source>Select all items that intersect the selected area.</source>
- <translation>Vybrat všechny prvky, které protínají vybranou oblast.</translation>
+ <translation>Выбрать все элементы, которые пересекают выбранную область.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="202"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="222"/>
<source>Select all itmes that are completely inside the selected area.</source>
- <translation>Vybrat všechny prvky, které jsou úplně uvnitř vybrané oblasti.</translation>
+ <translation>Выбрать все элементы, которые находятся полностью внутри выбранной области.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="262"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="282"/>
<source>Add tracks to selection.</source>
- <translation>Přidat stopy do výběru.</translation>
+ <translation>Добавить треки к выбору.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="289"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="309"/>
<source>Add waypoints to selection.</source>
- <translation>Přidat cestovní body do výběru.</translation>
+ <translation>Добавить маршрутные точки к выбору.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="316"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="336"/>
<source>Add routes to selection.</source>
- <translation>Přidat cesty do výběru.</translation>
+ <translation>Добавить маршруты к выбору.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="343"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="363"/>
<source>Add areas to selection.</source>
- <translation>Přidat oblasti do výběru.</translation>
+ <translation>Добавить области к выбору.</translation>
</message>
</context>
<context>
@@ -7237,47 +8140,61 @@ nebo
<message>
<location filename="../gis/trk/IScrOptTrk.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
- <location filename="../gis/trk/IScrOptTrk.ui" line="54"/>
- <source>Copy track into another project.</source>
- <translation>Kopírovat stopu do dalšího projektu.</translation>
- </message>
- <message>
- <location filename="../gis/trk/IScrOptTrk.ui" line="89"/>
- <source>Show on-screen profile and detailed information about points.</source>
- <translation>Ukázat promítnutý profil a podrobné údaje o bodech.</translation>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="40"/>
+ <source>View details and edit properties of track.</source>
+ <translation>Показать детали и изменить свойства трека.</translation>
</message>
<message>
- <location filename="../gis/trk/IScrOptTrk.ui" line="120"/>
- <source>Edit position of track points.</source>
- <translation>Upravit polohu bodů stopy.</translation>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="43"/>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="57"/>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="71"/>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="92"/>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="109"/>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="123"/>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="137"/>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="151"/>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="170"/>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="184"/>
+ <source>...</source>
+ <translation>...</translation>
</message>
<message>
- <location filename="../gis/trk/IScrOptTrk.ui" line="40"/>
- <source>View details and edit properties of track.</source>
- <translation>Zobrazit podrobnosti a upravit vlastnosti stopy.</translation>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="54"/>
+ <source>Copy track into another project.</source>
+ <translation>Скопировать трек в другой проект.</translation>
</message>
<message>
<location filename="../gis/trk/IScrOptTrk.ui" line="68"/>
<source>Delete track from project.</source>
- <translation>Smazat stopu z projektu.</translation>
+ <translation>Удалить трек с проекта.</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="89"/>
+ <source>Show on-screen profile and detailed information about points.</source>
+ <translation>Показать на экране профиль и подробные сведения о точках.</translation>
</message>
<message>
<location filename="../gis/trk/IScrOptTrk.ui" line="106"/>
<source>Select a range of points.</source>
- <translation>Vybrat rozsah bodů.</translation>
+ <translation>Выбрать интервал трека.</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="120"/>
+ <source>Edit position of track points.</source>
+ <translation>Изменить позиции точек трека.</translation>
</message>
<message>
<location filename="../gis/trk/IScrOptTrk.ui" line="134"/>
<source>Reverse track.</source>
- <translation>Obrátit stopu.</translation>
+ <translation>Обратить трек.</translation>
</message>
<message>
<location filename="../gis/trk/IScrOptTrk.ui" line="148"/>
<source>Combine tracks.</source>
- <translation>Spojit stopy.</translation>
+ <translation>Объединить треки.</translation>
</message>
<message>
<location filename="../gis/trk/IScrOptTrk.ui" line="162"/>
@@ -7287,35 +8204,22 @@ nebo
* use the track parts to plan a new tour
* cut a long track into stages
</source>
- <translation>Rozkrojit stopu na vybraném bodu. Můžete to použít na:
+ <translation>Разрезать трек в выбранной точки. Можно использовать это чтобы:
-* odstranění špatných bodů na začátku nebo na konci stopy
-* použití částí stopy k plánování nového výletu
-* vyjmutí dlouhé stopy do úseků</translation>
+* удалить неверные точки с начала или с конца трека,
+* создать новый трек из частей трека,
+* разрезать длинный трек на меньшие составляющие
+</translation>
</message>
<message>
<location filename="../gis/trk/IScrOptTrk.ui" line="181"/>
<source>Copy track together with all attached waypoints into another project.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gis/trk/IScrOptTrk.ui" line="43"/>
- <location filename="../gis/trk/IScrOptTrk.ui" line="57"/>
- <location filename="../gis/trk/IScrOptTrk.ui" line="71"/>
- <location filename="../gis/trk/IScrOptTrk.ui" line="92"/>
- <location filename="../gis/trk/IScrOptTrk.ui" line="109"/>
- <location filename="../gis/trk/IScrOptTrk.ui" line="123"/>
- <location filename="../gis/trk/IScrOptTrk.ui" line="137"/>
- <location filename="../gis/trk/IScrOptTrk.ui" line="151"/>
- <location filename="../gis/trk/IScrOptTrk.ui" line="170"/>
- <location filename="../gis/trk/IScrOptTrk.ui" line="184"/>
- <source>...</source>
- <translation>...</translation>
+ <translation>Скопировать трек вместе со всеми присоединёнными маршрутными точками в другой проект.</translation>
</message>
<message>
<location filename="../gis/trk/IScrOptTrk.ui" line="210"/>
<source>TextLabel</source>
- <translation>Textový štítek</translation>
+ <translation>Метка текста</translation>
</message>
</context>
<context>
@@ -7323,12 +8227,12 @@ nebo
<message>
<location filename="../gis/wpt/IScrOptWpt.ui" line="20"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../gis/wpt/IScrOptWpt.ui" line="49"/>
<source>View details and edit.</source>
- <translation>Zobrazit podrobnosti a upravit.</translation>
+ <translation>Показать детали и изменить.</translation>
</message>
<message>
<location filename="../gis/wpt/IScrOptWpt.ui" line="52"/>
@@ -7343,32 +8247,32 @@ nebo
<message>
<location filename="../gis/wpt/IScrOptWpt.ui" line="63"/>
<source>Copy waypoint into another project.</source>
- <translation>Kopírovat cestovní bod do dalšího projektu.</translation>
+ <translation>Скопировать маршрутную точку в другой проект.</translation>
</message>
<message>
<location filename="../gis/wpt/IScrOptWpt.ui" line="77"/>
<source>Delete waypoint from project.</source>
- <translation>Smazat cestovní bod z projektu.</translation>
+ <translation>Удалить маршрутную точку с проекта.</translation>
</message>
<message>
<location filename="../gis/wpt/IScrOptWpt.ui" line="98"/>
<source>Show content as static bubble.</source>
- <translation>Ukázat obsah stálé vysvětlivky.</translation>
+ <translation>Показать содержимое в статическом пузырьке.</translation>
</message>
<message>
<location filename="../gis/wpt/IScrOptWpt.ui" line="115"/>
<source>Move waypoint to a new location.</source>
- <translation>Přesunout cestovní bod do nového umístění.</translation>
+ <translation>Переместить маршрутную точку в новую позицию.</translation>
</message>
<message>
<location filename="../gis/wpt/IScrOptWpt.ui" line="129"/>
<source>Clone waypoint and move clone a given distance and angle.</source>
- <translation>Klonovat cestovní bod a kopii přesunout o danou vzdálenost a ve stanoveném úhlu.</translation>
+ <translation>Клонировать маршрутную точку и переместить клон на данное расстояние под указанным углом.</translation>
</message>
<message>
<location filename="../gis/wpt/IScrOptWpt.ui" line="176"/>
<source>TextLabel</source>
- <translation>Textový štítek</translation>
+ <translation>Метка текста</translation>
</message>
</context>
<context>
@@ -7376,29 +8280,29 @@ nebo
<message>
<location filename="../gis/db/ISearchDatabase.ui" line="14"/>
<source>Search...</source>
- <translation>Hledat...</translation>
+ <translation>Поиск...</translation>
</message>
<message>
<location filename="../gis/db/ISearchDatabase.ui" line="34"/>
<source>Type the word you want to search for and press the search button.
If you enter 'word' a search with an exact match is done. If you enter 'word*', 'word' has to be at the beginning of a string.</source>
- <translation>Napište slovo, které se má hledat, a stiskněte tlačítko pro hledání.
-Pokud zadáte 'slovo', provede se hledání přesné shody. Pokud zadáte 'slovo*', 'slovo' musí být na začátku řetězce.</translation>
+ <translation>Ввести слово, которое желаете найти, и нажать кнопку 'Найти'.
+Если ввести 'слово', будет произведён поиск с точным совпадением. Если ввести 'слово*', то 'слово' должно быть в начале строки.</translation>
</message>
<message>
<location filename="../gis/db/ISearchDatabase.ui" line="51"/>
<source>Name</source>
- <translation>Název</translation>
+ <translation>Имя</translation>
</message>
<message>
<location filename="../gis/db/ISearchDatabase.ui" line="79"/>
<source>Search</source>
- <translation>Hledat</translation>
+ <translation>Найти</translation>
</message>
<message>
<location filename="../gis/db/ISearchDatabase.ui" line="86"/>
<source>Close</source>
- <translation>Zavřít</translation>
+ <translation>Закрыть</translation>
</message>
</context>
<context>
@@ -7406,7 +8310,7 @@ Pokud zadáte 'slovo', provede se hledání přesné shody. Pokud zad
<message>
<location filename="../gis/ISelDevices.ui" line="14"/>
<source>Select devices...</source>
- <translation>Vybrat zařízení...</translation>
+ <translation>Выбрать устройства...</translation>
</message>
</context>
<context>
@@ -7414,7 +8318,7 @@ Pokud zadáte 'slovo', provede se hledání přesné shody. Pokud zad
<message>
<location filename="../gis/trk/ISelectActivityColor.ui" line="14"/>
<source>Form</source>
- <translation>Formulář</translation>
+ <translation>Форма</translation>
</message>
</context>
<context>
@@ -7422,12 +8326,12 @@ Pokud zadáte 'slovo', provede se hledání přesné shody. Pokud zad
<message>
<location filename="../helpers/ISelectCopyAction.ui" line="14"/>
<source>Copy item...</source>
- <translation>Kopírovat prvek...</translation>
+ <translation>Скопировать элемент...</translation>
</message>
<message>
<location filename="../helpers/ISelectCopyAction.ui" line="29"/>
<source>Replace existing item</source>
- <translation>Nahradit stávající prvek</translation>
+ <translation>Заменить существующий элемент</translation>
</message>
<message>
<location filename="../helpers/ISelectCopyAction.ui" line="36"/>
@@ -7435,37 +8339,37 @@ Pokud zadáte 'slovo', provede se hledání přesné shody. Pokud zad
<location filename="../helpers/ISelectCopyAction.ui" line="79"/>
<location filename="../helpers/ISelectCopyAction.ui" line="89"/>
<source>TextLabel</source>
- <translation>Textový štítek</translation>
+ <translation>Метка текста</translation>
</message>
<message>
<location filename="../helpers/ISelectCopyAction.ui" line="72"/>
<source>Do not copy item</source>
- <translation>Nekopírovat prvek</translation>
+ <translation>Не копировать элемент</translation>
</message>
<message>
<location filename="../helpers/ISelectCopyAction.ui" line="115"/>
<source>Create a clone</source>
- <translation>Vytvořit klon</translation>
+ <translation>Создать клон</translation>
</message>
<message>
<location filename="../helpers/ISelectCopyAction.ui" line="122"/>
<source>Replace with:</source>
- <translation>Nahradit:</translation>
+ <translation>Заменить на:</translation>
</message>
<message>
<location filename="../helpers/ISelectCopyAction.ui" line="129"/>
<source>Keep item:</source>
- <translation>Zachovat prvek:</translation>
+ <translation>Оставить элемент:</translation>
</message>
<message>
<location filename="../helpers/ISelectCopyAction.ui" line="136"/>
<source>The clone's name will be appended with '_Clone'</source>
- <translation>Název klonu bude rozšířen o '_Klon'</translation>
+ <translation>'_клон' будет добавлено к имени клона</translation>
</message>
<message>
<location filename="../helpers/ISelectCopyAction.ui" line="153"/>
<source>And for all other items, too.</source>
- <translation>A také pro všechny další prvky.</translation>
+ <translation>Также для всех остальных элементов.</translation>
</message>
</context>
<context>
@@ -7473,12 +8377,12 @@ Pokud zadáte 'slovo', provede se hledání přesné shody. Pokud zad
<message>
<location filename="../gis/db/ISelectDBFolder.ui" line="14"/>
<source>Select Parent Folder...</source>
- <translation>Vybrat nadřazenou složku...</translation>
+ <translation>Выбрать корневую папку...</translation>
</message>
<message>
<location filename="../gis/db/ISelectDBFolder.ui" line="26"/>
<source>Name</source>
- <translation>Název</translation>
+ <translation>Имя</translation>
</message>
</context>
<context>
@@ -7486,22 +8390,22 @@ Pokud zadáte 'slovo', provede se hledání přesné shody. Pokud zad
<message>
<location filename="../helpers/ISelectProjectDialog.ui" line="14"/>
<source>Select a project...</source>
- <translation>Vybrat projekt...</translation>
+ <translation>Выбрать проект...</translation>
</message>
<message>
<location filename="../helpers/ISelectProjectDialog.ui" line="20"/>
<source>Select project from list or enter new project name.</source>
- <translation>Vybrat projekt ze seznamu nebo zadat nový název projektu.</translation>
+ <translation>Выбрать проект со списка или ввести имя нового проекта.</translation>
</message>
<message>
<location filename="../helpers/ISelectProjectDialog.ui" line="33"/>
<source>New project's name</source>
- <translation>Nový název projektu</translation>
+ <translation>Имя нового проекта</translation>
</message>
<message>
<location filename="../helpers/ISelectProjectDialog.ui" line="43"/>
<source>New project is created as:</source>
- <translation>Nový projekt je vytvořen jako:</translation>
+ <translation>Создать новый проект как:</translation>
</message>
<message>
<location filename="../helpers/ISelectProjectDialog.ui" line="93"/>
@@ -7516,7 +8420,7 @@ Pokud zadáte 'slovo', provede se hledání přesné shody. Pokud zad
<message>
<location filename="../helpers/ISelectProjectDialog.ui" line="110"/>
<source>Database</source>
- <translation>Databáze</translation>
+ <translation>База данных</translation>
</message>
</context>
<context>
@@ -7524,27 +8428,12 @@ Pokud zadáte 'slovo', provede se hledání přesné shody. Pokud zad
<message>
<location filename="../gis/db/ISelectSaveAction.ui" line="20"/>
<source>Copy item...</source>
- <translation>Kopírovat prvek...</translation>
+ <translation>Копировать элемент...</translation>
</message>
<message>
<location filename="../gis/db/ISelectSaveAction.ui" line="35"/>
<source>Replace existing item</source>
- <translation>Nahradit stávající prvek</translation>
- </message>
- <message>
- <location filename="../gis/db/ISelectSaveAction.ui" line="87"/>
- <source>Add a clone</source>
- <translation>Přidat klona</translation>
- </message>
- <message>
- <location filename="../gis/db/ISelectSaveAction.ui" line="100"/>
- <source>The clone's name will be appended with '_Clone'</source>
- <translation>Název klonu bude rozšířen o '_Klon'</translation>
- </message>
- <message>
- <location filename="../gis/db/ISelectSaveAction.ui" line="171"/>
- <source>Replace with:</source>
- <translation>Nahradit:</translation>
+ <translation>Заменить существующий элемент</translation>
</message>
<message>
<location filename="../gis/db/ISelectSaveAction.ui" line="42"/>
@@ -7552,22 +8441,37 @@ Pokud zadáte 'slovo', provede se hledání přesné shody. Pokud zad
<location filename="../gis/db/ISelectSaveAction.ui" line="130"/>
<location filename="../gis/db/ISelectSaveAction.ui" line="140"/>
<source>TextLabel</source>
- <translation>Textový štítek</translation>
+ <translation>Метка текста</translation>
</message>
<message>
<location filename="../gis/db/ISelectSaveAction.ui" line="61"/>
<source>Do not replace item</source>
- <translation>Nenahrazovat prvek</translation>
+ <translation>Не заменять элемент</translation>
</message>
<message>
- <location filename="../gis/db/ISelectSaveAction.ui" line="123"/>
- <source>Use item:</source>
- <translation>Použít prvek:</translation>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="87"/>
+ <source>Add a clone</source>
+ <translation>Добавить клон</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="100"/>
+ <source>The clone's name will be appended with '_Clone'</source>
+ <translation>'_клон' будет добавлено к имени клона</translation>
</message>
<message>
<location filename="../gis/db/ISelectSaveAction.ui" line="116"/>
<source>And for all other items, too.</source>
- <translation>A také pro všechny další prvky.</translation>
+ <translation>Также для всех остальных элементов.</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="123"/>
+ <source>Use item:</source>
+ <translation>Использовать элемент:</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="171"/>
+ <source>Replace with:</source>
+ <translation>Заменить на:</translation>
</message>
</context>
<context>
@@ -7575,47 +8479,22 @@ Pokud zadáte 'slovo', provede se hledání přesné shody. Pokud zad
<message>
<location filename="../gis/db/ISetupDatabase.ui" line="14"/>
<source>Add database...</source>
- <translation>Přidat databázi...</translation>
- </message>
- <message>
- <location filename="../gis/db/ISetupDatabase.ui" line="68"/>
- <source>-</source>
- <translation>-</translation>
+ <translation>Добавить базу данных...</translation>
</message>
<message>
<location filename="../gis/db/ISetupDatabase.ui" line="25"/>
<source>Name</source>
- <translation>Název</translation>
- </message>
- <message>
- <location filename="../gis/db/ISetupDatabase.ui" line="252"/>
- <source><p align="justify"><span style=" font-weight:600;">Caution!</span> It is recommended to leave the password blank, as QMapShack will store it as plain text. If you don't give a password you will be asked for it on each startup.</p></source>
- <translation><p align="justify"><span style=" font-weight:600;">Pozor!</span> Doporučuje se ponechat heslo prázdné, neboť QMapShack je uloží jako prostý text. Pokud heslo nezadáte, budete na ně dotazován při každém spuštění programu.</p></translation>
- </message>
- <message>
- <location filename="../gis/db/ISetupDatabase.ui" line="239"/>
- <source>Do not use a password.</source>
- <translation>Nepoužívat heslo.</translation>
- </message>
- <message>
- <location filename="../gis/db/ISetupDatabase.ui" line="153"/>
- <source>SQLite</source>
- <translation>SQLite</translation>
- </message>
- <message>
- <location filename="../gis/db/ISetupDatabase.ui" line="115"/>
- <source>MySQL</source>
- <translation>MySQL</translation>
+ <translation>Имя</translation>
</message>
<message>
<location filename="../gis/db/ISetupDatabase.ui" line="181"/>
<source>Server</source>
- <translation>Server</translation>
+ <translation>Сервер</translation>
</message>
<message>
<location filename="../gis/db/ISetupDatabase.ui" line="193"/>
<source>Port</source>
- <translation>Přípojka</translation>
+ <translation>Порт</translation>
</message>
<message>
<location filename="../gis/db/ISetupDatabase.ui" line="206"/>
@@ -7625,27 +8504,42 @@ Pokud zadáte 'slovo', provede se hledání přesné shody. Pokud zad
<message>
<location filename="../gis/db/ISetupDatabase.ui" line="215"/>
<source>User</source>
- <translation>Uživatel</translation>
+ <translation>Пользователь</translation>
</message>
<message>
<location filename="../gis/db/ISetupDatabase.ui" line="225"/>
<source>Password</source>
- <translation>Heslo</translation>
+ <translation>Пароль</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISetupDatabase.ui" line="252"/>
+ <source><p align="justify"><span style=" font-weight:600;">Caution!</span> It is recommended to leave the password blank, as QMapShack will store it as plain text. If you don't give a password you will be asked for it on each startup.</p></source>
+ <translation><p align="justify"><span style=" font-weight:600;">Внимание!</span> Рекомендуется оставить поле пароля пустым, так как QMapShack сохранит его как простой текст. Если нет пароля, то программа будет запрашивать его при каждом запуске.</p></translation>
</message>
<message>
<location filename="../gis/db/ISetupDatabase.ui" line="275"/>
<source><b>Port:</b> Leave the port field empty to use the default port.</source>
- <translation><b>Přípojka:</b> Pro používání výchozí přípojky ponechejte pole s číslem přípojky prázdné.</translation>
+ <translation><b>Порт:</b> Если оставить поле порт пустым, то будет использоваться порт по умолчанию.</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISetupDatabase.ui" line="239"/>
+ <source>Do not use a password.</source>
+ <translation>Не использовать пароль.</translation>
</message>
<message>
<location filename="../gis/db/ISetupDatabase.ui" line="61"/>
<source>File:</source>
- <translation>Soubor:</translation>
+ <translation>Файл:</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISetupDatabase.ui" line="68"/>
+ <source>-</source>
+ <translation>-</translation>
</message>
<message>
<location filename="../gis/db/ISetupDatabase.ui" line="75"/>
<source>Add new database.</source>
- <translation>Přidat novou databázi.</translation>
+ <translation>Добавить новую базу данных.</translation>
</message>
<message>
<location filename="../gis/db/ISetupDatabase.ui" line="78"/>
@@ -7656,7 +8550,17 @@ Pokud zadáte 'slovo', provede se hledání přesné shody. Pokud zad
<message>
<location filename="../gis/db/ISetupDatabase.ui" line="89"/>
<source>Open existing database.</source>
- <translation>Otevřít stávající databázi.</translation>
+ <translation>Открыть существующую базу данных.</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISetupDatabase.ui" line="115"/>
+ <source>MySQL</source>
+ <translation>MySQL</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISetupDatabase.ui" line="153"/>
+ <source>SQLite</source>
+ <translation>SQLite</translation>
</message>
</context>
<context>
@@ -7664,27 +8568,27 @@ Pokud zadáte 'slovo', provede se hledání přesné shody. Pokud zad
<message>
<location filename="../gis/db/ISetupFolder.ui" line="14"/>
<source>Database Folder...</source>
- <translation>Složka s databází...</translation>
+ <translation>Папка базы данных...</translation>
</message>
<message>
<location filename="../gis/db/ISetupFolder.ui" line="20"/>
<source>Folder name</source>
- <translation>Název složky</translation>
+ <translation>Имя папки</translation>
</message>
<message>
<location filename="../gis/db/ISetupFolder.ui" line="30"/>
<source>Group</source>
- <translation>Skupina</translation>
+ <translation>Группа</translation>
</message>
<message>
<location filename="../gis/db/ISetupFolder.ui" line="41"/>
<source>Project</source>
- <translation>Projekt</translation>
+ <translation>Проект</translation>
</message>
<message>
<location filename="../gis/db/ISetupFolder.ui" line="55"/>
<source>Other</source>
- <translation>Jiné</translation>
+ <translation>Остальное</translation>
</message>
</context>
<context>
@@ -7692,12 +8596,12 @@ Pokud zadáte 'slovo', provede se hledání přesné shody. Pokud zad
<message>
<location filename="../gis/wpt/ISetupNewWpt.ui" line="14"/>
<source>New Waypoint...</source>
- <translation>Nový cestovní bod...</translation>
+ <translation>Новая маршрутная точка...</translation>
</message>
<message>
<location filename="../gis/wpt/ISetupNewWpt.ui" line="22"/>
<source>Symbol</source>
- <translation>Symbol</translation>
+ <translation>Символ</translation>
</message>
<message>
<location filename="../gis/wpt/ISetupNewWpt.ui" line="29"/>
@@ -7707,12 +8611,12 @@ Pokud zadáte 'slovo', provede se hledání přesné shody. Pokud zad
<message>
<location filename="../gis/wpt/ISetupNewWpt.ui" line="39"/>
<source>Position</source>
- <translation>Poloha</translation>
+ <translation>Позиция</translation>
</message>
<message>
<location filename="../gis/wpt/ISetupNewWpt.ui" line="49"/>
<source>Name</source>
- <translation>Název</translation>
+ <translation>Имя</translation>
</message>
<message>
<location filename="../gis/wpt/ISetupNewWpt.ui" line="59"/>
@@ -7720,10 +8624,10 @@ Pokud zadáte 'slovo', provede se hledání přesné shody. Pokud zad
"[N|S] ddd mm.sss [W|E] ddd mm.sss"
or
"[N|S] ddd.ddd [W|E] ddd.ddd"</source>
- <translation>Špatný polohový formát. Musí být:
-"[N|S] ddd mm.sss [W|E] ddd mm.sss"
-nebo
-"[N|S] ddd.ddd [W|E] ddd.ddd"</translation>
+ <translation>Неверный формат позиции. Должен быть:
+"[С|Ю] ddd mm.sss [З|В] ddd mm.sss"
+ или
+"[С|Ю] ddd.ddd [З|В] ddd.ddd"</translation>
</message>
</context>
<context>
@@ -7731,22 +8635,22 @@ nebo
<message>
<location filename="../gis/db/ISetupWorkspace.ui" line="14"/>
<source>Setup workspace...</source>
- <translation>Nastavit pracovní prostor...</translation>
+ <translation>Настройка рабочей области...</translation>
</message>
<message>
<location filename="../gis/db/ISetupWorkspace.ui" line="35"/>
<source>save workspace on exit, and every</source>
- <translation>Uložit pracovní prostor při ukončení, a každých</translation>
+ <translation>Сохранять рабочую область при выходе и каждые</translation>
</message>
<message>
<location filename="../gis/db/ISetupWorkspace.ui" line="45"/>
<source>minutes</source>
- <translation>minut</translation>
+ <translation>минут</translation>
</message>
<message>
<location filename="../gis/db/ISetupWorkspace.ui" line="56"/>
<source>listen for database changes from other instances of QMapShack. On port</source>
- <translation>Naslouchat změnám v databázi jiných instancí QMapShack. Na přípojce</translation>
+ <translation>Прослушивать изменений в базе данных другой работающей QMapShack. Порт</translation>
</message>
<message>
<location filename="../gis/db/ISetupWorkspace.ui" line="63"/>
@@ -7759,13 +8663,13 @@ nebo
<message>
<location filename="../widgets/ITextEditWidget.ui" line="14"/>
<source>Edit text...</source>
- <translation>Upravit text...</translation>
+ <translation>Изменить текст...</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="25"/>
<location filename="../widgets/ITextEditWidget.ui" line="331"/>
<source>Undo</source>
- <translation>Zpět</translation>
+ <translation>Отменить</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="334"/>
@@ -7776,7 +8680,7 @@ nebo
<location filename="../widgets/ITextEditWidget.ui" line="38"/>
<location filename="../widgets/ITextEditWidget.ui" line="343"/>
<source>Redo</source>
- <translation>Znovu</translation>
+ <translation>Вернуть</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="346"/>
@@ -7787,7 +8691,7 @@ nebo
<location filename="../widgets/ITextEditWidget.ui" line="51"/>
<location filename="../widgets/ITextEditWidget.ui" line="355"/>
<source>Cut</source>
- <translation>Vyjmout</translation>
+ <translation>Вырезать</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="358"/>
@@ -7798,7 +8702,7 @@ nebo
<location filename="../widgets/ITextEditWidget.ui" line="64"/>
<location filename="../widgets/ITextEditWidget.ui" line="367"/>
<source>Copy</source>
- <translation>Kopírovat</translation>
+ <translation>Копировать</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="370"/>
@@ -7809,7 +8713,7 @@ nebo
<location filename="../widgets/ITextEditWidget.ui" line="77"/>
<location filename="../widgets/ITextEditWidget.ui" line="375"/>
<source>Paste</source>
- <translation>Vložit</translation>
+ <translation>Вставить</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="100"/>
@@ -7854,47 +8758,47 @@ nebo
<message>
<location filename="../widgets/ITextEditWidget.ui" line="265"/>
<source>Standard</source>
- <translation>Standardní</translation>
+ <translation>Стандарт</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="270"/>
<source>Bullet List (Disc)</source>
- <translation>Seznam kulatých odrážek (kotouč)</translation>
+ <translation>Маркированный список (диск)</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="275"/>
<source>Bullet List (Circle)</source>
- <translation>Seznam kulatých odrážek (kroužek)</translation>
+ <translation>Маркированный список (круг)</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="280"/>
<source>Bullet List (Square)</source>
- <translation>Seznam kulatých odrážek (čtvereček)</translation>
+ <translation>Маркированный список (квадрат)</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="285"/>
<source>Ordered List (Decimal)</source>
- <translation>Uspořádaný seznam (desetinný)</translation>
+ <translation>Упорядоченный список (цифра, арабская)</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="290"/>
<source>Ordered List (Alpha lower)</source>
- <translation>Uspořádaný seznam (abecední dolní)</translation>
+ <translation>Упорядоченный список (буква маленькая)</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="295"/>
<source>Ordered List (Alpha upper)</source>
- <translation>Uspořádaný seznam (abecední horní)</translation>
+ <translation>Упорядоченный список (буква большая)</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="300"/>
<source>Ordered List (Roman lower)</source>
- <translation>Uspořádaný seznam (antikva dolní)</translation>
+ <translation>Упорядоченный список (цифра, латинская маленькая)</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="305"/>
<source>Ordered List (Roman upper)</source>
- <translation>Uspořádaný seznam (antikva horní)</translation>
+ <translation>Упорядоченный список (цифра, латинская большая)</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="378"/>
@@ -7904,7 +8808,7 @@ nebo
<message>
<location filename="../widgets/ITextEditWidget.ui" line="390"/>
<source>Align Left</source>
- <translation>Zarovnat vlevo</translation>
+ <translation>Выровнять по левому краю</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="393"/>
@@ -7914,7 +8818,7 @@ nebo
<message>
<location filename="../widgets/ITextEditWidget.ui" line="405"/>
<source>Align Right</source>
- <translation>Zarovnat vpravo</translation>
+ <translation>Выровнять по правому краю</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="408"/>
@@ -7924,7 +8828,7 @@ nebo
<message>
<location filename="../widgets/ITextEditWidget.ui" line="420"/>
<source>Align Center</source>
- <translation>Zarovnat na střed</translation>
+ <translation>Выровнять по центру</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="423"/>
@@ -7934,7 +8838,7 @@ nebo
<message>
<location filename="../widgets/ITextEditWidget.ui" line="435"/>
<source>Align Block</source>
- <translation>Zarovnat do bloku</translation>
+ <translation>Выровнять в блок</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="438"/>
@@ -7944,7 +8848,7 @@ nebo
<message>
<location filename="../widgets/ITextEditWidget.ui" line="450"/>
<source>Underline</source>
- <translation>Podtržení</translation>
+ <translation>Подчеркнуть</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="453"/>
@@ -7954,7 +8858,7 @@ nebo
<message>
<location filename="../widgets/ITextEditWidget.ui" line="465"/>
<source>Bold</source>
- <translation>Tučné</translation>
+ <translation>Жирный</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="468"/>
@@ -7964,7 +8868,7 @@ nebo
<message>
<location filename="../widgets/ITextEditWidget.ui" line="480"/>
<source>Italic</source>
- <translation>Kurzíva</translation>
+ <translation>Курсив</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="483"/>
@@ -7974,18 +8878,18 @@ nebo
<message>
<location filename="../widgets/ITextEditWidget.ui" line="495"/>
<source>Plain</source>
- <translation>Prostý</translation>
+ <translation>Обычный</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="498"/>
<source>Reset the text's format before pasting</source>
- <translation>Nastavit znovu formát textu před vložením</translation>
+ <translation>Сбросить форматирование текста до вставки</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="503"/>
<location filename="../widgets/ITextEditWidget.ui" line="506"/>
<source>Select All</source>
- <translation>Vybrat vše</translation>
+ <translation>Выделить все</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="509"/>
@@ -7996,29 +8900,29 @@ nebo
<location filename="../widgets/ITextEditWidget.ui" line="514"/>
<location filename="../widgets/ITextEditWidget.ui" line="517"/>
<source>Delete</source>
- <translation>Smazat</translation>
+ <translation>Удалить</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="522"/>
<location filename="../widgets/ITextEditWidget.ui" line="525"/>
<source>Reset Font</source>
- <translation>Nastavit písmo znovu</translation>
+ <translation>Сбросить шрифт</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="530"/>
<location filename="../widgets/ITextEditWidget.ui" line="533"/>
<source>Reset Layout</source>
- <translation>Nastavit rozvržení znovu</translation>
+ <translation>Сбросить раскладку</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="545"/>
<source>Normal</source>
- <translation>Normální</translation>
+ <translation>Нормально</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="548"/>
<source>Paste without resetting the text's format</source>
- <translation>Vložit bez znovunastavení formátu textu</translation>
+ <translation>Вставить без сброса форматирования текста</translation>
</message>
</context>
<context>
@@ -8036,22 +8940,23 @@ nebo
<message>
<location filename="../widgets/ITextEditWidgetSelMenu.ui" line="81"/>
<source>U</source>
+ <translatorcomment>???</translatorcomment>
<translation>U</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidgetSelMenu.ui" line="101"/>
<source>Cut</source>
- <translation>Vyjmout</translation>
+ <translation>Вырезать</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidgetSelMenu.ui" line="114"/>
<source>Copy</source>
- <translation>Kopírovat</translation>
+ <translation>Скопировать</translation>
</message>
<message>
<location filename="../widgets/ITextEditWidgetSelMenu.ui" line="127"/>
<source>Paste</source>
- <translation>Vložit</translation>
+ <translation>Вставить</translation>
</message>
</context>
<context>
@@ -8059,75 +8964,77 @@ nebo
<message>
<location filename="../units/ITimeZoneSetup.ui" line="14"/>
<source>Setup Time Zone ...</source>
- <translation>Nastavit časové pásmo...</translation>
+ <translation>Настройка часового пояса...</translation>
</message>
<message>
<location filename="../units/ITimeZoneSetup.ui" line="22"/>
<source>UTC</source>
- <translation>Světový čas (UTC)</translation>
+ <translation>UTC</translation>
</message>
<message>
<location filename="../units/ITimeZoneSetup.ui" line="32"/>
<source>Local</source>
- <translation>Místní</translation>
+ <translation>Местный</translation>
</message>
<message>
<location filename="../units/ITimeZoneSetup.ui" line="42"/>
<source>Automatic</source>
- <translation>Automaticky</translation>
+ <translation>Автоматический</translation>
</message>
<message>
<location filename="../units/ITimeZoneSetup.ui" line="75"/>
<source>Print date/time in </source>
- <translation>Datum/Čas v </translation>
+ <translation>Печатать дату/время в</translation>
</message>
<message>
<location filename="../units/ITimeZoneSetup.ui" line="82"/>
<source>long format, or</source>
- <translation>dlouhém formátu nebo</translation>
+ <translation>длинном формате, или</translation>
</message>
<message>
<location filename="../units/ITimeZoneSetup.ui" line="92"/>
<source>short format</source>
- <translation>v krátkém formátu</translation>
+ <translation>сокращённом формате</translation>
</message>
</context>
<context>
<name>IToolShell</name>
<message>
- <location filename="../tool/IToolShell.cpp" line="45"/>
+ <location filename="../tool/IToolShell.cpp" line="46"/>
<source>Execution of external program `%1` failed: </source>
- <translation>Nepodařilo se spustit vnější program `%1`: </translation>
+ <translation>Не удалось выполнить внешнюю программу `%1`: </translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="49"/>
+ <location filename="../tool/IToolShell.cpp" line="50"/>
<source>Process cannot be started.
</source>
- <translation>Proces nelze spustit.</translation>
+ <translation>Невозможно запустить процесс.</translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="50"/>
+ <location filename="../tool/IToolShell.cpp" line="51"/>
<source>Make sure the required packages are installed, `%1` exists and is executable.
</source>
- <translation>Ujistěte se, že jsou nainstalovány požadované balíčky, že `%1` existuje a je spustitelný.</translation>
+ <translation>Убедитесь, что установлены необходимые пакеты, `%1` существует и разрешено его исполнение.
+</translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="54"/>
+ <location filename="../tool/IToolShell.cpp" line="55"/>
<source>External process crashed.
</source>
- <translation>Vnější proces spadl.</translation>
+ <translation>Крах внешнего процесса.
+</translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="58"/>
+ <location filename="../tool/IToolShell.cpp" line="59"/>
<source>An unknown error occurred.
</source>
- <translation>Vyskytla se neznámá chyba.</translation>
+ <translation>Случилась неизвестная ошибка.</translation>
</message>
<message>
- <location filename="../tool/IToolShell.cpp" line="149"/>
+ <location filename="../tool/IToolShell.cpp" line="172"/>
<source>!!! failed !!!
</source>
- <translation>Nepodařilo se!</translation>
+ <translation>!Не удалось!</translation>
</message>
</context>
<context>
@@ -8136,17 +9043,17 @@ nebo
<location filename="../units/IUnit.cpp" line="728"/>
<location filename="../units/IUnit.cpp" line="734"/>
<source>Error</source>
- <translation>Chyba</translation>
+ <translation>Ошибка</translation>
</message>
<message>
<location filename="../units/IUnit.cpp" line="728"/>
<source>Bad position format. Must be: "[N|S] ddd mm.sss [W|E] ddd mm.sss" or "[N|S] ddd.ddd [W|E] ddd.ddd"</source>
- <translation>Špatný polohový formát. Musí být: "[N|S] ddd mm.sss [W|E] ddd mm.sss" nebo "[N|S] ddd.ddd [W|E] ddd.ddd"</translation>
+ <translation>Неверный формат позиции. Должен быть: "[С|Ю] ddd mm.sss [З|В] ddd mm.sss" или "[С|Ю] ddd.ddd [З|В] ddd.ddd"</translation>
</message>
<message>
<location filename="../units/IUnit.cpp" line="734"/>
<source>Position values out of bounds. </source>
- <translation>Polohy mimo platné hodnoty. </translation>
+ <translation>Значения позиции вне допустимого интервала.</translation>
</message>
</context>
<context>
@@ -8154,27 +9061,27 @@ nebo
<message>
<location filename="../units/IUnitsSetup.ui" line="14"/>
<source>Setup units...</source>
- <translation>Nastavit jednotky...</translation>
+ <translation>Настройка единиц измерения...</translation>
</message>
<message>
- <location filename="../units/IUnitsSetup.ui" line="38"/>
- <source>Metric</source>
- <translation>Metrické</translation>
- </message>
- <message>
- <location filename="../units/IUnitsSetup.ui" line="47"/>
- <source><b>Note:</b> For some GUI elements changing the units will not take effect until you restart QMapShack.</source>
- <translation><b>Poznámka:</b> Některé prvky uživatelského rozhraní změna jednotek neovlivní, dokud QMapShack nespustíte znovu.</translation>
+ <location filename="../units/IUnitsSetup.ui" line="24"/>
+ <source>Nautic</source>
+ <translation>Морские</translation>
</message>
<message>
<location filename="../units/IUnitsSetup.ui" line="31"/>
<source>Imperial</source>
- <translation>Anglické</translation>
+ <translation>Британские</translation>
</message>
<message>
- <location filename="../units/IUnitsSetup.ui" line="24"/>
- <source>Nautic</source>
- <translation>Nautické</translation>
+ <location filename="../units/IUnitsSetup.ui" line="38"/>
+ <source>Metric</source>
+ <translation>Метрические</translation>
+ </message>
+ <message>
+ <location filename="../units/IUnitsSetup.ui" line="47"/>
+ <source><b>Note:</b> For some GUI elements changing the units will not take effect until you restart QMapShack.</source>
+ <translation><b>Примечание:</b> Изменение единиц для некоторых элементов графического пользовательского интерфейса вступят в силу только после перезапуска QMapShack.</translation>
</message>
</context>
<context>
@@ -8182,12 +9089,12 @@ nebo
<message>
<location filename="../helpers/IWptIconDialog.ui" line="14"/>
<source>Icons...</source>
- <translation>Ikony...</translation>
+ <translation>Пиктограммы...</translation>
</message>
<message>
<location filename="../helpers/IWptIconDialog.ui" line="68"/>
<source>External Icons:</source>
- <translation>Vnější symboly:</translation>
+ <translation>Внешние пиктограммы:</translation>
</message>
<message>
<location filename="../helpers/IWptIconDialog.ui" line="75"/>
@@ -8202,7 +9109,7 @@ nebo
<message>
<location filename="../helpers/IWptIconDialog.ui" line="95"/>
<source>All custom icons have to be *.bmp or *.png format.</source>
- <translation>Všechny vlastní symboly musí být ve formátu *.bmp nebo *.png.</translation>
+ <translation>Все пользовательские пиктограммы должны быть в *.bmp или *.png формате.</translation>
</message>
</context>
</TS>
diff --git a/src/main.cpp b/src/main.cpp
index e6bbe07..40c2b05 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,6 +17,7 @@
**********************************************************************************************/
#include "CMainWindow.h"
+#include "CSingleInstanceProxy.h"
#include "setup/IAppSetup.h"
#include "version.h"
@@ -38,6 +39,17 @@ int main(int argc, char ** argv)
env->initLogHandler();
env->initQMapShack();
+ // setup random number generator. currently used for an
+ // unique instance ID.
+ uint seed = QDateTime::currentDateTime().toTime_t();
+ qsrand(seed);
+
+ // setup default proxy
+ QNetworkProxyFactory::setUseSystemConfiguration(true);
+
+ // make sure this is the one and only instance on the system
+ CSingleInstanceProxy s(qlOpts->arguments);
+
QSplashScreen *splash = nullptr;
if (!qlOpts->nosplash)
{
@@ -59,10 +71,6 @@ int main(int argc, char ** argv)
splash->show();
}
- 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 e3b4dae..0f4afd1 100644
--- a/src/map/CMapDraw.cpp
+++ b/src/map/CMapDraw.cpp
@@ -18,6 +18,7 @@
#include "CMainWindow.h"
#include "canvas/CCanvas.h"
+#include "gis/Poi.h"
#include "helpers/CDraw.h"
#include "helpers/CSettings.h"
#include "map/CMapDraw.h"
@@ -146,7 +147,7 @@ void CMapDraw::getInfo(const QPoint& px, QString& str)
if(!item || item->mapfile.isNull())
{
// as all active maps have to be at the top of the list
- // it is ok to break ass soon as the first map with no
+ // it is ok to break as soon as the first map with no
// active files is hit.
break;
}
@@ -173,7 +174,7 @@ void CMapDraw::getToolTip(const QPoint& px, QString& str)
if(!item || item->mapfile.isNull())
{
// as all active maps have to be at the top of the list
- // it is ok to break ass soon as the first map with no
+ // it is ok to break as soon as the first map with no
// active files is hit.
break;
}
@@ -184,6 +185,42 @@ void CMapDraw::getToolTip(const QPoint& px, QString& str)
CMapItem::mutexActiveMaps.unlock();
}
+poi_t CMapDraw::findPOICloseBy(const QPoint& px) const
+{
+ poi_t poi;
+
+ if(isRunning())
+ {
+ return poi;
+ }
+ CMapItem::mutexActiveMaps.lock();
+ if(mapList)
+ {
+ for(int i = 0; i < mapList->count(); i++)
+ {
+ CMapItem * item = mapList->item(i);
+
+ if(!item || item->mapfile.isNull())
+ {
+ // as all active maps have to be at the top of the list
+ // it is ok to break as soon as the first map with no
+ // active files is hit.
+ break;
+ }
+
+ item->mapfile->findPOICloseBy(px, poi);
+ if(poi.pos != NOPOINTF)
+ {
+ // stop at the 1st one found
+ break;
+ }
+ }
+ }
+ CMapItem::mutexActiveMaps.unlock();
+
+ return poi;
+}
+
bool CMapDraw::findPolylineCloseBy(const QPointF& pt1, const QPointF& pt2, qint32 threshold, QPolygonF& polyline)
{
if(isRunning())
@@ -201,7 +238,7 @@ bool CMapDraw::findPolylineCloseBy(const QPointF& pt1, const QPointF& pt2, qint3
if(!item || item->mapfile.isNull())
{
// as all active maps have to be at the top of the list
- // it is ok to break ass soon as the first map with no
+ // it is ok to break as soon as the first map with no
// active files is hit.
break;
}
@@ -401,7 +438,7 @@ void CMapDraw::drawt(IDrawContext::buffer_t& currentBuffer) /* override */
if(!item || item->mapfile.isNull())
{
// as all active maps have to be at the top of the list
- // it is ok to break ass soon as the first map with no
+ // it is ok to break as soon as the first map with no
// active files is hit.
break;
}
diff --git a/src/map/CMapDraw.h b/src/map/CMapDraw.h
index c60b051..eab8b5c 100644
--- a/src/map/CMapDraw.h
+++ b/src/map/CMapDraw.h
@@ -27,6 +27,7 @@ class CCanvas;
class CMapList;
class QSettings;
class CMapItem;
+struct poi_t;
class CMapDraw : public IDrawContext
{
@@ -68,6 +69,8 @@ public:
*/
void getToolTip(const QPoint& px, QString& str);
+ poi_t findPOICloseBy(const QPoint& px) const;
+
/**
@brief Set projection of this draw context
@param proj a proj4 string
diff --git a/src/map/CMapIMG.cpp b/src/map/CMapIMG.cpp
index 214a5b3..56e75ec 100644
--- a/src/map/CMapIMG.cpp
+++ b/src/map/CMapIMG.cpp
@@ -18,6 +18,7 @@
#include "CMainWindow.h"
#include "canvas/CCanvas.h"
+#include "gis/Poi.h"
#include "helpers/CDraw.h"
#include "helpers/CFileExt.h"
#include "helpers/CProgressDialog.h"
@@ -1085,95 +1086,97 @@ void CMapIMG::processPrimaryMapData()
quint8 CMapIMG::scale2bits(const QPointF& scale)
{
+ qint32 bits = 24;
if(scale.x() >= 70000.0)
{
- return 2;
+ bits = 2;
}
- if(scale.x() >= 50000.0)
+ else if(scale.x() >= 50000.0)
{
- return 3;
+ bits = 3;
}
- if(scale.x() >= 30000.0)
+ else if(scale.x() >= 30000.0)
{
- return 4;
+ bits = 4;
}
- if(scale.x() >= 20000.0)
+ else if(scale.x() >= 20000.0)
{
- return 5;
+ bits = 5;
}
- if(scale.x() >= 15000.0)
+ else if(scale.x() >= 15000.0)
{
- return 6;
+ bits = 6;
}
- if(scale.x() >= 10000.0)
+ else if(scale.x() >= 10000.0)
{
- return 7;
+ bits = 7;
}
- if(scale.x() >= 7000.0)
+ else if(scale.x() >= 7000.0)
{
- return 8;
+ bits = 8;
}
- if(scale.x() >= 5000.0)
+ else if(scale.x() >= 5000.0)
{
- return 9;
+ bits = 9;
}
- if(scale.x() >= 3000.0)
+ else if(scale.x() >= 3000.0)
{
- return 10;
+ bits = 10;
}
- if(scale.x() >= 2000.0)
+ else if(scale.x() >= 2000.0)
{
- return 11;
+ bits = 11;
}
- if(scale.x() >= 1500.0)
+ else if(scale.x() >= 1500.0)
{
- return 12;
+ bits = 12;
}
- if(scale.x() >= 1000.0)
+ else if(scale.x() >= 1000.0)
{
- return 13;
+ bits = 13;
}
- if(scale.x() >= 700.0)
+ else if(scale.x() >= 700.0)
{
- return 14;
+ bits = 14;
}
- if(scale.x() >= 500.0)
+ else if(scale.x() >= 500.0)
{
- return 15;
+ bits = 15;
}
- if(scale.x() >= 300.0)
+ else if(scale.x() >= 300.0)
{
- return 16;
+ bits = 16;
}
- if(scale.x() >= 200.0)
+ else if(scale.x() >= 200.0)
{
- return 17;
+ bits = 17;
}
- if(scale.x() >= 100.0)
+ else if(scale.x() >= 100.0)
{
- return 18;
+ bits = 18;
}
- if(scale.x() >= 70.0)
+ else if(scale.x() >= 70.0)
{
- return 19;
+ bits = 19;
}
- if(scale.x() >= 30.0)
+ else if(scale.x() >= 30.0)
{
- return 20;
+ bits = 20;
}
- if(scale.x() >= 15.0)
+ else if(scale.x() >= 15.0)
{
- return 21;
+ bits = 21;
}
- if(scale.x() >= 7.0)
+ else if(scale.x() >= 7.0)
{
- return 22;
+ bits = 22;
}
- if(scale.x() >= 3.0)
+ else if(scale.x() >= 3.0)
{
- return 23;
+ bits = 23;
}
- return 24;
+
+ return qMax(2, qMin(24, bits + getAdjustDetailLevel()));
}
void CMapIMG::draw(IDrawContext::buffer_t& buf) /* override */
@@ -1202,14 +1205,6 @@ void CMapIMG::draw(IDrawContext::buffer_t& buf) /* override */
p.setBrush(Qt::NoBrush);
quint8 bits = scale2bits(bufferScale);
-// if((zoomidx >= 25) && (detailsFineTune < 0))
-// {
-// bits += detailsFineTune + (zoomidx - 25);
-// }
-// else
-// {
-// bits += detailsFineTune;
-// }
QVector<map_level_t>::const_iterator maplevel = maplevels.constEnd();
do
@@ -1252,7 +1247,17 @@ void CMapIMG::draw(IDrawContext::buffer_t& buf) /* override */
p.restore();
return;
}
- loadVisibleData(false, polygons, polylines, points, pois, maplevel->level, viewport, p);
+
+ try
+ {
+ loadVisibleData(false, polygons, polylines, points, pois, maplevel->level, viewport, p);
+ }
+ catch(std::bad_alloc)
+ {
+ qWarning() << "GarminIMG: Allocation error. Abort map rendering.";
+ p.restore();
+ return;
+ }
if(map->needsRedraw())
{
@@ -2241,7 +2246,7 @@ void CMapIMG::drawText(QPainter& p)
}
}
-void CMapIMG::getToolTip(const QPoint& px, QString& infotext) /* override */
+void CMapIMG::getToolTip(const QPoint& px, QString& infotext) const /* override */
{
QString str;
@@ -2293,7 +2298,39 @@ void CMapIMG::getToolTip(const QPoint& px, QString& infotext) /* override */
}
}
-void CMapIMG::getInfoPoints(const pointtype_t &points, const QPoint& pt, QMultiMap<QString, QString>& dict)
+void CMapIMG::findPOICloseBy(const QPoint& pt, poi_t& poi) const /*override;*/
+{
+ for(auto &list : {points, pois})
+ {
+ for(const CGarminPoint &point : list)
+ {
+ QPoint x = pt - QPoint(point.pos.x(), point.pos.y());
+ if(x.manhattanLength() < 10)
+ {
+ poi.pos = point.pos;
+ if(!point.labels.isEmpty())
+ {
+ poi.name = point.labels.first();
+ poi.desc = point.getLabelText();
+ }
+ else
+ {
+ if(pointProperties.contains(point.type))
+ {
+ poi.name = pointProperties[point.type].strings[selectedLanguage != NOIDX ? selectedLanguage : 0];
+ }
+ else
+ {
+ poi.name = QString(" (%1)").arg(point.type, 2, 16, QChar('0'));
+ }
+ }
+ return;
+ }
+ }
+ }
+}
+
+void CMapIMG::getInfoPoints(const pointtype_t &points, const QPoint& pt, QMultiMap<QString, QString>& dict) const
{
for(const CGarminPoint &point : points)
{
@@ -2319,7 +2356,7 @@ void CMapIMG::getInfoPoints(const pointtype_t &points, const QPoint& pt, QMultiM
}
}
-void CMapIMG::getInfoPolylines(const QPoint &pt, QMultiMap<QString, QString>& dict)
+void CMapIMG::getInfoPolylines(const QPoint &pt, QMultiMap<QString, QString>& dict) const
{
projXY p1, p2; // the two points of the polyline close to pt
qreal u; // ratio u the tangent point will divide d_p1_p2
@@ -2409,7 +2446,7 @@ void CMapIMG::getInfoPolylines(const QPoint &pt, QMultiMap<QString, QString>& di
// pt = resPt.toPoint();
}
-void CMapIMG::getInfoPolygons(const QPoint& pt, QMultiMap<QString, QString>& dict)
+void CMapIMG::getInfoPolygons(const QPoint& pt, QMultiMap<QString, QString>& dict) const
{
projXY p1, p2; // the two points of the polyline close to pt
const qreal x = pt.x();
diff --git a/src/map/CMapIMG.h b/src/map/CMapIMG.h
index 0e98e85..b3a7fa1 100644
--- a/src/map/CMapIMG.h
+++ b/src/map/CMapIMG.h
@@ -123,7 +123,9 @@ public:
void draw(IDrawContext::buffer_t& buf) override;
- void getToolTip(const QPoint& px, QString& infotext) override;
+ void getToolTip(const QPoint& px, QString& infotext) const override;
+
+ void findPOICloseBy(const QPoint&, poi_t& poi) const override;
/**
@brief Find a matching street polyline
@@ -159,7 +161,7 @@ private:
};
- static quint8 scale2bits(const QPointF &scale);
+ quint8 scale2bits(const QPointF &scale);
void setupTyp();
void readBasics();
void readSubfileBasics(subfile_desc_t& subfile, CFileExt &file);
@@ -181,9 +183,9 @@ private:
void collectText(const CGarminPolygon& item, const QPolygonF& line, const QFont& font, const QFontMetricsF& metrics, qint32 lineWidth);
- void getInfoPoints(const pointtype_t &points, const QPoint& pt, QMultiMap<QString, QString>& dict);
- void getInfoPolylines(const QPoint& pt, QMultiMap<QString, QString>& dict);
- void getInfoPolygons(const QPoint& pt, QMultiMap<QString, QString>& dict);
+ void getInfoPoints(const pointtype_t &points, const QPoint& pt, QMultiMap<QString, QString>& dict) const;
+ void getInfoPolylines(const QPoint& pt, QMultiMap<QString, QString>& dict) const;
+ void getInfoPolygons(const QPoint& pt, QMultiMap<QString, QString>& dict) const;
#pragma pack(1)
// Garmin IMG file header structure, to the start of the FAT blocks
diff --git a/src/map/CMapPropSetup.cpp b/src/map/CMapPropSetup.cpp
index 558f6d0..c8c2704 100644
--- a/src/map/CMapPropSetup.cpp
+++ b/src/map/CMapPropSetup.cpp
@@ -41,9 +41,11 @@ CMapPropSetup::CMapPropSetup(IMap * mapfile, CMapDraw *map)
connect(checkPolygons, &QCheckBox::toggled, mapfile, &IMap::slotSetShowPolygons);
connect(checkPolylines, &QCheckBox::toggled, mapfile, &IMap::slotSetShowPolylines);
connect(checkPoints, &QCheckBox::toggled, mapfile, &IMap::slotSetShowPOIs);
+ connect(spinAdjustDetails, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), mapfile, &IMap::slotSetAdjustDetailLevel);
connect(checkPolygons, &QCheckBox::clicked, map, &CMapDraw::emitSigCanvasUpdate);
connect(checkPolylines, &QCheckBox::clicked, map, &CMapDraw::emitSigCanvasUpdate);
connect(checkPoints, &QCheckBox::clicked, map, &CMapDraw::emitSigCanvasUpdate);
+ connect(spinAdjustDetails, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), map, &CMapDraw::emitSigCanvasUpdate);
connect(spinCacheSize, static_cast<void (QSpinBox::*)(int) >(&QSpinBox::valueChanged), mapfile, &IMap::slotSetCacheSize);
connect(spinCacheExpiration, static_cast<void (QSpinBox::*)(int) >(&QSpinBox::valueChanged), mapfile, &IMap::slotSetCacheExpiration);
@@ -89,6 +91,7 @@ void CMapPropSetup::slotPropertiesChanged() /* override */
checkPolygons->setChecked(mapfile->getShowPolygons());
checkPolylines->setChecked(mapfile->getShowPolylines());
checkPoints->setChecked(mapfile->getShowPOIs());
+ spinAdjustDetails->setValue(mapfile->getAdjustDetailLevel());
// streaming map properties
QString lbl = mapfile->getCachePath();
diff --git a/src/map/CMapVRT.cpp b/src/map/CMapVRT.cpp
index a6df58a..f9520d7 100644
--- a/src/map/CMapVRT.cpp
+++ b/src/map/CMapVRT.cpp
@@ -91,12 +91,19 @@ CMapVRT::CMapVRT(const QString &filename, CMapDraw *parent)
int success = 0;
qreal idx = pBand->GetNoDataValue(&success);
-
if(success)
{
- QColor tmp(colortable[idx]);
- tmp.setAlpha(0);
- colortable[idx] = tmp.rgba();
+ if((idx > 0) && (idx < colortable.size()))
+ {
+ QColor tmp(colortable[idx]);
+ tmp.setAlpha(0);
+ colortable[idx] = tmp.rgba();
+ }
+ else
+ {
+ qDebug() << "Index for no data value is out of bound";
+ return;
+ }
}
}
diff --git a/src/map/CMapWMTS.cpp b/src/map/CMapWMTS.cpp
index c280381..34ff20d 100644
--- a/src/map/CMapWMTS.cpp
+++ b/src/map/CMapWMTS.cpp
@@ -481,7 +481,6 @@ void CMapWMTS::draw(IDrawContext::buffer_t& buf) /* override */
p.setOpacity(getOpacity()/100.0);
p.translate(-pp);
-
// calculate maximum viewport
qreal x1 = buf.ref1.x() < buf.ref4.x() ? buf.ref1.x() : buf.ref4.x();
qreal y1 = buf.ref1.y() > buf.ref2.y() ? buf.ref1.y() : buf.ref2.y();
diff --git a/src/map/IMap.cpp b/src/map/IMap.cpp
index 999ca18..077ce8a 100644
--- a/src/map/IMap.cpp
+++ b/src/map/IMap.cpp
@@ -47,6 +47,7 @@ void IMap::saveConfig(QSettings& cfg) /* override */
cfg.setValue("showPolygons", getShowPolygons());
cfg.setValue("showPolylines", getShowPolylines());
cfg.setValue("showPOIs", getShowPOIs());
+ cfg.setValue("adjustDetailLevel", getAdjustDetailLevel());
}
if(hasFeatureTileCache())
@@ -60,10 +61,11 @@ void IMap::loadConfig(QSettings& cfg) /* override */
{
IDrawObject::loadConfig(cfg);
- slotSetShowPolygons (cfg.value("showPolygons", getShowPolygons() ).toBool());
- slotSetShowPolylines (cfg.value("showPolylines", getShowPolylines() ).toBool());
- slotSetShowPOIs (cfg.value("showPOIs", getShowPOIs() ).toBool());
- slotSetCacheSize (cfg.value("cacheSizeMB", getCacheSize() ).toInt());
+ slotSetShowPolygons(cfg.value("showPolygons", getShowPolygons()).toBool());
+ slotSetShowPolylines(cfg.value("showPolylines", getShowPolylines()).toBool());
+ slotSetShowPOIs(cfg.value("showPOIs", getShowPOIs()).toBool());
+ slotSetAdjustDetailLevel(cfg.value("adjustDetailLevel", getAdjustDetailLevel()).toInt());
+ slotSetCacheSize(cfg.value("cacheSizeMB", getCacheSize()).toInt());
slotSetCacheExpiration(cfg.value("cacheExpiration", getCacheExpiration()).toInt());
}
@@ -97,31 +99,13 @@ void IMap::convertM2Rad(QPointF &p) const
}
-void IMap::drawTile(const QImage& img, QPolygonF& l, QPainter& p)
+bool IMap::findPolylineCloseBy(const QPointF&, const QPointF&, qint32, QPolygonF&)
{
- 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));
-
- // 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;
-
- // finally translate, scale, rotate and draw tile
- p.save();
- p.translate(l[0]);
- p.scale(w/img.width(), h/img.height());
- p.rotate(a);
- p.drawImage(0,0,img);
- p.restore();
+ return false;
}
-bool IMap::findPolylineCloseBy(const QPointF&, const QPointF&, qint32, QPolygonF&)
+void IMap::drawTile(const QImage& img, QPolygonF& l, QPainter& p)
{
- return false;
+ drawTileLQ(img, l, p, *map, pjsrc, pjtar);
}
+
diff --git a/src/map/IMap.h b/src/map/IMap.h
index 1d31058..e73ca1e 100644
--- a/src/map/IMap.h
+++ b/src/map/IMap.h
@@ -19,7 +19,6 @@
#ifndef IMAP_H
#define IMAP_H
-#include "canvas/IDrawContext.h"
#include "canvas/IDrawObject.h"
#include <QImage>
#include <QMutex>
@@ -28,6 +27,7 @@
class CMapDraw;
class IMapProp;
+struct poi_t;
class IMap : public IDrawObject
{
@@ -71,7 +71,9 @@ public:
virtual void getInfo(const QPoint&, QString&) {}
- virtual void getToolTip(const QPoint&, QString&) {}
+ virtual void getToolTip(const QPoint&, QString&) const {}
+
+ virtual void findPOICloseBy(const QPoint&, poi_t&) const {}
/**
@brief Return copyright notice if any
@@ -129,6 +131,10 @@ public:
return cacheExpiration;
}
+ qint32 getAdjustDetailLevel() const
+ {
+ return adjustDetailLevel;
+ }
/**
@brief Find a matching street polyline
@@ -174,11 +180,22 @@ public slots:
configureCache();
}
+ void slotSetAdjustDetailLevel(qint32 level)
+ {
+ adjustDetailLevel = level;
+ }
protected:
void convertRad2M(QPointF &p) const;
void convertM2Rad(QPointF &p) const;
+ /**
+ @brief Detect what reprojection is needed and select the correct handler
+
+ This has to be called prior to the loop that calls drawTile();
+
+ */
+ void detectTileDrawMode(const IDrawContext::buffer_t &buf);
/**
@brief Reproject (translate, rotate, scale) tile before drawing it.
@@ -188,6 +205,8 @@ protected:
*/
void drawTile(const QImage& img, QPolygonF& l, QPainter& p);
+
+protected:
/// the drawcontext this map belongs to
CMapDraw * map;
@@ -218,6 +237,7 @@ protected:
bool showPolygons = true; //< vector maps only: hide/show polygons
bool showPolylines = true; //< vector maps only: hide/show polylines
bool showPOIs = true; //< vector maps only: hide/show point of interest
+ qint32 adjustDetailLevel = 0; //< vector maps only: alter threshold to show deatils.
QString cachePath; //< streaming map only: path to cached tiles
qint32 cacheSizeMB = 100; //< streaming map only: maximum size of all tiles in cache [MByte]
diff --git a/src/map/IMapPropSetup.ui b/src/map/IMapPropSetup.ui
index 7268455..ced3b70 100644
--- a/src/map/IMapPropSetup.ui
+++ b/src/map/IMapPropSetup.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>403</width>
- <height>226</height>
+ <height>330</height>
</rect>
</property>
<property name="windowTitle">
@@ -115,7 +115,7 @@
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <layout class="QVBoxLayout" name="verticalLayout_4">
<property name="spacing">
<number>3</number>
</property>
@@ -132,25 +132,56 @@
<number>0</number>
</property>
<item>
- <widget class="QCheckBox" name="checkPolygons">
- <property name="text">
- <string>Areas</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="checkPolylines">
- <property name="text">
- <string>Lines</string>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QCheckBox" name="checkPolygons">
+ <property name="text">
+ <string>Areas</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="checkPolylines">
+ <property name="text">
+ <string>Lines</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="checkPoints">
+ <property name="text">
+ <string>Points</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
<item>
- <widget class="QCheckBox" name="checkPoints">
- <property name="text">
- <string>Points</string>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QLabel" name="label_4">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Details</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="spinAdjustDetails">
+ <property name="minimum">
+ <number>-5</number>
+ </property>
+ <property name="maximum">
+ <number>5</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
</layout>
</widget>
diff --git a/src/mouse/CMouseMoveWpt.cpp b/src/mouse/CMouseMoveWpt.cpp
index d0d1ecb..5229810 100644
--- a/src/mouse/CMouseMoveWpt.cpp
+++ b/src/mouse/CMouseMoveWpt.cpp
@@ -36,6 +36,7 @@ CMouseMoveWpt::CMouseMoveWpt(CGisItemWpt &wpt, CGisDraw * gis, CCanvas *parent)
key = wpt.getKey();
icon = getWptIconByName(wpt.getIconName(), focus);
origPos = wpt.getPosition() * DEG_TO_RAD;
+ newPos = wpt.getPosition() * DEG_TO_RAD;
}
CMouseMoveWpt::~CMouseMoveWpt()
@@ -84,13 +85,6 @@ void CMouseMoveWpt::draw(QPainter& p, CCanvas::redraw_e, const QRect&)
p.drawPixmap(p2 - focus, icon);
}
-void CMouseMoveWpt::slotPanCanvas()
-{
- IMouse::slotPanCanvas();
-
- newPos = point;
- gis->convertPx2Rad(newPos);
-}
void CMouseMoveWpt::mousePressEvent(QMouseEvent * e)
{
@@ -102,6 +96,38 @@ void CMouseMoveWpt::mousePressEvent(QMouseEvent * e)
}
else if(e->button() == Qt::LeftButton)
{
+ mapMove = true;
+ }
+}
+
+void CMouseMoveWpt::mouseMoveEvent(QMouseEvent * e)
+{
+ point = e->pos();
+
+ if(mapMove)
+ {
+ if(point != lastPoint)
+ {
+ QPoint delta = point - lastPoint;
+ canvas->moveMap(delta);
+ mapDidMove = true;
+ }
+ }
+ else
+ {
+ newPos = point;
+ gis->convertPx2Rad(newPos);
+ }
+
+ lastPoint = point;
+ canvas->update();
+}
+
+void CMouseMoveWpt::mouseReleaseEvent(QMouseEvent *e)
+{
+ point = e->pos();
+ if(!mapDidMove && (e->button() == Qt::LeftButton))
+ {
QMutexLocker lock(&IGisItem::mutexItems);
QPointF pos = e->pos();
@@ -114,20 +140,9 @@ void CMouseMoveWpt::mousePressEvent(QMouseEvent * e)
canvas->resetMouse();
canvas->slotTriggerCompleteUpdate(CCanvas::eRedrawGis);
}
-}
-void CMouseMoveWpt::mouseMoveEvent(QMouseEvent * e)
-{
- point = e->pos();
- newPos = point;
- gis->convertPx2Rad(newPos);
-
- panCanvas(point);
-}
-
-void CMouseMoveWpt::mouseReleaseEvent(QMouseEvent *e)
-{
- point = e->pos();
+ mapMove = false;
+ mapDidMove = false;
}
void CMouseMoveWpt::wheelEvent(QWheelEvent*)
diff --git a/src/mouse/CMouseMoveWpt.h b/src/mouse/CMouseMoveWpt.h
index 6d8ba3c..238e20d 100644
--- a/src/mouse/CMouseMoveWpt.h
+++ b/src/mouse/CMouseMoveWpt.h
@@ -40,15 +40,17 @@ public:
void mouseReleaseEvent(QMouseEvent *e) override;
void wheelEvent(QWheelEvent *e) override;
-protected slots:
- void slotPanCanvas() override;
-
private:
IGisItem::key_t key;
QPointF origPos;
QPointF newPos;
QPointF focus;
QPixmap icon;
+
+ bool mapMove = false;
+ bool mapDidMove = false;
+
+ QPoint lastPoint;
};
#endif //CMOUSEMOVEWPT_H
diff --git a/src/mouse/CMouseNormal.cpp b/src/mouse/CMouseNormal.cpp
index 18d0c8f..135b7ac 100644
--- a/src/mouse/CMouseNormal.cpp
+++ b/src/mouse/CMouseNormal.cpp
@@ -36,6 +36,7 @@ CMouseNormal::CMouseNormal(CGisDraw *gis, CCanvas *canvas)
screenUnclutter = new CScrOptUnclutter(this);
menu = new QMenu(canvas);
+ actionPoiAsWpt = menu->addAction(QIcon("://icons/32x32/AddWpt.png"), tr("Add POI as Waypoint"), this, SLOT(slotAddPoi()));
menu->addAction(QIcon("://icons/32x32/AddWpt.png"), tr("Add Waypoint"), this, SLOT(slotAddWpt()));
menu->addAction(QIcon("://icons/32x32/AddTrk.png"), tr("Add Track"), this, SLOT(slotAddTrk()));
menu->addAction(QIcon("://icons/32x32/AddRte.png"), tr("Add Route"), this, SLOT(slotAddRte()));
@@ -71,6 +72,7 @@ void CMouseNormal::mousePressEvent(QMouseEvent * e)
if(e->button() == Qt::LeftButton)
{
lastPos = e->pos();
+ firstPos = lastPos;
// start to block map moving when a previous click
// has triggered a selection of any kind
mapMove = (stateItemSel < eStateNoMapMovePossible);
@@ -79,6 +81,8 @@ void CMouseNormal::mousePressEvent(QMouseEvent * e)
else if(e->button() == Qt::RightButton)
{
QPoint p = canvas->mapToGlobal(point);
+
+ actionPoiAsWpt->setEnabled(curPOI.pos != NOPOINTF);
menu->exec(p);
}
}
@@ -95,7 +99,7 @@ void CMouseNormal::mouseMoveEvent(QMouseEvent * e)
if(mapMove)
{
- if(point != lastPos)
+ if((point - firstPos).manhattanLength() >= 4)
{
QPoint delta = point - lastPos;
canvas->moveMap(delta);
@@ -140,6 +144,8 @@ void CMouseNormal::mouseMoveEvent(QMouseEvent * e)
;
}
+ curPOI = canvas->findPOICloseBy(point);
+
canvas->displayInfo(point);
canvas->update();
}
@@ -282,6 +288,11 @@ void CMouseNormal::draw(QPainter& p, CCanvas::redraw_e needsRedraw, const QRect
case eStateHooverSingle:
case eStateHooverMultiple:
{
+ if(curPOI.pos != NOPOINTF)
+ {
+ p.drawImage(curPOI.pos - QPointF(31,31), QImage("://cursors/wptHighlightBlue.png"));
+ }
+
/*
Collect and draw items close to the last mouse position in the draw method.
@@ -344,6 +355,15 @@ void CMouseNormal::draw(QPainter& p, CCanvas::redraw_e needsRedraw, const QRect
}
}
+void CMouseNormal::slotAddPoi() const
+{
+ QPointF pt = curPOI.pos;
+ gis->convertPx2Rad(pt);
+ pt *= RAD_TO_DEG;
+
+ CGisWidget::self().addWptByPos(pt, curPOI.name, curPOI.desc);
+ canvas->slotTriggerCompleteUpdate(CCanvas::eRedrawGis);
+}
void CMouseNormal::slotAddWpt() const
{
diff --git a/src/mouse/CMouseNormal.h b/src/mouse/CMouseNormal.h
index 28a86f3..eda68bf 100644
--- a/src/mouse/CMouseNormal.h
+++ b/src/mouse/CMouseNormal.h
@@ -19,7 +19,8 @@
#ifndef CMOUSENORMAL_H
#define CMOUSENORMAL_H
-#include "IMouse.h"
+#include "gis/Poi.h"
+#include "mouse/IMouse.h"
#include <QPixmap>
#include <QPointer>
@@ -47,6 +48,7 @@ public:
void keyPressEvent(QKeyEvent * e) override;
private slots:
+ void slotAddPoi() const;
void slotAddWpt() const;
void slotAddTrk() const;
void slotAddRte() const;
@@ -69,6 +71,8 @@ protected:
bool mapDidMove = false;
/// always the last seen mouse cursor position
QPoint lastPos;
+ /// the last mouse press event position
+ QPoint firstPos;
enum item_selection_states_e
{
@@ -86,6 +90,9 @@ protected:
QPointer<IScrOpt> screenItemOption;
QMenu * menu;
+ QAction * actionPoiAsWpt;
+
+ poi_t curPOI;
};
#endif //CMOUSENORMAL_H
diff --git a/src/mouse/CMouseRangeTrk.cpp b/src/mouse/CMouseRangeTrk.cpp
index 7c14cbc..8332aa9 100644
--- a/src/mouse/CMouseRangeTrk.cpp
+++ b/src/mouse/CMouseRangeTrk.cpp
@@ -58,7 +58,7 @@ void CMouseRangeTrk::draw(QPainter& p, CCanvas::redraw_e, const QRect &)
if(trk)
{
trk->drawRange(p);
- if(anchor != NOPOINTF)
+ if(!mapDidMove && (anchor != NOPOINTF))
{
p.setPen(Qt::darkBlue);
p.setBrush(QColor(255,255,255,200));
@@ -86,46 +86,47 @@ void CMouseRangeTrk::mousePressEvent(QMouseEvent * e)
}
else if(e->button() == Qt::LeftButton)
{
+ mapMove = true;
+ firstPoint = point;
+ }
+}
+
+void CMouseRangeTrk::mouseMoveEvent(QMouseEvent * e)
+{
+ point = e->pos();
+
+ if(mapMove)
+ {
+ if((point - firstPoint).manhattanLength() >= 4)
+ {
+ QPoint delta = point - lastPoint;
+ canvas->moveMap(delta);
+ mapDidMove = true;
+ }
+ }
+ else
+ {
switch(state)
{
case eStateIdle:
{
CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(key));
- if(trk != nullptr && anchor != NOPOINTF)
+ if(trk != nullptr)
{
- anchor = trk->setMouseFocusByPoint(point, CGisItemTrk::eFocusMouseClick, "CMouseRangeTrk");
- state = eStateSelectRange;
+ anchor = trk->setMouseFocusByPoint(point, CGisItemTrk::eFocusMouseMove, "CMouseRangeTrk");
canvas->update();
}
- else
- {
- state = eStateMoveMap;
- }
break;
}
case eStateSelectRange:
{
CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(key));
- if(trk != nullptr && anchor != NOPOINTF)
+ if(trk != nullptr)
{
- QPointF pt = trk->setMouseFocusByPoint(point, CGisItemTrk::eFocusMouseClick, "CMouseRangeTrk");
- scrOptRange = new CScrOptRangeTrk(pt, trk, this);
- connect(scrOptRange->toolHidePoints, &QToolButton::clicked, this, &CMouseRangeTrk::slotHidePoints);
- connect(scrOptRange->toolShowPoints, &QToolButton::clicked, this, &CMouseRangeTrk::slotShowPoints);
- connect(scrOptRange.data(), &CScrOptRangeTrk::activitySelected, this, &CMouseRangeTrk::slotActivity);
- connect(scrOptRange->toolCopy, &QToolButton::clicked, this, &CMouseRangeTrk::slotCopy);
-
- state = eStateRangeSelected;
+ anchor = trk->setMouseFocusByPoint(point, CGisItemTrk::eFocusMouseMove, "CMouseRangeTrk");
canvas->update();
}
-
- break;
- }
-
- case eStateRangeSelected:
- {
- resetState();
break;
}
@@ -133,51 +134,6 @@ void CMouseRangeTrk::mousePressEvent(QMouseEvent * e)
;
}
}
-}
-
-void CMouseRangeTrk::mouseMoveEvent(QMouseEvent * e)
-{
- point = e->pos();
-
- switch(state)
- {
- case eStateIdle:
- {
- CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(key));
- if(trk != nullptr)
- {
- anchor = trk->setMouseFocusByPoint(point, CGisItemTrk::eFocusMouseMove, "CMouseRangeTrk");
- canvas->update();
- }
- break;
- }
-
- case eStateMoveMap:
- {
- if(point != lastPoint)
- {
- QPoint delta = point - lastPoint;
- canvas->moveMap(delta);
- }
- break;
- }
-
- case eStateSelectRange:
- {
- CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(key));
- if(trk != nullptr)
- {
- anchor = trk->setMouseFocusByPoint(point, CGisItemTrk::eFocusMouseMove, "CMouseRangeTrk");
- canvas->update();
- }
- panCanvas(point);
- break;
- }
-
- default:
- ;
- }
-
lastPoint = point;
}
@@ -185,10 +141,51 @@ void CMouseRangeTrk::mouseReleaseEvent(QMouseEvent *e)
{
if(e->button() == Qt::LeftButton)
{
- if(state == eStateMoveMap)
+ if(!mapDidMove)
{
- state = eStateIdle;
+ switch(state)
+ {
+ case eStateIdle:
+ {
+ CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(key));
+ if(trk != nullptr && anchor != NOPOINTF)
+ {
+ anchor = trk->setMouseFocusByPoint(point, CGisItemTrk::eFocusMouseClick, "CMouseRangeTrk");
+ state = eStateSelectRange;
+ canvas->update();
+ }
+ break;
+ }
+
+
+ case eStateSelectRange:
+ {
+ CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(key));
+ if(trk != nullptr && anchor != NOPOINTF)
+ {
+ QPointF pt = trk->setMouseFocusByPoint(point, CGisItemTrk::eFocusMouseClick, "CMouseRangeTrk");
+ scrOptRange = new CScrOptRangeTrk(pt, trk, this);
+ connect(scrOptRange->toolHidePoints, &QToolButton::clicked, this, &CMouseRangeTrk::slotHidePoints);
+ connect(scrOptRange->toolShowPoints, &QToolButton::clicked, this, &CMouseRangeTrk::slotShowPoints);
+ connect(scrOptRange.data(), &CScrOptRangeTrk::activitySelected, this, &CMouseRangeTrk::slotActivity);
+ connect(scrOptRange->toolCopy, &QToolButton::clicked, this, &CMouseRangeTrk::slotCopy);
+
+ state = eStateRangeSelected;
+ canvas->update();
+ }
+
+ break;
+ }
+
+ case eStateRangeSelected:
+ {
+ resetState();
+ break;
+ }
+ }
}
+ mapDidMove = false;
+ mapMove = false;
}
}
diff --git a/src/mouse/CMouseRangeTrk.h b/src/mouse/CMouseRangeTrk.h
index bf3a0cf..85ff78c 100644
--- a/src/mouse/CMouseRangeTrk.h
+++ b/src/mouse/CMouseRangeTrk.h
@@ -55,16 +55,17 @@ private:
enum state_e
{
eStateIdle
- ,eStateMoveMap
,eStateSelectRange
,eStateRangeSelected
};
- state_e state = eStateIdle;
-
- QPointF anchor = NOPOINTF;
+ bool mapMove = false;
+ bool mapDidMove = false;
+ state_e state = eStateIdle;
+ QPointF anchor = NOPOINTF;
QPoint lastPoint;
+ QPoint firstPoint;
QPointer<CScrOptRangeTrk> scrOptRange;
};
diff --git a/src/mouse/CMouseSelect.cpp b/src/mouse/CMouseSelect.cpp
index 8cf1e4c..96d897b 100644
--- a/src/mouse/CMouseSelect.cpp
+++ b/src/mouse/CMouseSelect.cpp
@@ -18,6 +18,7 @@
#include "gis/CGisDraw.h"
#include "gis/CGisWidget.h"
+#include "helpers/CWptIconDialog.h"
#include "mouse/CMouseSelect.h"
#include "mouse/CScrOptSelect.h"
@@ -35,6 +36,7 @@ CMouseSelect::CMouseSelect(CGisDraw *gis, CCanvas *parent)
connect(scrOptSelect->toolCopy, &QToolButton::clicked, this, &CMouseSelect::slotCopy);
connect(scrOptSelect->toolRoute, &QToolButton::clicked, this, &CMouseSelect::slotRoute);
+ connect(scrOptSelect->toolSymWpt, &QToolButton::clicked, this, &CMouseSelect::slotSymWpt);
connect(scrOptSelect->toolCombineTracks, &QToolButton::clicked, this, &CMouseSelect::slotCombine);
connect(scrOptSelect->toolDelete, &QToolButton::clicked, this, &CMouseSelect::slotDelete);
}
@@ -121,6 +123,7 @@ void CMouseSelect::findItems(QList<IGisItem*>& items)
}
scrOptSelect->frameFunction->setDisabled(items.isEmpty());
+ scrOptSelect->toolSymWpt->setEnabled(cntWpt);
scrOptSelect->toolRoute->setEnabled(cntWpt > 1);
scrOptSelect->toolCombineTracks->setEnabled(cntTrk > 1);
}
@@ -168,3 +171,16 @@ void CMouseSelect::slotCombine() const
CGisWidget::self().combineTrkByKey(itemKeys, itemKeys);
canvas->resetMouse();
}
+
+void CMouseSelect::slotSymWpt() const
+{
+ QToolButton tb;
+ CWptIconDialog dlg(&tb);
+ if(dlg.exec() == QDialog::Rejected)
+ {
+ return;
+ }
+
+ CGisWidget::self().changeWptSymByKey(itemKeys, tb.objectName());
+ canvas->resetMouse();
+}
diff --git a/src/mouse/CMouseSelect.h b/src/mouse/CMouseSelect.h
index 0b0a416..5df628d 100644
--- a/src/mouse/CMouseSelect.h
+++ b/src/mouse/CMouseSelect.h
@@ -39,6 +39,7 @@ public:
private slots:
void slotCopy() const;
void slotRoute() const;
+ void slotSymWpt() const;
void slotCombine() const;
void slotDelete() const;
diff --git a/src/mouse/IMouse.cpp b/src/mouse/IMouse.cpp
index cd3efe3..0ed46ec 100644
--- a/src/mouse/IMouse.cpp
+++ b/src/mouse/IMouse.cpp
@@ -27,11 +27,6 @@ IMouse::IMouse(CGisDraw *gis, CCanvas *canvas)
, gis(gis)
, canvas(canvas)
{
- timer = new QTimer(this);
- timer->setSingleShot(true);
- timer->setInterval(50);
-
- connect(timer, &QTimer::timeout, this, &IMouse::slotPanCanvas);
}
IMouse::~IMouse()
@@ -41,49 +36,6 @@ IMouse::~IMouse()
void IMouse::setMouseTracking(bool enabled)
{
canvas->setMouseTracking(enabled);
- if(!enabled)
- {
- timer->stop();
- }
-}
-
-void IMouse::slotPanCanvas()
-{
- panCanvas(point);
}
-#define SENSITIVE_FRAME 100
-#define DAMPING_FACTOR 0.25
-void IMouse::panCanvas(const QPoint& pos)
-{
- if(pos.x() < SENSITIVE_FRAME)
- {
- int d = (SENSITIVE_FRAME - pos.x()) * DAMPING_FACTOR;
- canvas->moveMap(QPointF(d/2, 0));
- timer->start();
- }
- else if(pos.x() > canvas->width() - SENSITIVE_FRAME)
- {
- int d = (canvas->width() - SENSITIVE_FRAME - pos.x()) * DAMPING_FACTOR;
- canvas->moveMap(QPointF(d/2, 0));
- timer->start();
- }
- else if(pos.y() < SENSITIVE_FRAME)
- {
- int d = (SENSITIVE_FRAME - pos.y()) * DAMPING_FACTOR;
- canvas->moveMap(QPointF(0, d/2));
- timer->start();
- }
- else if(pos.y() > canvas->height() - SENSITIVE_FRAME)
- {
- int d = (canvas->height() - SENSITIVE_FRAME - pos.y()) * DAMPING_FACTOR;
- canvas->moveMap(QPointF(0, d/2));
- timer->start();
- }
- else
- {
- timer->stop();
- }
- canvas->update();
-}
diff --git a/src/mouse/IMouse.h b/src/mouse/IMouse.h
index 0ff7c55..11790ea 100644
--- a/src/mouse/IMouse.h
+++ b/src/mouse/IMouse.h
@@ -64,13 +64,8 @@ public:
return canvas;
}
- void panCanvas(const QPoint& pos);
-
virtual void setMouseTracking(bool enabled);
-protected slots:
- virtual void slotPanCanvas();
-
protected:
/// the functions mouse icon
QCursor cursor;
@@ -80,8 +75,6 @@ protected:
QPointer<CCanvas> canvas;
// the current point reported by the mouse events
QPoint point;
-
- QTimer * timer;
};
#endif //IMOUSE_H
diff --git a/src/mouse/IScrOptSelect.ui b/src/mouse/IScrOptSelect.ui
index 24e06cb..5d95033 100644
--- a/src/mouse/IScrOptSelect.ui
+++ b/src/mouse/IScrOptSelect.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>27</width>
- <height>248</height>
+ <height>271</height>
</rect>
</property>
<property name="windowTitle">
@@ -94,6 +94,26 @@
</widget>
</item>
<item>
+ <widget class="QToolButton" name="toolSymWpt">
+ <property name="toolTip">
+ <string>Change the icon of all selected waypoints.</string>
+ </property>
+ <property name="text">
+ <string>...</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../resources.qrc">
+ <normaloff>:/icons/waypoints/32x32/PinBlue.png</normaloff>:/icons/waypoints/32x32/PinBlue.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>16</width>
+ <height>16</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QToolButton" name="toolCombineTracks">
<property name="toolTip">
<string>Combine all selected tracks to a new one.</string>
diff --git a/src/mouse/line/CLineOpSelectRange.cpp b/src/mouse/line/CLineOpSelectRange.cpp
index a1b7844..9250138 100644
--- a/src/mouse/line/CLineOpSelectRange.cpp
+++ b/src/mouse/line/CLineOpSelectRange.cpp
@@ -31,6 +31,7 @@ CLineOpSelectRange::CLineOpSelectRange(SGisLine& points, CGisDraw *gis, CCanvas
CLineOpSelectRange::~CLineOpSelectRange()
{
+ delete scrOptRangeLine;
}
void CLineOpSelectRange::mouseReleaseEventEx(QMouseEvent * e)
@@ -158,15 +159,8 @@ void CLineOpSelectRange::drawFg(QPainter& p)
break;
}
- case eState2nd:
- {
- if(!scrOptRangeLine.isNull())
- {
- scrOptRangeLine->draw(p);
- }
- }
-
case eState1st:
+ case eState2nd:
{
if(idx2nd != NOIDX)
{
@@ -192,22 +186,26 @@ void CLineOpSelectRange::drawFg(QPainter& p)
p.setPen(QPen(Qt::green, 3, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
p.drawPolyline(seg);
- QRectF r(0,0,7,7);
- p.setPen(QPen(Qt::darkGreen,2));
- p.setBrush(Qt::darkGreen);
- for(const QPointF &pt : seg)
- {
- r.moveCenter(pt);
- p.drawRect(r);
- }
- p.setPen(Qt::NoPen);
+ p.setPen(QPen(Qt::NoPen));
p.setBrush(Qt::black);
- for(const QPointF &pt : seg)
+
+ QRectF r(0, 0, 8, 8);
+ for(int i = idx1; i <= idx2; i++)
{
- r.moveCenter(pt);
+ r.moveCenter(points[i].pixel);
p.drawRect(r);
+
+ for(const IGisLine::subpt_t& subpt : points[i].subpts)
+ {
+ p.drawEllipse(subpt.pixel, 2, 2);
+ }
}
}
+
+ if(!scrOptRangeLine.isNull() && eState2nd == state)
+ {
+ scrOptRangeLine->draw(p);
+ }
break;
}
}
@@ -229,9 +227,11 @@ void CLineOpSelectRange::slotDelete()
qint32 idx = qMin(idxFocus, idx2nd);
qint32 N = qAbs(idxFocus - idx2nd) - 1;
+ points[idx].subpts.clear();
points.remove(idx + 1, N);
parentHandler->storeToHistory(points);
+
resetState();
canvas->slotTriggerCompleteUpdate(CCanvas::eRedrawMouse);
}
diff --git a/src/mouse/line/ILineOp.cpp b/src/mouse/line/ILineOp.cpp
index 8dff6da..62baf52 100644
--- a/src/mouse/line/ILineOp.cpp
+++ b/src/mouse/line/ILineOp.cpp
@@ -119,6 +119,7 @@ void ILineOp::mousePressEvent(QMouseEvent * e)
if(e->button() == Qt::LeftButton)
{
lastPos = e->pos();
+ firstPos = lastPos;
mapMove = true;
mapDidMove = false;
}
@@ -130,7 +131,7 @@ void ILineOp::mouseMoveEvent(QMouseEvent * e)
{
const QPoint& pos = e->pos();
- if(mapMove && (pos != lastPos))
+ if(mapMove && ((pos - firstPos).manhattanLength() >= 4))
{
QPoint delta = pos - lastPos;
canvas->moveMap(delta);
diff --git a/src/mouse/line/ILineOp.h b/src/mouse/line/ILineOp.h
index ba4457a..7ebd629 100644
--- a/src/mouse/line/ILineOp.h
+++ b/src/mouse/line/ILineOp.h
@@ -108,6 +108,7 @@ protected:
qint32 idxFocus = NOIDX;
QPoint lastPos;
+ QPoint firstPos;
QRect rectPoint {0,0,9,9};
const QPen penBgPoint {Qt::white, 4};
diff --git a/src/mouse/line/IScrOptRangeLine.ui b/src/mouse/line/IScrOptRangeLine.ui
index abbfdef..8a93bd3 100644
--- a/src/mouse/line/IScrOptRangeLine.ui
+++ b/src/mouse/line/IScrOptRangeLine.ui
@@ -14,6 +14,18 @@
<string>Form</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>3</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>3</number>
+ </property>
<item>
<widget class="QToolButton" name="toolDelete">
<property name="toolTip">
diff --git a/src/plot/IPlot.cpp b/src/plot/IPlot.cpp
index bb47fac..a398a40 100644
--- a/src/plot/IPlot.cpp
+++ b/src/plot/IPlot.cpp
@@ -96,6 +96,7 @@ IPlot::IPlot(CGisItemTrk *trk, CPlotData::axistype_e type, mode_e mode, QWidget
actionPrint = menu->addAction(QIcon("://icons/32x32/Save.png"), tr("Save..."), this, SLOT(slotSave()));
menu->addSeparator();
actionAddWpt = menu->addAction(QIcon("://icons/32x32/AddWpt.png"), tr("Add Waypoint"), this, SLOT(slotAddWpt()));
+ actionCutTrk = menu->addAction(QIcon("://icons/32x32/TrkCut.png"), tr("Cut..."), this, SLOT(slotCutTrk()));
connect(this, &IPlot::customContextMenuRequested, this, &IPlot::slotContextMenu);
}
@@ -1281,6 +1282,7 @@ void IPlot::slotContextMenu(const QPoint & point)
actionStopRange->setEnabled((mouseClickState != eMouseClickIdle) && !(idxSel1 == NOIDX || idxSel2 == NOIDX));
actionPrint->setEnabled(mouseClickState != eMouseClick2nd);
actionAddWpt->setDisabled(posMouse1 == NOPOINT);
+ actionCutTrk->setDisabled(actionStopRange->isEnabled());
posMouse2 = posMouse1;
@@ -1393,6 +1395,22 @@ void IPlot::slotAddWpt()
}
}
+void IPlot::slotCutTrk()
+{
+ // set point of mouse click focus to position of context menu stored in
+ // secondary mouse point
+ qreal x = data->x().pt2val(posMouse2.x() - left);
+ setMouseFocus(x, CGisItemTrk::eFocusMouseClick);
+
+ /*
+ Trigger cut by event not by direct call to API. This is because cutting the track
+ might result into deleting the original one. The original one is the parent of this
+ plot and needs to destroy it. This would be impossible if we are still in this method
+ because the API call did not return yet.
+ */
+ CGisWidget::self().postEventForWks(new CEvtA2WCutTrk(trk->getKey()));
+}
+
void IPlot::setMouseRangeFocus(const CTrackData::trkpt_t * ptRange1, const CTrackData::trkpt_t *ptRange2)
{
if(nullptr == ptRange1 || nullptr == ptRange2)
diff --git a/src/plot/IPlot.h b/src/plot/IPlot.h
index 550ff58..60488c8 100644
--- a/src/plot/IPlot.h
+++ b/src/plot/IPlot.h
@@ -70,6 +70,7 @@ private slots:
void slotStopRange();
void slotResetZoom();
void slotAddWpt();
+ void slotCutTrk();
protected:
@@ -180,6 +181,7 @@ protected:
QAction * actionPrint;
QAction * actionStopRange;
QAction * actionAddWpt;
+ QAction * actionCutTrk;
qint32 idxSel1 = NOIDX;
qint32 idxSel2 = NOIDX;
diff --git a/src/resources.qrc b/src/resources.qrc
index f2b61dd..9dc7e59 100644
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -80,6 +80,7 @@
<file>icons/32x32/SaveAllGIS.png</file>
<file>icons/32x32/LoadGIS.png</file>
<file>icons/32x32/GpxProject.png</file>
+ <file>icons/32x32/TcxProject.png</file>
<file>icons/32x32/QmsProject.png</file>
<file>icons/32x32/SlfProject.png</file>
<file>icons/32x32/DBProject.png</file>
@@ -96,6 +97,8 @@
<file>icons/32x32/Undo.png</file>
<file>icons/32x32/Redo.png</file>
<file>icons/32x32/Cut.png</file>
+ <file>icons/32x32/CutMode1.png</file>
+ <file>icons/32x32/CutMode2.png</file>
<file>icons/32x32/CutHistory.png</file>
<file>icons/32x32/Copy.png</file>
<file>icons/32x32/Move.png</file>
@@ -269,6 +272,7 @@
<file>icons/48x48/SaveAllGIS.png</file>
<file>icons/48x48/LoadGIS.png</file>
<file>icons/48x48/GpxProject.png</file>
+ <file>icons/48x48/TcxProject.png</file>
<file>icons/48x48/QmsProject.png</file>
<file>icons/48x48/SlfProject.png</file>
<file>icons/48x48/DBProject.png</file>
@@ -285,6 +289,8 @@
<file>icons/48x48/Undo.png</file>
<file>icons/48x48/Redo.png</file>
<file>icons/48x48/Cut.png</file>
+ <file>icons/48x48/CutMode1.png</file>
+ <file>icons/48x48/CutMode2.png</file>
<file>icons/48x48/CutHistory.png</file>
<file>icons/48x48/Copy.png</file>
<file>icons/48x48/Move.png</file>
@@ -465,6 +471,22 @@
<file>icons/waypoints/32x32/CityLarge.png</file>
<file>icons/waypoints/32x32/CityMedium.png</file>
<file>icons/waypoints/32x32/CitySmall.png</file>
+ <file>icons/waypoints/32x32/1stCategory.png</file>
+ <file>icons/waypoints/32x32/2ndCategory.png</file>
+ <file>icons/waypoints/32x32/3rdCategory.png</file>
+ <file>icons/waypoints/32x32/4thCategory.png</file>
+ <file>icons/waypoints/32x32/Danger.png</file>
+ <file>icons/waypoints/32x32/FirstAid.png</file>
+ <file>icons/waypoints/32x32/Food.png</file>
+ <file>icons/waypoints/32x32/Generic.png</file>
+ <file>icons/waypoints/32x32/HorsCategory.png</file>
+ <file>icons/waypoints/32x32/Left.png</file>
+ <file>icons/waypoints/32x32/Right.png</file>
+ <file>icons/waypoints/32x32/Sprint.png</file>
+ <file>icons/waypoints/32x32/Straight.png</file>
+ <file>icons/waypoints/32x32/Summit.png</file>
+ <file>icons/waypoints/32x32/Valley.png</file>
+ <file>icons/waypoints/32x32/Water.png</file>
<file>cursors/cursorArrow.png</file>
<file>cursors/cursorMove.png</file>
<file>cursors/cursorMovePoint.png</file>
@@ -478,7 +500,8 @@
<file>cursors/cursorAdd.png</file>
<file>cursors/cursorPrint.png</file>
<file>cursors/cursorSave.png</file>
- <file>cursors/wptHighlight.png</file>
+ <file>cursors/wptHighlightRed.png</file>
+ <file>cursors/wptHighlightBlue.png</file>
<file>animation/loader.gif</file>
<file>animation/loader2.gif</file>
<file>pics/timezones.png</file>
diff --git a/src/setup/CAppSetupLinux.h b/src/setup/CAppSetupLinux.h
index 2a5a336..d2fe73e 100644
--- a/src/setup/CAppSetupLinux.h
+++ b/src/setup/CAppSetupLinux.h
@@ -31,6 +31,7 @@ public:
QString defaultCachePath() override;
QString userDataPath(QString subdir = 0) override;
QString logDir() override;
+ QString findExecutable(const QString &name) override { return QStandardPaths::findExecutable(name); }
};
diff --git a/src/setup/CAppSetupMac.h b/src/setup/CAppSetupMac.h
index a921320..2eef69c 100644
--- a/src/setup/CAppSetupMac.h
+++ b/src/setup/CAppSetupMac.h
@@ -32,6 +32,7 @@ public:
QString defaultCachePath() override;
QString userDataPath(QString subdir = 0) override;
QString logDir() override;
+ QString findExecutable(const QString &name) override { return QStandardPaths::findExecutable(name); }
private:
QDir getApplicationDir(QString subdir);
diff --git a/src/setup/CAppSetupWin.cpp b/src/setup/CAppSetupWin.cpp
index 0fc5987..3bd17dc 100644
--- a/src/setup/CAppSetupWin.cpp
+++ b/src/setup/CAppSetupWin.cpp
@@ -35,6 +35,7 @@ void CAppSetupWin::initQMapShack()
prepareTranslator(appResourceDir, "qtbase_");
prepareTranslator(appResourceDir, "qmapshack_");
+ path = qgetenv("PATH");
//reset PATH to avoid that wrong .dll's are loaded
qputenv("PATH", "");
@@ -71,3 +72,10 @@ QString CAppSetupWin::logDir()
{
return QDir::temp().absolutePath();
}
+
+QString CAppSetupWin::findExecutable(const QString &name)
+{
+ qputenv("PATH",path);
+ return QStandardPaths::findExecutable(name);
+ qputenv("PATH","");
+}
diff --git a/src/setup/CAppSetupWin.h b/src/setup/CAppSetupWin.h
index f679b94..ab42798 100644
--- a/src/setup/CAppSetupWin.h
+++ b/src/setup/CAppSetupWin.h
@@ -31,6 +31,9 @@ public:
QString defaultCachePath() override;
QString userDataPath(QString subdir = 0) override;
QString logDir() override;
+ QString findExecutable(const QString &name) override;
+
+ QByteArray path;
};
#endif // CAPPSETUPWIN_H
diff --git a/src/setup/CLogHandler.cpp b/src/setup/CLogHandler.cpp
index b75aeea..d2549c8 100644
--- a/src/setup/CLogHandler.cpp
+++ b/src/setup/CLogHandler.cpp
@@ -26,6 +26,7 @@ CLogHandler::CLogHandler(QString logDirectory, bool writeToFile, bool debugOutpu
{
if (writeToFile)
{
+ fileStream.setCodec("UTF-8");
logFile.open(QIODevice::WriteOnly | QIODevice::Append);
}
qSetMessagePattern("%{time yyyy-MM-dd h:mm:ss.zzz} [%{type}] %{message}");
diff --git a/src/setup/IAppSetup.h b/src/setup/IAppSetup.h
index 4364ea6..1155900 100644
--- a/src/setup/IAppSetup.h
+++ b/src/setup/IAppSetup.h
@@ -36,6 +36,7 @@ public:
virtual QString defaultCachePath() = 0;
virtual QString userDataPath(QString subdir = 0) = 0;
virtual QString logDir() = 0;
+ virtual QString findExecutable(const QString &name) = 0;
protected:
void prepareGdal(QString gdalDir, QString projDir);
diff --git a/src/tool/CMapVrtBuilder.cpp b/src/tool/CMapVrtBuilder.cpp
index 06d287d..4f1ad65 100644
--- a/src/tool/CMapVrtBuilder.cpp
+++ b/src/tool/CMapVrtBuilder.cpp
@@ -22,9 +22,10 @@
#include <QtWidgets>
CMapVrtBuilder::CMapVrtBuilder(QWidget *parent)
- : IToolShell(textBrowser, parent)
+ : IToolShell(parent)
{
setupUi(this);
+ setTextBrowser(textBrowser);
setObjectName(tr("Build GDAL VRT"));
connect(toolSourceFiles, &QToolButton::clicked, this, &CMapVrtBuilder::slotSelectSourceFiles);
diff --git a/src/tool/CRoutinoDatabaseBuilder.cpp b/src/tool/CRoutinoDatabaseBuilder.cpp
index 7c30be7..b7e1b3a 100644
--- a/src/tool/CRoutinoDatabaseBuilder.cpp
+++ b/src/tool/CRoutinoDatabaseBuilder.cpp
@@ -25,9 +25,10 @@
CRoutinoDatabaseBuilder::CRoutinoDatabaseBuilder(QWidget * parent)
- : IToolShell(textBrowser, parent)
+ : IToolShell(parent)
{
setupUi(this);
+ setTextBrowser(textBrowser);
setObjectName(tr("Create Routino Database"));
diff --git a/src/tool/IToolShell.cpp b/src/tool/IToolShell.cpp
index 0959d71..0fa7581 100644
--- a/src/tool/IToolShell.cpp
+++ b/src/tool/IToolShell.cpp
@@ -20,9 +20,8 @@
#include <QtWidgets>
-IToolShell::IToolShell(QTextBrowser *&textBrowser, QWidget * parent)
+IToolShell::IToolShell(QWidget * parent)
: QWidget(parent)
- , text(textBrowser)
{
connect(&cmd, &QProcess::readyReadStandardError, this, &IToolShell::slotStderr);
connect(&cmd, &QProcess::readyReadStandardOutput, this, &IToolShell::slotStdout);
@@ -33,14 +32,16 @@ IToolShell::IToolShell(QTextBrowser *&textBrowser, QWidget * parent)
IToolShell::~IToolShell()
{
+ text = nullptr;
}
-void IToolShell::setOutputBrowser(QTextBrowser * text)
-{
-}
void IToolShell::slotError(QProcess::ProcessError error)
{
+ if (text.isNull())
+ {
+ return;
+ }
text->setTextColor(Qt::red);
text->insertPlainText(QString(tr("Execution of external program `%1` failed: ")).arg(cmd.program()));
switch(error)
@@ -62,6 +63,11 @@ void IToolShell::slotError(QProcess::ProcessError error)
void IToolShell::slotStderr()
{
+ if (text.isNull())
+ {
+ return;
+ }
+
QString str;
text->setTextColor(Qt::red);
str = cmd.readAllStandardError();
@@ -96,6 +102,11 @@ void IToolShell::slotStderr()
void IToolShell::slotStdout()
{
+ if (text.isNull())
+ {
+ return;
+ }
+
QString str;
text->setTextColor(Qt::blue);
str = cmd.readAllStandardOutput();
@@ -127,15 +138,25 @@ void IToolShell::slotStdout()
text->verticalScrollBar()->setValue(text->verticalScrollBar()->maximum());
}
-void IToolShell::stdOut(const QString& str, bool gui)
+void IToolShell::stdOut(const QString& str)
{
+ if (text.isNull())
+ {
+ return;
+ }
+
text->setTextColor(Qt::black);
text->append(str);
}
-void IToolShell::stdErr(const QString& str, bool gui)
+void IToolShell::stdErr(const QString& str)
{
+ if (text.isNull())
+ {
+ return;
+ }
+
text->setTextColor(Qt::red);
text->append(str);
}
@@ -145,8 +166,11 @@ void IToolShell::slotFinished(int exitCode, QProcess::ExitStatus status)
{
if(exitCode || status)
{
- text->setTextColor(Qt::red);
- text->append(tr("!!! failed !!!\n"));
+ if (!text.isNull())
+ {
+ text->setTextColor(Qt::red);
+ text->append(tr("!!! failed !!!\n"));
+ }
return;
}
diff --git a/src/tool/IToolShell.h b/src/tool/IToolShell.h
index c5c1540..2b72147 100644
--- a/src/tool/IToolShell.h
+++ b/src/tool/IToolShell.h
@@ -19,6 +19,7 @@
#ifndef ITOOLSHELL_H
#define ITOOLSHELL_H
+#include <QPointer>
#include <QProcess>
#include <QWidget>
@@ -28,11 +29,18 @@ class IToolShell : public QWidget
{
Q_OBJECT
public:
- IToolShell(QTextBrowser *&textBrowser, QWidget *parent);
+ IToolShell(QWidget *parent);
virtual ~IToolShell();
+ void setTextBrowser(QTextBrowser * textbrowser)
+ {
+ text = textbrowser;
+ }
+
protected slots:
+ /// read the stderr from the process and paste it into the text browswer
void slotStderr();
+ /// read the stdout from the process and paste it into the text browswer
void slotStdout();
void slotError(QProcess::ProcessError error);
virtual void slotFinished(int exitCode, QProcess::ExitStatus status);
@@ -40,13 +48,14 @@ protected slots:
protected:
virtual void finished(int exitCode, QProcess::ExitStatus status) = 0;
- void setOutputBrowser(QTextBrowser * textBrowser);
- void stdOut(const QString& str, bool gui = false);
- void stdErr(const QString& str, bool gui = false);
+ /// write text to stdout color channel of the text browser
+ void stdOut(const QString& str);
+ /// write text to stderr color channel of the text browser
+ void stdErr(const QString& str);
QProcess cmd;
- QTextBrowser *& text;
+ QPointer<QTextBrowser> text;
};
#endif //ITOOLSHELL_H
diff --git a/templates/header.h b/templates/header.h
index 0679fac..baaa265 100644
--- a/templates/header.h
+++ b/templates/header.h
@@ -1,5 +1,5 @@
/**********************************************************************************************
- Copyright (C) 2016 Oliver Eichler oliver.eichler at gmx.de
+ Copyright (C) 2017 Oliver Eichler oliver.eichler at gmx.de
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/templates/source.c b/templates/source.c
index 8962ea4..d97a399 100644
--- a/templates/source.c
+++ b/templates/source.c
@@ -1,5 +1,5 @@
/**********************************************************************************************
- Copyright (C) 2016 Oliver Eichler oliver.eichler at gmx.de
+ Copyright (C) 2017 Oliver Eichler oliver.eichler at gmx.de
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/templates/source.cpp b/templates/source.cpp
index fdd485e..03d99e4 100644
--- a/templates/source.cpp
+++ b/templates/source.cpp
@@ -1,5 +1,5 @@
/**********************************************************************************************
- Copyright (C) 2016 Oliver Eichler oliver.eichler at gmx.de
+ Copyright (C) 2017 Oliver Eichler oliver.eichler at gmx.de
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/test/unittest/CMakeLists.txt b/test/unittest/CMakeLists.txt
index b153ccc..09882ff 100644
--- a/test/unittest/CMakeLists.txt
+++ b/test/unittest/CMakeLists.txt
@@ -14,14 +14,18 @@ find_package(Qt5WebKitWidgets)
find_package(Qt5LinguistTools)
find_package(Qt5PrintSupport)
if(UNIX)
-find_package(Qt5DBus)
+ if(Qt5DBus_FOUND)
+ find_package(Qt5DBus)
+ endif(Qt5DBus_FOUND)
endif(UNIX)
find_package(GDAL REQUIRED)
find_package(PROJ REQUIRED)
find_package(ROUTINO REQUIRED)
if(UNIX)
- set(DBUS_LIB Qt5::DBus)
+ if(Qt5DBus_FOUND)
+ set(DBUS_LIB Qt5::DBus)
+ endif(Qt5DBus_FOUND)
else(UNIX)
set(DBUS_LIB)
endif(UNIX)
--
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