|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -3,7 +3,7 @@
<service name="tar_git">
<param name="url">https://github.com/Karry/osmscout-sailfish.git</param>
<param name="branch">master</param>
- <param name="revision">v2.27</param>
+ <param name="revision">v2.28</param>
<param name="debian">N</param>
<param name="dumb">N</param>
</service>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/CMakeLists.txt
^
|
| @@ -6,7 +6,7 @@
# Redistribution and use is allowed according to the terms of the BSD license.
cmake_policy(SET CMP0048 NEW)
-project(osmscout-sailfish VERSION 2.27.0 LANGUAGES C CXX)
+project(osmscout-sailfish VERSION 2.28.0 LANGUAGES C CXX)
# ==================================================================================================
# Information to update before to release this package.
@@ -628,6 +628,7 @@
Qt5::Core
Qt5::Gui
Qt5::Multimedia
+ Qt5::Quick
${LIBSAILFISHAPP_LIBRARIES}
)
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/.github/workflows/build_and test_on_ios.yml
^
|
| @@ -14,7 +14,7 @@
runs-on: macos-10.15
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Install build tool
run: brew install cmake ninja
- name: Install dependencies
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/.github/workflows/build_and test_on_msys.yml
^
|
| @@ -17,7 +17,7 @@
shell: msys2 {0}
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Setup MSYS/MINGW64
uses: msys2/setup-msys2@v2
with:
@@ -46,7 +46,7 @@
shell: msys2 {0}
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Setup MSYS/MINGW64
uses: msys2/setup-msys2@v2
with:
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/.github/workflows/build_and test_on_osx.yml
^
|
| @@ -14,7 +14,7 @@
runs-on: macos-10.15
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Install build tool
run: brew install meson ninja
- name: Install dependencies
@@ -33,7 +33,7 @@
runs-on: macos-10.15
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Install build tool
run: brew install cmake ninja
- name: Install dependencies
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/.github/workflows/build_and test_on_ubuntu_20_04.yml
^
|
| @@ -14,7 +14,7 @@
runs-on: ubuntu-20.04
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Install software-properties-common
run: sudo apt-get install software-properties-common
- name: Install gcc compiler, meson and ninja
@@ -44,7 +44,7 @@
runs-on: ubuntu-20.04
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Install software-properties-common
run: sudo apt-get install software-properties-common
- name: Install gcc compiler, cmake and ninja
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/.github/workflows/build_and test_on_ubuntu_22_04.yml
^
|
| @@ -14,7 +14,7 @@
runs-on: ubuntu-22.04
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Update package list
run: sudo apt-get update
- name: Install software-properties-common
@@ -46,7 +46,7 @@
runs-on: ubuntu-22.04
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Install software-properties-common
run: sudo apt-get install software-properties-common
- name: Install gcc compiler, meson and ninja
@@ -76,7 +76,7 @@
runs-on: ubuntu-22.04
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Install software-properties-common
run: sudo apt-get install software-properties-common
- name: Install gcc compiler, cmake and ninja
@@ -112,13 +112,14 @@
runs-on: ubuntu-22.04
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Install software-properties-common
run: sudo apt-get install software-properties-common
- name: Install gcc compiler, meson and ninja
run: sudo apt-get -y install gcc-12 g++-12 libtbb-dev ccache libtool pkg-config meson ninja-build
- name: Install libosmscout dependencies
run: "sudo apt-get update && sudo apt-get install -y
+ libfreetype6-dev libcairo2-dev libpangocairo-1.0-0 libpango1.0-dev
qmake6 libqt6svg6-dev libqt6core5compat6-dev qt6-declarative-dev qt6-positioning-dev qt6-tools-dev-tools
qt6-l10n-tools qt6-tools-dev qt6-multimedia-dev
libgl-dev"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/.github/workflows/build_and test_on_vs2019.yml
^
|
| @@ -14,15 +14,15 @@
runs-on: windows-2019
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Copy vcpkg.json
run: copy vcpkg_medium.json vcpkg.json
- name: Add msbuild to PATH
- uses: microsoft/setup-msbuild@v1.0.2
+ uses: microsoft/setup-msbuild@v1.1.3
# Restore from cache the previously built ports. If cache-miss, download and build vcpkg (aka "bootstrap vcpkg").
- name: Restore from cache and install vcpkg
# Download and build vcpkg, without installing any port. If content is cached already, it is a no-op.
- uses: lukka/run-vcpkg@v10.4 # https://github.com/lukka/run-vcpkg/releases/tag/v10.4
+ uses: lukka/run-vcpkg@v10.7 # https://github.com/lukka/run-vcpkg/releases/tag/v10.4
with:
runVcpkgInstall: false
vcpkgJsonGlob: '**/vcpkg.json'
@@ -77,9 +77,9 @@
shell: cmd
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Setup Python 3.x for meson
- uses: actions/setup-python@v1
+ uses: actions/setup-python@v4
with:
python-version: '3.x'
# https://github.com/mesonbuild/meson/issues/9955#issuecomment-1030843844
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/.github/workflows/build_on_ubuntu_18_04_qt_android.yml
^
|
| @@ -18,11 +18,12 @@
runs-on: ubuntu-18.04
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: set up JDK 1.8
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v3
with:
- java-version: 1.8
+ distribution: zulu
+ java-version: 8
- name: Setup Android SDK
uses: android-actions/setup-android@v2
- name: Run sdkmanager update
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/.github/workflows/release_latest.yml
^
|
| @@ -11,7 +11,7 @@
runs-on: ubuntu-20.04
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Install jq, python3-pip, g++-10, ninja
run: sudo apt-get install -y jq python3-pip g++-10 ninja-build
- name: Install meson
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/.github/workflows/sanitize_on_ubuntu_22_04.yml
^
|
| @@ -14,7 +14,7 @@
runs-on: ubuntu-22.04
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Update package list
run: sudo apt-get update
- name: Install software-properties-common
@@ -67,7 +67,7 @@
runs-on: ubuntu-22.04
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Install software-properties-common
run: sudo apt-get install software-properties-common
- name: Install gcc compiler, cmake and ninja
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/.github/workflows/sonar.yml
^
|
| @@ -7,6 +7,8 @@
push:
branches:
- master
+ workflow_dispatch:
+
jobs:
sonar_gcc_meson:
@@ -15,7 +17,9 @@
environment: SONAR
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
- name: Update package list
run: sudo apt-get update
- name: Install software-properties-common
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/.github/workflows/webpage.yml
^
|
| @@ -12,7 +12,7 @@
environment: SOURCEFORGE
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Update package list
run: sudo apt-get update
- name: Install additional tools
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/Demos/src/DrawMapQt.cpp
^
|
| @@ -22,7 +22,6 @@
#include <iostream>
#include <QApplication>
-#include <QDesktopWidget>
#include <QPixmap>
#include <QScreen>
#include <QGuiApplication>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/Demos/src/QtDemoApp.cpp
^
|
| @@ -144,7 +144,7 @@
// translations are installed to <PREFIX>/share/libosmscout/OSMScout2/translations
// Qt lookup app data (on Linux) in directories "~/.local/share/<APPNAME>", "/usr/local/share/<APPNAME>", "/usr/share/<APPNAME>"
// when APPNAME is combination of <organisation>/<app name>
- translationDir = QStandardPaths::locate(QStandardPaths::DataLocation, "translations",
+ translationDir = QStandardPaths::locate(QStandardPaths::AppLocalDataLocation, "translations",
QStandardPaths::LocateDirectory);
}else{
translationDir = args.translationDir;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/Demos/src/RoutingAnimation.cpp
^
|
| @@ -17,9 +17,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
#include <QGuiApplication>
-#include <QDesktopWidget>
#include <QPixmap>
#include <QScreen>
#include <QDebug>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/OSMScout2/src/OSMScout.cpp
^
|
| @@ -184,7 +184,7 @@
// translations are installed to <PREFIX>/share/libosmscout/OSMScout2/translations
// Qt lookup app data (on Linux) in directories "~/.local/share/<APPNAME>", "/usr/local/share/<APPNAME>", "/usr/share/<APPNAME>"
// when APPNAME is combination of <organisation>/<app name>
- translationDir = QStandardPaths::locate(QStandardPaths::DataLocation, "translations",
+ translationDir = QStandardPaths::locate(QStandardPaths::AppLocalDataLocation, "translations",
QStandardPaths::LocateDirectory);
}else{
translationDir = args.translationDir;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/StyleEditor/src/FileIO.cpp
^
|
| @@ -164,7 +164,7 @@
int FileIO::lineOffset(int l)
{
int s = 0;
- for(int i=0; i<std::min(l, lineOffsets.count()); i++){
+ for(qsizetype i=0; i<std::min(qsizetype(l), qsizetype(lineOffsets.count())); i++){
s += lineOffsets[i];
}
return s;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/StyleEditor/src/Highlighter.h
^
|
| @@ -24,6 +24,7 @@
#include <QHash>
#include <QTextCharFormat>
+#include <QRegExp>
#include <QtQuick/QQuickItem>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/Tests/include/DrawWindow.h
^
|
| @@ -21,10 +21,10 @@
#define TEST_DRAWWINDOW_H
#include <QApplication>
-#include <QDesktopWidget>
+#include <QElapsedTimer>
#include <QPixmap>
#include <QScreen>
-#include <QElapsedTimer>
+#include <QWidget>
#include <osmscout/Database.h>
#include <osmscoutmap/MapService.h>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/Tests/meson.build
^
|
| @@ -478,6 +478,7 @@
include_directories: [testIncDir, osmscoutmapqtIncDir, osmscoutmapIncDir, osmscoutIncDir, osmscoutclientqtIncDir],
dependencies: [mathDep, threadDep, openmpDep, qt6GuiDep, qt6WidgetsDep, qt6QmlDep, qt6QuickDep, qt6NetworkDep, qt6MultimediaDep],
link_with: [osmscoutmapqt, osmscoutmap, osmscout, osmscoutclientqt],
+ override_options : ['unity=off'], # solves multiple definition of Q_DECLARE_METATYPE(osmscout::TileRef)
install: false)
endif
endif
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/Tests/src/ClientQtThreading.cpp
^
|
| @@ -25,7 +25,6 @@
#include <osmscoutclientqt/OSMScoutQt.h>
#include <QApplication>
-#include <QDesktopWidget>
#include <QPixmap>
#include <QScreen>
#include <QtGui>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/Tests/src/DrawTextQt.cpp
^
|
| @@ -21,7 +21,6 @@
#include <iomanip>
#include <QApplication>
-#include <QDesktopWidget>
#include <QPixmap>
#include <QScreen>
#include <QtGui>
@@ -106,7 +105,11 @@
painter->drawText(point.GetX(), point.GetY(), QString(string[i]));
+#if QT_VERSION < 0x051100
offset+=metrics.width(string[i]);
+#else
+ offset+=metrics.horizontalAdvance(string[i]);
+#endif
}
offset+=3*fontHeight;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/Tests/src/PerformanceTest.cpp
^
|
| @@ -32,7 +32,6 @@
#endif
#if defined(HAVE_LIB_OSMSCOUTMAPQT)
#include <QApplication>
-#include <QDesktopWidget>
#include <QPixmap>
#include <QScreen>
#include <osmscoutmapqt/MapPainterQt.h>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/Tests/src/QtFileDownloader.cpp
^
|
| @@ -25,7 +25,6 @@
#include <osmscoutclientqt/OSMScoutQt.h>
#include <QApplication>
-#include <QDesktopWidget>
#include <QPixmap>
#include <QScreen>
#include <QtGui>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/MapWidget.h
^
|
| @@ -60,15 +60,16 @@
Q_OBJECT
Q_PROPERTY(QObject *view READ GetView WRITE SetMapView NOTIFY viewChanged)
Q_PROPERTY(QObject *vehiclePosition READ GetVehiclePosition WRITE SetVehiclePosition)
- Q_PROPERTY(double lat READ GetLat NOTIFY viewChanged)
- Q_PROPERTY(double lon READ GetLon NOTIFY viewChanged)
- Q_PROPERTY(int zoomLevel READ GetMagLevel NOTIFY viewChanged)
- Q_PROPERTY(QString zoomLevelName READ GetZoomLevelName NOTIFY viewChanged)
- Q_PROPERTY(double pixelSize READ GetPixelSize NOTIFY viewChanged)
+ Q_PROPERTY(double lat READ GetLat NOTIFY latChanged)
+ Q_PROPERTY(double lon READ GetLon NOTIFY lonChanged)
+ Q_PROPERTY(double angle READ GetAngle NOTIFY angleChanged)
+ Q_PROPERTY(int zoomLevel READ GetMagLevel NOTIFY magLevelChanged)
+ Q_PROPERTY(QString zoomLevelName READ GetZoomLevelName NOTIFY magLevelChanged)
+ Q_PROPERTY(double pixelSize READ GetPixelSize NOTIFY pixelSizeChanged)
Q_PROPERTY(bool databaseLoaded READ isDatabaseLoaded NOTIFY databaseLoaded)
Q_PROPERTY(bool finished READ IsFinished NOTIFY finishedChanged)
Q_PROPERTY(bool showCurrentPosition READ getShowCurrentPosition WRITE setShowCurrentPosition)
- Q_PROPERTY(bool lockToPosition READ isLockedToPosition WRITE setLockToPosition NOTIFY lockToPossitionChanged)
+ Q_PROPERTY(bool lockToPosition READ isLockedToPosition WRITE setLockToPosition NOTIFY lockToPositionChanged)
Q_PROPERTY(bool followVehicle READ isFollowVehicle WRITE setFollowVehicle NOTIFY followVehicleChanged)
Q_PROPERTY(bool vehicleAutoRotateMap READ isVehicleAutoRotateMap WRITE setVehicleAutoRotateMap NOTIFY vehicleAutoRotateMapChanged)
Q_PROPERTY(QString stylesheetFilename READ GetStylesheetFilename NOTIFY stylesheetFilenameChanged)
@@ -162,7 +163,12 @@
signals:
void viewChanged();
- void lockToPossitionChanged();
+ void latChanged();
+ void lonChanged();
+ void angleChanged();
+ void magLevelChanged();
+ void pixelSizeChanged();
+ void lockToPositionChanged();
void followVehicleChanged();
void vehicleAutoRotateMapChanged();
void finishedChanged(bool finished);
@@ -388,6 +394,11 @@
return view->center.GetLon();
}
+ inline double GetAngle() const
+ {
+ return view->angle.AsRadians();
+ }
+
inline osmscout::GeoCoord GetCenter() const
{
return view->center;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/Router.h
^
|
| @@ -99,10 +99,11 @@
void Initialize();
/**
- * Start Route computation. Router emits routeComputed or routeFailed later.
+ * Start Route computation. Router emits multiple routingProgress followed by
+ * routeComputed or routeFailed with requestId identifier.
*
* User of this function should use Qt::QueuedConnection for invoking
- * this slot, search may generate IO load and may tooks long time.
+ * this slot, search may generate IO load and may took long time.
*
* Route computation can be long depending on the complexity of the route
* (the further away the endpoints, the more difficult the routing).
@@ -132,10 +133,29 @@
private:
+ /**
+ * Lookup routable node by Qt LocationEntry
+ *
+ * @param routingService
+ * @param location
+ * @return possible routable node. When no routable node node is found, nullopt is returned.
+ */
+ std::optional<RoutePosition> LocationToRoutePosition(osmscout::MultiDBRoutingServiceRef &routingService,
+ const LocationEntryRef &location);
+
+ /**
+ * Synchronous method for routing. Emits multiple routingProgress followed by one of:
+ * routeComputed, routeCanceled or routeFailed.
+ *
+ * @param routingService
+ * @param start
+ * @param target
+ * @param requestId
+ * @param breaker
+ */
void ProcessRouteRequest(osmscout::MultiDBRoutingServiceRef &routingService,
const LocationEntryRef &start,
const LocationEntryRef &target,
- osmscout::Vehicle vehicle,
int requestId,
const osmscout::BreakerRef &breaker);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/src/osmscoutclientqt/InstalledVoicesModel.cpp
^
|
| @@ -138,26 +138,27 @@
return;
}
+#if QT_VERSION < 0x060000
if (mediaPlayer==nullptr){
assert(currentPlaylist==nullptr);
mediaPlayer = new QMediaPlayer(this);
-#if QT_VERSION < 0x060000
currentPlaylist = new QMediaPlaylist(mediaPlayer);
mediaPlayer->setPlaylist(currentPlaylist);
-#endif
}
currentPlaylist->clear();
for (const auto& file : sample){
auto sampleUrl = QUrl::fromLocalFile(voice.getDir().path() + QDir::separator() + file);
-#if QT_VERSION < 0x060000
qDebug() << "Adding to playlist:" << sampleUrl;
currentPlaylist->addMedia(sampleUrl);
-#endif
}
currentPlaylist->setCurrentIndex(0);
+#else
+ // TODO: add support for Qt6
+ qWarning() << "Audio playback is not supported with Qt6 yet";
+#endif
mediaPlayer->play();
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/src/osmscoutclientqt/MapWidget.cpp
^
|
| @@ -164,7 +164,7 @@
this, &MapWidget::changeView);
if (locked != inputHandler->isLockedToPosition()){
- emit lockToPossitionChanged();
+ emit lockToPositionChanged();
}
//qDebug() << "Input handler changed (" << (newGesture->animationInProgress()? "animation": "stationary") << ")";
}
@@ -178,12 +178,36 @@
{
//qDebug() << "viewChanged: " << QString::fromStdString(updated.center.GetDisplayText()) << " level: " << updated.magnification.GetLevel();
//qDebug() << "viewChanged (" << (inputHandler->animationInProgress()? "animation": "stationary") << ")";
+ assert(view);
bool changed = *view != updated;
- view->operator =( updated );
+ bool latChangedFlag = floor(view->GetLat()*10000) != floor(updated.GetLat()*10000);
+ bool lonChangedFlag = floor(view->GetLon()*10000) != floor(updated.GetLon()*10000);
+ bool angleChangedFlag = floor(view->angle.AsRadians()*10000) != floor(updated.angle.AsRadians()*10000);
+ bool magLevelChangedFlag = view->magnification.GetLevel() != updated.magnification.GetLevel();
+
+ double oldPixelSize = floor(GetPixelSize()*1000);
+ *view = updated;
+ bool pixelSizeChangedFlag = oldPixelSize != floor(GetPixelSize()*1000);
+
// make sure that we render map with antialiasing. TODO: do it better
if (changed || (!inputHandler->animationInProgress())){
redraw();
}
+ if (latChangedFlag) {
+ emit latChanged();
+ }
+ if (lonChangedFlag) {
+ emit lonChanged();
+ }
+ if (angleChangedFlag) {
+ emit angleChanged();
+ }
+ if (magLevelChangedFlag) {
+ emit magLevelChanged();
+ }
+ if (pixelSizeChangedFlag) {
+ emit pixelSizeChanged();
+ }
if (changed){
emit viewChanged();
}
@@ -790,7 +814,6 @@
// discard current input handler
setupInputHandler(new InputHandler(*view));
- emit viewChanged();
}
void MapWidget::onResize()
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/src/osmscoutclientqt/Router.cpp
^
|
| @@ -151,34 +151,57 @@
}
}
+std::optional<RoutePosition> Router::LocationToRoutePosition(osmscout::MultiDBRoutingServiceRef &routingService,
+ const LocationEntryRef &location)
+{
+ RoutePositionResult routePositionResult;
+ if (auto dbId=routingService->GetDatabaseId(location->getDatabase().toStdString()); dbId) {
+ std::vector<ObjectFileRef> refs;
+ for (const auto &ref:location->getReferences()){
+ refs.emplace_back(ref);
+ }
+ routePositionResult=routingService->GetRoutableNode(*dbId, refs);
+ if (!routePositionResult.IsValid()) {
+ log.Debug() << location->getLabel().toStdString() << " doesn't have routable node";
+ }
+ }
+
+ if (!routePositionResult.IsValid()) {
+ routePositionResult = routingService->GetClosestRoutableNode(location->getCoord(),
+ /*radius*/ Kilometers(1));
+ }
+ if (!routePositionResult.IsValid()) {
+ return std::nullopt;
+ }
+
+ return routePositionResult.GetRoutePosition();
+}
+
void Router::ProcessRouteRequest(osmscout::MultiDBRoutingServiceRef &routingService,
const LocationEntryRef &start,
const LocationEntryRef &target,
- osmscout::Vehicle /*vehicle*/,
int requestId,
const osmscout::BreakerRef &breaker)
{
- auto startResult=routingService->GetClosestRoutableNode(
- start->getCoord(),
- /*radius*/ Kilometers(1));
- if (!startResult.IsValid()){
+ std::optional<RoutePosition> startNodeOpt=LocationToRoutePosition(routingService, start);
+ if (!startNodeOpt) {
osmscout::log.Warn() << "Can't found route node near start coord " << start->getCoord().GetDisplayText();
- emit routeFailed(QString("Can't found route node near start coord %1").arg(QString::fromStdString(start->getCoord().GetDisplayText())),
+ emit routeFailed(QString("Can't found route node near start coord %1").arg(
+ QString::fromStdString(start->getCoord().GetDisplayText())),
requestId);
return;
}
- osmscout::RoutePosition startNode=startResult.GetRoutePosition();
+ RoutePosition startNode=*startNodeOpt;
- auto targetResult=routingService->GetClosestRoutableNode(
- target->getCoord(),
- /*radius*/ Kilometers(1));
- if (!targetResult.IsValid()){
- osmscout::log.Warn() << "Can't found route node near target coord " << target->getCoord().GetDisplayText();
- emit routeFailed(QString("Can't found route node near target coord %1").arg(QString::fromStdString(target->getCoord().GetDisplayText())),
+ std::optional<RoutePosition> targetNodeOpt=LocationToRoutePosition(routingService, target);
+ if (!targetNodeOpt) {
+ osmscout::log.Warn() << "Can't found route node near target coord " << start->getCoord().GetDisplayText();
+ emit routeFailed(QString("Can't found route node near target coord %1").arg(
+ QString::fromStdString(start->getCoord().GetDisplayText())),
requestId);
return;
}
- osmscout::RoutePosition targetNode=targetResult.GetRoutePosition();
+ RoutePosition targetNode=*targetNodeOpt;
osmscout::RouteData routeData;
if (!CalculateRoute(routingService,
@@ -234,8 +257,8 @@
int requestId,
osmscout::BreakerRef breaker)
{
- osmscout::log.Debug() << "Routing from '" << start->getLabel().toLocal8Bit().data() <<
- "' to '" << target->getLabel().toLocal8Bit().data() << "'" <<
+ osmscout::log.Debug() << "Routing from '" << start->getLabel().toStdString() <<
+ "' to '" << target->getLabel().toStdString() << "'" <<
" by '" << vehicleStr(profile->getVehicle()) << "'";
dbThread->RunSynchronousJob(
@@ -246,7 +269,7 @@
emit routeFailed("Can't open routing service",requestId);
return;
}
- ProcessRouteRequest(routingService,start,target,profile->getVehicle(),requestId,breaker);
+ ProcessRouteRequest(routingService,start,target,requestId,breaker);
routingService->Close();
}
);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/libosmscout-import/src/osmscoutimport/GenRouteDat.cpp
^
|
| @@ -188,7 +188,7 @@
}
if (!accessRestrictedValue->CanAccessBicycle()) {
- flags|=RouteNode::restrictedForFoot;
+ flags|=RouteNode::restrictedForBicycle;
}
if (!accessRestrictedValue->CanAccessCar()) {
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/libosmscout-map-directx/src/osmscoutmapdirectx/MapPainterDirectX.cpp
^
|
| @@ -275,6 +275,7 @@
return pStrokeStyle;
}
}
+ delete[] dashes;
}
if (m_dashLessStrokeStyle == nullptr)
{
@@ -784,7 +785,7 @@
GetStrokeStyle(polygon->GetBorderStyle()->GetDash()));
}
pPathGeometry->Release();
- delete coords;
+ delete[] coords;
}
}
else if (RectanglePrimitive* rectangle = dynamic_cast<RectanglePrimitive*>(primitive);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/routing/MultiDBRoutingService.h
^
|
| @@ -126,6 +126,17 @@
void Close();
+ /**
+ * Return first usable routable node from given object references.
+ *
+ * @param dbId
+ * ID of database where objects exists.
+ * @param refs
+ * References to possible routable objects
+ * @return routable node on object (way)
+ */
+ RoutePositionResult GetRoutableNode(const DatabaseId &dbId, const std::vector<ObjectFileRef> &refs);
+
RoutePositionResult GetClosestRoutableNode(const GeoCoord &coord,
const Distance &radius=Kilometers(1)) const;
@@ -147,6 +158,8 @@
const std::list<RoutePostprocessor::PostprocessorRef> &postprocessors);
std::map<DatabaseId, std::string> GetDatabaseMapping() const override;
+
+ std::optional<DatabaseId> GetDatabaseId(const std::string& databasePath) const;
};
//! \ingroup Service
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/routing/SimpleRoutingService.h
^
|
| @@ -205,6 +205,41 @@
const Distance &radius,
const RoutingParameter& parameter);
+ /**
+ * Return routable node on specific object, when this object is routable
+ * and usable by provided profile.
+ *
+ * @param objRef
+ * @param profile
+ * Routing profile to use. It defines Vehicle to use and allowed objects.
+ * @return routable node on object (way)
+ */
+ RoutePositionResult GetRoutableNode(const ObjectFileRef& objRef,
+ const RoutingProfile& profile) const;
+
+ /**
+ * Returns the closest routable object (area or way) relative
+ * to the given coordinate.
+ *
+ * The result should be use as input for the router to define
+ * routing start or end point.
+ *
+ * @note The returned node may in fact not be routable, it is just
+ * the closest node to the given position on a routable way or area.
+ *
+ * @note The actual object may not be within the given radius
+ * due to internal search index resolution.
+ *
+ * @param coord
+ * coordinate of the search center
+ * @param profile
+ * Routing profile to use. It defines Vehicle to use and allowed objects.
+ * @param radius
+ * The maximum radius to search in from the search center
+ * @return
+ * A reference to a node on a way or area that is routable (if returned
+ * route position is valid)
+ */
RoutePositionResult GetClosestRoutableNode(const GeoCoord& coord,
const RoutingProfile& profile,
const Distance &radius) const;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/util/Geometry.h
^
|
| @@ -48,14 +48,14 @@
/**
* \defgroup Geometry Geometric helper
*
- * Collection of classes and methods releated to low level geometric
+ * Collection of classes and methods related to low level geometric
* stuff.
*/
/**
* \ingroup Geometry
- * @param deg angl ein degrees
+ * @param deg angle in degrees
* @return angle in radians
*/
inline double DegToRad(double deg)
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/libosmscout/src/osmscout/routing/MultiDBRoutingService.cpp
^
|
| @@ -120,6 +120,25 @@
isOpen=false;
}
+ RoutePositionResult MultiDBRoutingService::GetRoutableNode(const DatabaseId &dbId, const std::vector<ObjectFileRef> &refs)
+ {
+ auto handleIt = std::find_if(handles.begin(), handles.end(),
+ [dbId](const DatabaseHandle& handle) -> bool { return handle.dbId == dbId; });
+ if (handleIt == handles.end()) {
+ return RoutePositionResult();
+ }
+ for (auto const &ref: refs) {
+ RoutePositionResult res = handleIt->router->GetRoutableNode(ref, *handleIt->profile);
+ if (res.IsValid()) {
+ return RoutePositionResult(RoutePosition(res.GetRoutePosition().GetObjectFileRef(),
+ res.GetRoutePosition().GetNodeIndex(),
+ /*database*/ dbId),
+ res.GetDistance());
+ }
+ }
+ return RoutePositionResult();
+ }
+
RoutePositionResult MultiDBRoutingService::GetClosestRoutableNode(const GeoCoord& coord,
const Distance &radius) const
{
@@ -513,6 +532,16 @@
return mapping;
}
+ std::optional<DatabaseId> MultiDBRoutingService::GetDatabaseId(const std::string& databasePath) const
+ {
+ for (const auto &handle:handles){
+ if (databasePath==handle.database->GetPath()) {
+ return handle.dbId;
+ }
+ }
+ return std::nullopt;
+ }
+
// FIXME: I don't understand why these methods should be here...
RouteDescriptionResult MultiDBRoutingService::TransformRouteDataToRouteDescription(const RouteData& data)
{
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/libosmscout/src/osmscout/routing/SimpleRoutingService.cpp
^
|
| @@ -454,29 +454,54 @@
}
}
- /**
- * Returns the closest routeable object (area or way) relative
- * to the given coordinate.
- *
- * The result should be use as imput for the router to define
- * routing start or end point.
- *
- * @note The returned node may in fact not be routable, it is just
- * the closest node to the given position on a routable way or area.
- *
- * @note The actual object may not be within the given radius
- * due to internal search index resolution.
- *
- * @param coord
- * coordinate of the search center
- * @param profile
- * Routing profile to use. It defines Vehicle to use
- * @param radius
- * The maximum radius to search in from the search center
- * @return
- * A reference to a node on a way or area that is routable (if returned
- * route position is valid)
- */
+ RoutePositionResult SimpleRoutingService::GetRoutableNode(const ObjectFileRef& objRef,
+ const RoutingProfile& profile) const
+ {
+ TypeConfigRef typeConfig=database->GetTypeConfig();
+ RoutePositionResult position;
+
+ if (!typeConfig) {
+ log.Error() << "TypeConfig is invalid!";
+ return position;
+ }
+
+ if (objRef.IsWay()) {
+ WayDataFileRef wayDataFile=database->GetWayDataFile();
+ if (!wayDataFile) {
+ log.Error() << "Way data file is invalid!";
+ return position;
+ }
+ WayRef way;
+ if (!wayDataFile->GetByOffset(objRef.GetFileOffset(), way)) {
+ log.Error() << "Cannot read " << objRef.GetName();
+ return position;
+ }
+ if (!profile.CanUse(*way)) {
+ return position;
+ }
+ if (!HasNodeWithId(way->nodes)) {
+ return position;
+ }
+ // way distance center
+ Distance wayLength;
+ for (size_t i=0; i<way->nodes.size()-1; i++){
+ wayLength+=GetSphericalDistance(way->nodes[i].GetCoord(), way->nodes[i+1].GetCoord());
+ }
+ size_t wayCenter=0;
+ for (Distance d; wayCenter < way->nodes.size() - 1; wayCenter++){
+ d+=GetSphericalDistance(way->nodes[wayCenter].GetCoord(), way->nodes[wayCenter+1].GetCoord());
+ if (d>wayLength/2) {
+ break;
+ }
+ }
+
+ position=RoutePositionResult(RoutePosition(way->GetObjectFileRef(), wayCenter,/*database*/0), Distance::Zero());
+ }
+ // TODO: support areas in router
+
+ return position;
+ }
+
RoutePositionResult SimpleRoutingService::GetClosestRoutableNode(const GeoCoord& coord,
const RoutingProfile& profile,
const Distance &radius) const
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/dependencies/libosmscout/webpage/content/documentation/download.md
^
|
| @@ -15,14 +15,14 @@
There are currently no regular source snapshots in form of downloadable archives
or versioned tarballs. You have to download the library sources and the demo
applications manually by cloning the git repository and build everything yourself.
-The sources use autoconf or cmake to setup the build.
+The sources use CMake or Meson to setup the build.
-You can browse the reprository at https://sourceforge.net/p/libosmscout/code/ci/master/tree/.
+You can browse the repository at https://github.com/Framstag/libosmscout.
To clone the repository use
```bash
- $ git clone git://git.code.sf.net/p/libosmscout/code libosmscout-code
+git clone https://github.com/Framstag/libosmscout.git
```
See [Building]({{< relref "/documentation/source.md" >}}) for details on how to
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/graphics/convertIcon.sh
^
|
| @@ -0,0 +1,5 @@
+#!/bin/bash
+
+for size in 86x86 108x108 128x128 172x172 256x256 ; do
+ convert -background none graphics/harbour-osmscout-v2.svg -resize $size icons/$size/harbour-osmscout.png
+done
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/graphics/cover-2.28.svg
^
|
| @@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ width="845"
+ height="422"
+ id="svg2054"
+ version="1.1"
+ sodipodi:docname="cover-2.17.svg"
+ inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata
+ id="metadata14">
+ <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>
+ <defs
+ id="defs12">
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect68354"
+ is_visible="true"
+ lpeversion="1" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect67275"
+ is_visible="true"
+ lpeversion="1" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect61307"
+ is_visible="true"
+ lpeversion="1" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect60161"
+ is_visible="true"
+ lpeversion="1" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect58467"
+ is_visible="true"
+ lpeversion="1" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect52944"
+ is_visible="true"
+ lpeversion="1" />
+ <filter
+ inkscape:collect="always"
+ style="color-interpolation-filters:sRGB"
+ id="filter51493"
+ x="-0.2313123"
+ y="-0.37891728"
+ width="1.4626246"
+ height="1.7578346">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="3.0860482"
+ id="feGaussianBlur51495" />
+ </filter>
+ <meshgradient
+ inkscape:collect="always"
+ id="meshgradient21283"
+ gradientUnits="userSpaceOnUse"
+ x="-332.61957"
+ y="814.60327">
+ <meshrow
+ id="meshrow47633">
+ <meshpatch
+ id="meshpatch47635">
+ <stop
+ path="c 5.2076,-5.43232e-05 13.5814,1.93095 18.7891,1.93095"
+ style="stop-color:#ffffff;stop-opacity:1"
+ id="stop47637" />
+ <stop
+ path="c 0.22361,7.77765 -1.84395,8.97825 -1.84406,16.3893"
+ style="stop-color:#a17e34;stop-opacity:1"
+ id="stop47639" />
+ <stop
+ path="c -5.20756,0.000281765 -8.57128,5.84397 -13.779,5.84397"
+ style="stop-color:#a17e34;stop-opacity:1"
+ id="stop47641" />
+ <stop
+ path="c 0,-7.41092 -3.16582,-16.7528 -3.16604,-24.1642"
+ style="stop-color:#a17e34;stop-opacity:1"
+ id="stop47643" />
+ </meshpatch>
+ <meshpatch
+ id="meshpatch47645">
+ <stop
+ path="c 5.2077,0 9.81985,0.929076 15.0274,0.929122"
+ id="stop47647" />
+ <stop
+ path="c 0.000144097,7.41081 0.595604,13.893 0.595604,21.3039"
+ style="stop-color:#5b471d;stop-opacity:1"
+ id="stop47649" />
+ <stop
+ path="c -2.11035,-6.44281 -10.3606,-5.23983 -17.4671,-5.84374"
+ style="stop-color:#a17e34;stop-opacity:1"
+ id="stop47651" />
+ </meshpatch>
+ </meshrow>
+ <meshrow
+ id="meshrow47653">
+ <meshpatch
+ id="meshpatch47655">
+ <stop
+ path="c -1.68717,14.2356 1.43271,21.6624 1.84406,28.0763"
+ id="stop47657" />
+ <stop
+ path="c -5.2077,0 -10.4154,0 -15.6231,1.13687e-13"
+ style="stop-color:#a17e34;stop-opacity:1"
+ id="stop47659" />
+ <stop
+ path="c -5.68434e-14,-7.41092 -5.68434e-14,-14.8218 4e-05,-22.2324"
+ style="stop-color:#cbb55e;stop-opacity:1"
+ id="stop47661" />
+ </meshpatch>
+ <meshpatch
+ id="meshpatch47663">
+ <stop
+ path="c 0,7.41092 -4.3727,6.98682 -4.37276,14.3978"
+ id="stop47665" />
+ <stop
+ path="c -5.20757,-0.000164599 -6.04249,7.83479 -11.2502,7.83478"
+ style="stop-color:#1f180a;stop-opacity:1"
+ id="stop47667" />
+ </meshpatch>
+ </meshrow>
+ </meshgradient>
+ <filter
+ inkscape:collect="always"
+ style="color-interpolation-filters:sRGB"
+ id="filter48085"
+ x="-0.011683676"
+ y="-0.0082102014"
+ width="1.0233674"
+ height="1.0164204">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.1521128"
+ id="feGaussianBlur48087" />
+ </filter>
+ </defs>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="1136"
+ id="namedview10"
+ showgrid="false"
+ inkscape:zoom="0.87407407"
+ inkscape:cx="353.51695"
+ inkscape:cy="253.98305"
+ inkscape:window-x="1920"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2054"
+ inkscape:pagecheckerboard="0" />
+ <image
+ sodipodi:absref="/home/karry/SailfishOS/projects/osmscout-sailfish/graphics/cover-2.17.jpg"
+ xlink:href="cover-2.17.jpg"
+ y="0"
+ x="0"
+ id="image892"
+ style="image-rendering:optimizeSpeed"
+ preserveAspectRatio="none"
+ height="422"
+ width="845" />
+ <g
+ id="label"
+ transform="matrix(1.4841993,0,0,1.4841993,49.48781,-1166.5396)"
+ style="opacity:1">
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50px;line-height:99%;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
+ x="263.37292"
+ y="835.81036"
+ id="text4187"><tspan
+ style="fill:#411f11;fill-opacity:0.734982"
|
|
|
Added |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/graphics/harbour-osmscout-v2-draft.jpg
^
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/graphics/harbour-osmscout-v2.svg
^
|
| @@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 17.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+
+<svg
+ version="1.1"
+ x="0px"
+ y="0px"
+ width="512"
+ height="512"
+ viewBox="0 0 512.00001 512.00001"
+ enable-background="new 0 0 86 86"
+ xml:space="preserve"
+ id="svg2"
+ inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+ sodipodi:docname="harbour-osmscout-v2.svg"
+ inkscape:export-filename="/home/karry/SailfishOS/projects/osmscout-sailfish/icons/172x172/harbour-osmscout.png"
+ inkscape:export-xdpi="193.8"
+ inkscape:export-ydpi="193.8"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+ id="metadata27"><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><defs
+ id="defs25"><linearGradient
+ inkscape:collect="always"
+ id="linearGradient12235"><stop
+ style="stop-color:#337b24;stop-opacity:0.00232611"
+ offset="0"
+ id="stop12231" /><stop
+ style="stop-color:#cff0c8;stop-opacity:0.59746665"
+ offset="1"
+ id="stop12233" /></linearGradient><inkscape:path-effect
+ effect="bspline"
+ id="path-effect4484"
+ is_visible="true"
+ lpeversion="1"
+ weight="33.333333"
+ steps="2"
+ helper_size="0"
+ apply_no_weight="true"
+ apply_with_weight="true"
+ only_selected="false" /><inkscape:path-effect
+ effect="bspline"
+ id="path-effect4180"
+ is_visible="true"
+ lpeversion="1"
+ weight="33.333333"
+ steps="2"
+ helper_size="0"
+ apply_no_weight="true"
+ apply_with_weight="true"
+ only_selected="false" /><inkscape:path-effect
+ effect="bspline"
+ id="path-effect1827"
+ is_visible="true"
+ lpeversion="1"
+ weight="33.333333"
+ steps="2"
+ helper_size="0"
+ apply_no_weight="true"
+ apply_with_weight="true"
+ only_selected="false" /><inkscape:path-effect
+ effect="bspline"
+ id="path-effect1823"
+ is_visible="true"
+ lpeversion="1"
+ weight="33.333333"
+ steps="2"
+ helper_size="0"
+ apply_no_weight="true"
+ apply_with_weight="true"
+ only_selected="false" /><inkscape:path-effect
+ effect="spiro"
+ id="path-effect4217"
+ is_visible="true" /><inkscape:path-effect
+ effect="spiro"
+ id="path-effect4213"
+ is_visible="true" /><linearGradient
+ gradientTransform="matrix(0,1,1,0,0,-655.1376)"
+ y2="0.76490003"
+ x2="740.37012"
+ y1="85.232498"
+ x1="655.90253"
+ gradientUnits="userSpaceOnUse"
+ id="SVGID_1_-7"><stop
+ id="stop4193"
+ style="stop-color:#00ba3f;stop-opacity:1"
+ offset="0" /><stop
+ id="stop4195"
+ style="stop-color:#47b531;stop-opacity:1"
+ offset="1" /></linearGradient><inkscape:path-effect
+ effect="bspline"
+ id="path-effect4484-3"
+ is_visible="true"
+ lpeversion="1"
+ weight="33.333333"
+ steps="2"
+ helper_size="0"
+ apply_no_weight="true"
+ apply_with_weight="true"
+ only_selected="false" /><inkscape:path-effect
+ effect="bspline"
+ id="path-effect4484-3-7"
+ is_visible="true"
+ lpeversion="1"
+ weight="33.333333"
+ steps="2"
+ helper_size="0"
+ apply_no_weight="true"
+ apply_with_weight="true"
+ only_selected="false" /><inkscape:path-effect
+ effect="bspline"
+ id="path-effect4484-3-3"
+ is_visible="true"
+ lpeversion="1"
+ weight="33.333333"
+ steps="2"
+ helper_size="0"
+ apply_no_weight="true"
+ apply_with_weight="true"
+ only_selected="false" /><linearGradient
+ inkscape:collect="always"
+ xlink:href="#SVGID_1_-7-2"
+ id="linearGradient4161"
+ x1="6.0553517"
+ y1="80.975349"
+ x2="68.927933"
+ y2="18.746954"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(6.0093896,0,0,5.9953162,-2.4731467,-427.226)" /><linearGradient
+ gradientTransform="matrix(0,1,1,0,0,-655.1376)"
+ y2="0.76490003"
+ x2="740.37012"
+ y1="85.232498"
+ x1="655.90253"
+ gradientUnits="userSpaceOnUse"
+ id="SVGID_1_-7-2"><stop
+ id="stop4193-9"
+ style="stop-color:#008c30;stop-opacity:1"
+ offset="0" /><stop
+ id="stop4195-1"
+ style="stop-color:#47B531"
+ offset="1" /></linearGradient><inkscape:path-effect
+ effect="bspline"
+ id="path-effect4484-3-2"
+ is_visible="true"
+ lpeversion="1"
+ weight="33.333333"
+ steps="2"
+ helper_size="0"
+ apply_no_weight="true"
+ apply_with_weight="true"
+ only_selected="false" /><linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient12235"
+ id="linearGradient12237"
+ x1="239.84106"
+ y1="-674.77716"
+ x2="284.42813"
+ y2="-831.86847"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-23.51394,609.92617)" /></defs><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="3840"
+ inkscape:window-height="2082"
+ id="namedview23"
+ showgrid="false"
+ inkscape:zoom="1.372093"
+ inkscape:cx="450.04237"
+ inkscape:cy="342.17797"
+ inkscape:window-x="1920"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="Layer_1"
+ units="px"
+ inkscape:pagecheckerboard="0" /><g
+ id="Layer_2"
+ display="none"
+ style="display:none"
+ transform="translate(0,426.00002)" /><g
+ id="Layer_1"
+ transform="translate(0,426.00002)"><linearGradient
+ id="SVGID_1_"
+ gradientUnits="userSpaceOnUse"
+ x1="655.90253"
+ y1="85.232498"
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/icons/108x108/harbour-osmscout.png
^
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/icons/128x128/harbour-osmscout.png
^
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/icons/172x172/harbour-osmscout.png
^
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/icons/256x256/harbour-osmscout.png
^
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/icons/86x86/harbour-osmscout.png
^
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/pics/cover.jpg
^
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/qml/custom/Global.qml
^
|
| @@ -42,12 +42,14 @@
id: settings
onUnitsChanged: {
Utils.distanceUnits = settings.units;
+ console.log("Utils.distanceUnits: " + Utils.distanceUnits);
}
Component.onCompleted: {
Utils.distanceUnits = settings.units;
Utils.gpsFormat = AppSettings.gpsFormat;
AppSettings.onGpsFormatChanged.connect(function(){
Utils.gpsFormat = AppSettings.gpsFormat;
+ console.log("Utils.gpsFormat: " + Utils.gpsFormat);
});
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/qml/custom/MapBase.qml
^
|
| @@ -28,13 +28,10 @@
view: map.view
enabled: AppSettings.hillShades
opacity: AppSettings.hillShadesOpacity
- // If you intend to use tiles from OpenMapSurfer services in your own applications please contact us.
- // https://korona.geog.uni-heidelberg.de/contact.html
provider: {
"id": "ASTER_GDEM",
"name": "Hillshade",
"servers": [
- //"https://korona.geog.uni-heidelberg.de/tiles/asterh/x=%2&y=%3&z=%1"
"https://osmscout.karry.cz/hillshade/tile.php?z=%1&x=%2&y=%3"
],
"maximumZoomLevel": 19,
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/qml/custom/Utils.js
^
|
| @@ -60,21 +60,35 @@
if (typeof distanceUnits != "undefined" && distanceUnits == "imperial"){
var feet = distance * 3.2808;
if (feet < 1500){
- return Math.round(feet) + " " + qsTr("feet");
+ return qsTr("%n feet", "", Math.round(feet));
}
var miles = distance / 1609.344;
if (miles < 20){
- return (Math.round(miles * 10)/10) + " " + qsTr("miles");
+ miles = Math.round(miles * 10)/10;
+ if (miles % 1 == 0) {
+ // use plurals just when it is not fraction
+ return qsTr("%n miles", "", miles);
+ }
+ //: fraction of miles, %n cannot be used
+ return qsTr("%1 miles").arg(miles);
}
- return Math.round(miles) + " " + qsTr("miles");
+ return qsTr("%n miles", "", Math.round(miles));
}else{
if (distance < 1500){
- return Math.round(distance) + " " + qsTr("meters");
+ return qsTr("%n meters", "", Math.round(distance));
}
if (distance < 20000){
- return (Math.round((distance/1000) * 10)/10) + " " + qsTr("km");
+ var kilometers = Math.round((distance/1000) * 10)/10;
+ if (kilometers % 1 == 0) {
+ // use plurals just when it is not fraction
+ //: N kilometers
+ return qsTr("%n km", "", kilometers);
+ }
+ //: fraction of kilometers, %n cannot be used
+ return qsTr("%1 km").arg(kilometers);
}
- return Math.round(distance/1000) + " " + qsTr("km");
+ //: N kilometers
+ return qsTr("%n km", "", Math.round(distance/1000));
}
}
@@ -85,24 +99,43 @@
if (typeof distanceUnits != "undefined" && distanceUnits == "imperial"){
var feet = distance * 3.2808;
if (feet < 1500){
- return Math.round(feet) + " " + qsTr("ft");
+ //: N feet
+ return qsTr("%n ft", "", Math.round(feet));
}
var miles = distance / 1609.344;
if (miles < 20){
- return (Math.round(miles * 10)/10) + " " + qsTr("mi");
+ miles = Math.round(miles * 10)/10;
+ if (miles % 1 == 0) {
+ // use plurals just when it is not fraction
+ //: N miles
+ return qsTr("%n mi", "", miles);
+ }
+ //: fraction of miles, %n cannot be used
+ return qsTr("%1 mi").arg(miles);
}
- return Math.round(miles) + " " + qsTr("mi");
+ //: N miles
+ return qsTr("%n mi", "", Math.round(miles));
}else{
if (distance < 1500){
- return Math.round(distance) + " " + qsTr("m");
+ //: N meters
+ return qsTr("%n m", "", Math.round(distance));
}
if (distance < 20000){
- return (Math.round((distance/1000) * 10)/10) + " " + qsTr("km");
+ var kilometers = Math.round((distance/1000) * 10)/10;
+ if (kilometers % 1 == 0) {
+ // use plurals just when it is not fraction
+ //: N kilometers
+ return qsTr("%n km", "", kilometers);
+ }
+ //: fraction of kilometers, %n cannot be used
+ return qsTr("%1 km").arg(kilometers);
}
- return Math.round(distance/1000) + " " + qsTr("km");
+ //: N kilometers
+ return qsTr("%n km", "", Math.round(distance/1000));
}
}
+
/**
* This variant is used in navigation, it is using miles/yards or km/meters
*/
@@ -110,32 +143,61 @@
if (typeof distanceUnits != "undefined" && distanceUnits == "imperial"){
var yards = distance * 0.9144;
if (yards < 150){
- return (Math.round(yards / 10) * 10) + " " + qsTr("yards");
+ return qsTr("%n yards", "", (Math.round(yards / 10) * 10));
}
if (yards < 1000){
- return (Math.round(yards / 100) * 100) + " " + qsTr("yards");
+ return qsTr("%n yards", "", (Math.round(yards / 100) * 100));
}
var miles = distance / 1609.344;
if (miles < 2){
- return (Math.round(miles *10) / 10) + " " + qsTr("miles");
+ miles = Math.round(miles *10) / 10;
+ if (miles %1 == 0) {
+ // use plurals just when it is not fraction
+ return qsTr("%n miles", "", miles);
+ }
+ return qsTr("%1 miles").arg(miles);
}
- return Math.round(miles) + " " + qsTr("miles");
+ return qsTr("%n miles", "", Math.round(miles));
}else{
if (distance < 150){
- return Math.round(distance/10)*10 + " "+ qsTr("meters");
+ return qsTr("%n meters", "", Math.round(distance/10)*10);
}
if (distance < 2000){
- return Math.round(distance/100)*100 + " "+ qsTr("meters");
+ return qsTr("%n meters", "", Math.round(distance/100)*100);
}
- return Math.round(distance/1000) + " "+ qsTr("km");
+ return qsTr("%n km", "", Math.round(distance/1000));
+ }
+}
+
+/**
+ * elevation is always displayed with base units (m / ft), not km or miles
+ */
+function elevation(distance){
+ if (typeof distanceUnits != "undefined" && distanceUnits == "imperial"){
+ var feet = distance * 3.2808;
+ return qsTr("%n feet", "", Math.round(feet));
+ }else{
+ return qsTr("%n meters", "", Math.round(distance));
+ }
+}
+
+/**
+ * elevation is always displayed with base units (m / ft), not km or miles
+ */
+function elevationShort(distance){
+ if (typeof distanceUnits != "undefined" && distanceUnits == "imperial"){
+ var feet = distance * 3.2808;
+ return qsTr("%n ft", "", Math.round(feet));
+ }else{
+ return qsTr("%n m", "", Math.round(distance));
}
}
function humanSmallDistance(meters){
return distanceUnits == "imperial" ?
- qsTr("%1 ft").arg(Math.round(meters * 3.2808)) :
- qsTr("%1 m").arg(Math.round(meters));
+ qsTr("%n ft", "", Math.round(meters * 3.2808)) :
+ qsTr("%n m", "", Math.round(meters));
}
function humanSpeed(kmph){
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/qml/desktop.qml
^
|
| @@ -273,13 +273,10 @@
view: map.view
enabled: true
opacity: 0.7
- // If you intend to use tiles from OpenMapSurfer services in your own applications please contact us.
- // https://korona.geog.uni-heidelberg.de/contact.html
provider: {
"id": "ASTER_GDEM",
"name": "Hillshade",
"servers": [
- //"https://korona.geog.uni-heidelberg.de/tiles/asterh/x=%2&y=%3&z=%1"
"https://osmscout.karry.cz/hillshade/tile.php?z=%1&x=%2&y=%3"
],
"maximumZoomLevel": 18,
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/qml/pages/CollectionTrack.qml
^
|
| @@ -233,12 +233,12 @@
DetailItem {
id: ascent
label: qsTr("Ascent")
- value: Utils.humanSmallDistance(trackModel.ascent)
+ value: Utils.elevation(trackModel.ascent)
}
DetailItem {
id: descent
label: qsTr("Descent")
- value: Utils.humanSmallDistance(trackModel.descent)
+ value: Utils.elevation(trackModel.descent)
}
TrackElevationChart {
id: elevationChart
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/qml/pages/Collections.qml
^
|
| @@ -47,6 +47,29 @@
}
}
+ TouchInteractionHint {
+ id: hint
+ loops: 5
+
+ interactionMode: TouchInteraction.Pull
+ direction: TouchInteraction.Down
+
+ Connections {
+ target: collectionListModel
+ onLoadingChanged: {
+ if (!collectionListModel.loading && collectionListModel.rowCount() == 0) {
+ hint.start()
+ }
+ }
+ }
+ }
+ InteractionHintLabel {
+ anchors.bottom: parent.bottom
+ text: qsTr("Pull down to import collection or create empty one")
+ opacity: hint.running ? 1.0 : 0.0
+ Behavior on opacity { FadeAnimation { duration: 1000 } }
+ }
+
SilicaListView {
id: collectionListView
anchors.fill: parent
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/qml/pages/MapPage.qml
^
|
| @@ -235,7 +235,7 @@
var params = arr[1].split('&');
for (var i=0; i < params.length; i++){
if (Utils.startsWith(params[i], "q=")) {
- search=params[i].substring(2);
+ search=decodeURIComponent(params[i].substring(2));
}
}
}
@@ -409,6 +409,44 @@
VerticalScrollDecorator {}
+ TouchInteractionHint {
+ id: hint
+ loops: 5
+
+ interactionMode: TouchInteraction.Swipe
+ direction: TouchInteraction.Up
+
+ Connections {
+ target: drawer
+ onOpenChanged: {
+ if (counter.active && !menu.atYEnd) {
+ hint.start()
+ counter.increase();
+ }
+ }
+ }
+ Connections {
+ target: menu
+ onAtYEndChanged: {
+ if (menu.atYEnd) {
+ hint.stop();
+ }
+ }
+ }
+ }
+ InteractionHintLabel {
+ anchors.bottom: parent.bottom
+ text: qsTr("Scroll down for more entries")
+ opacity: hint.running ? 1.0 : 0.0
+ Behavior on opacity { FadeAnimation { duration: 1000 } }
+ }
+ FirstTimeUseCounter {
+ id: counter
+ limit: 2
+ key: "/apps/harbour-osmscout/menu_hint_count"
+ }
+
+
model: ListModel {
//: menu item for Search on map
ListElement { itemtext: QT_TR_NOOP("Search"); itemicon: "image://theme/icon-m-search"; action: "search"; }
@@ -841,8 +879,8 @@
color: Theme.rgba(Theme.highlightDimmerColor, 0.2)
radius: width*0.5
- rotation: Utils.rad2Deg(map.view.angle)
- opacity: map.view.angle === 0 ? (Global.navigationModel.destinationSet ? 0.4 : 0.0) : 1.0
+ rotation: Utils.rad2Deg(map.angle)
+ opacity: map.angle === 0 ? (Global.navigationModel.destinationSet ? 0.4 : 0.0) : 1.0
Behavior on opacity { PropertyAnimation {} }
Image {
@@ -1561,13 +1599,26 @@
}
Text {
id: elevationLabel
- text: Utils.humanDistanceCompact(Global.positionSource.altitude)
+ text: Utils.elevationShort(Global.positionSource.altitude)
anchors.left: elevationIcon.right
anchors.verticalCenter: parent.verticalCenter
color: Theme.rgba(Theme.primaryColor, 1.0)
font.pointSize: Theme.fontSizeExtraSmall
}
+ MouseArea {
+ id: elevationIndicatorMouseArea
+ anchors.fill: parent
+ onClicked: {
+ var searchPage=pageStack.push(Qt.resolvedUrl("Search.qml"),
+ {
+ searchCenterLat: Global.positionSource.lat,
+ searchCenterLon: Global.positionSource.lon,
+ searchFieldText: "poi:10000:natural_peak",
+ acceptDestination: mapPage
+ });
+ }
+ }
}
Rectangle {
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/qml/pages/Tracker.qml
^
|
| @@ -116,6 +116,37 @@
}
}
+
+ TouchInteractionHint {
+ id: hint
+ loops: 5
+
+ interactionMode: TouchInteraction.Swipe
+ direction: TouchInteraction.Right
+
+ Connections {
+ target: Global.tracker
+ onTrackingChanged: {
+ if (counter.active && Global.tracker.tracking) {
+ hint.start()
+ counter.increase();
+ }
+ }
+ }
+ }
+ InteractionHintLabel {
+ anchors.bottom: parent.bottom
+ text: qsTr("You can return to the map, tracking will continue on background")
+ opacity: hint.running ? 1.0 : 0.0
+ Behavior on opacity { FadeAnimation { duration: 1000 } }
+ }
+ FirstTimeUseCounter {
+ id: counter
+ limit: 2
+ key: "/apps/harbour-osmscout/tracker_hint_count"
+ }
+
+
SilicaFlickable{
id: flickable
anchors.fill: parent
@@ -329,12 +360,12 @@
DetailItem {
id: ascent
label: qsTr("Ascent")
- value: Utils.humanSmallDistance(Global.tracker.ascent)
+ value: Utils.elevation(Global.tracker.ascent)
}
DetailItem {
id: descent
label: qsTr("Descent")
- value: Utils.humanSmallDistance(Global.tracker.descent)
+ value: Utils.elevation(Global.tracker.descent)
}
TrackElevationChart {
id: elevationChart
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/src/OSMScout.cpp
^
|
| @@ -163,11 +163,6 @@
qputenv("NEMO_RESOURCE_CLASS_OVERRIDE", "game");
}
-#ifdef QT_QML_DEBUG
- qWarning() << "Starting QML debugger on port 1234.";
- qQmlEnableDebuggingHelper.startTcpDebugServer(1234);
-#endif
-
OSMScoutQt::RegisterQmlTypes("harbour.osmscout.map", 1, 0);
qRegisterMetaType<MapView*>("MapView*");
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/src/Storage.cpp
^
|
| @@ -270,7 +270,7 @@
sql.append(",").append( "`vert_accuracy` double NULL ");
sql.append(");");
- // TODO: what satelites and compas?
+ // TODO: what satellites and compass?
return sql;
}
@@ -400,7 +400,7 @@
}
if (currentSchema < 3) {
- // from schema v3 track may have type and color and explicit visi column
+ // from schema v3 track may have type and color and explicit visible column
updateTrackTable = true;
updateWaypointTable = true;
}
@@ -434,7 +434,7 @@
}
if (updateTrackTable) {
- // alter waypoint
+ // alter track
updateQueries << "ALTER TABLE `track` RENAME TO `_track`";
updateQueries << sqlCreateTrack();
@@ -570,15 +570,48 @@
return false;
}
+ if (!indexes.contains("idx_track_collection_id")){
+ qDebug() << "creating idx_track_collection_id index";
+
+ QSqlQuery q = db.exec("CREATE INDEX `idx_track_collection_id` on `track` (`collection_id`);");
+ if (q.lastError().isValid()){
+ qWarning() << "Storage: creating idx_track_collection_id index failed" << q.lastError();
+ db.close();
+ return false;
+ }
+ }
+
+ if (!indexes.contains("idx_track_segment_track_id")){
+ qDebug() << "creating idx_track_segment_track_id index";
+
+ QSqlQuery q = db.exec("CREATE INDEX `idx_track_segment_track_id` on `track_segment` (`track_id`);");
+ if (q.lastError().isValid()){
+ qWarning() << "Storage: creating idx_track_segment_track_id index failed" << q.lastError();
+ db.close();
+ return false;
+ }
+ }
+
if (!indexes.contains("idx_track_point_segment_id")){
qDebug() << "creating idx_track_point_segment_id index";
- QSqlQuery q = db.exec("CREATE INDEX idx_track_point_segment_id ON track_point (segment_id)");
+ QSqlQuery q = db.exec("CREATE INDEX `idx_track_point_segment_id` ON `track_point` (`segment_id`)");
if (q.lastError().isValid()){
qWarning() << "Storage: creating idx_track_point_segment_id index failed" << q.lastError();
db.close();
return false;
}
+ }
+
+ if (!indexes.contains("idx_waypoint_collection_id")){
+ qDebug() << "creating idx_waypoint_collection_id index";
+
+ QSqlQuery q = db.exec("CREATE INDEX `idx_waypoint_collection_id` on `waypoint`(`collection_id`);");
+ if (q.lastError().isValid()){
+ qWarning() << "Storage: creating idx_waypoint_collection_id index failed" << q.lastError();
+ db.close();
+ return false;
+ }
}
return true;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/translations/cs.ts
^
|
| @@ -574,6 +574,10 @@
<source>Show none on map</source>
<translation>Nezobrazovat na mapě nic</translation>
</message>
+ <message>
+ <source>Pull down to import collection or create empty one</source>
+ <translation>Potáhněte dolů pro import kolekce nebo vytvoření prázdné</translation>
+ </message>
</context>
<context>
<name>Cover</name>
@@ -921,6 +925,10 @@
<extracomment>remorse dialog</extracomment>
<translation>Mažu</translation>
</message>
+ <message>
+ <source>Scroll down for more entries</source>
+ <translation>Skroluj dolu pro více položek</translation>
+ </message>
</context>
<context>
<name>NavigationInstructions</name>
@@ -1752,18 +1760,14 @@
<extracomment>track type</extracomment>
<translation>Typ</translation>
</message>
+ <message>
+ <source>You can return to the map, tracking will continue on background</source>
+ <translation>Můžete se vrátit na mapu, stopař bude pokračovat na pozadí</translation>
+ </message>
</context>
<context>
<name>Utils</name>
<message>
- <source>meters</source>
- <translation>metrů</translation>
- </message>
- <message>
- <source>km</source>
- <translation>km</translation>
- </message>
- <message>
<source>west</source>
<extracomment>in sense indicating location of some place: "place is located WEST"</extracomment>
<translation>západně</translation>
@@ -1816,36 +1820,99 @@
<translation>severozápadně</translation>
</message>
<message>
- <source>feet</source>
- <translation>stop</translation>
+ <source>ft</source>
+ <translation type="vanished">ft</translation>
</message>
<message>
- <source>miles</source>
- <translation>mil</translation>
+ <source>mi</source>
+ <translation type="vanished">mi</translation>
</message>
<message>
- <source>yards</source>
- <translation>yardů</translation>
+ <source>m</source>
+ <translation type="vanished">m</translation>
</message>
- <message>
- <source>ft</source>
- <translation>ft</translation>
+ <message numerus="yes">
+ <source>%n miles</source>
+ <translation>
+ <numerusform>%n míle</numerusform>
+ <numerusform>%n míle</numerusform>
+ <numerusform>%n mil</numerusform>
+ </translation>
</message>
- <message>
- <source>mi</source>
- <translation>mi</translation>
+ <message numerus="yes">
+ <source>%n meters</source>
+ <translation>
+ <numerusform>%n metr</numerusform>
+ <numerusform>%n metry</numerusform>
+ <numerusform>%n metrů</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n km</source>
+ <extracomment>N kilometers</extracomment>
+ <translation>
+ <numerusform>%n km</numerusform>
+ <numerusform>%n km</numerusform>
+ <numerusform>%n km</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n ft</source>
+ <extracomment>N feet</extracomment>
+ <translation>
+ <numerusform>%n ft</numerusform>
+ <numerusform>%n ft</numerusform>
+ <numerusform>%n ft</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n mi</source>
+ <extracomment>N miles</extracomment>
+ <translation>
+ <numerusform>%n mi</numerusform>
+ <numerusform>%n mi</numerusform>
+ <numerusform>%n mi</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n m</source>
+ <extracomment>N meters</extracomment>
+ <translation>
+ <numerusform>%n m</numerusform>
+ <numerusform>%n m</numerusform>
+ <numerusform>%n m</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n feet</source>
+ <translation>
+ <numerusform>%n stopa</numerusform>
+ <numerusform>%n stopy</numerusform>
+ <numerusform>%n stop</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n yards</source>
+ <translation>
+ <numerusform>%n yard</numerusform>
+ <numerusform>%n yardy</numerusform>
+ <numerusform>%n yardů</numerusform>
+ </translation>
</message>
<message>
- <source>m</source>
- <translation>m</translation>
+ <source>%1 miles</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation>%1 míle</translation>
</message>
<message>
- <source>%1 ft</source>
- <translation>%1 stop</translation>
+ <source>%1 km</source>
+ <extracomment>fraction of kilometers, %n cannot be used</extracomment>
+ <translation>%1 km</translation>
</message>
<message>
- <source>%1 m</source>
- <translation>%1 m</translation>
+ <source>%1 mi</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation>%1 mi</translation>
</message>
</context>
<context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/translations/de.ts
^
|
| @@ -196,7 +196,7 @@
<message>
<source>Statistics</source>
<extracomment>collection pull down menu</extracomment>
- <translation type="unfinished">Statistik</translation>
+ <translation>Statistiken</translation>
</message>
</context>
<context>
@@ -355,64 +355,64 @@
<name>CollectionStatistics</name>
<message>
<source>Loading collection</source>
- <translation type="unfinished">Lade Sammlung</translation>
+ <translation>Lade Sammlung</translation>
</message>
<message>
<source>Distance</source>
- <translation type="unfinished"></translation>
+ <translation>Entfernung</translation>
</message>
<message>
<source>Longest track</source>
- <translation type="unfinished"></translation>
+ <translation>Längster Track</translation>
</message>
<message>
<source>Time</source>
<extracomment>Track duration</extracomment>
- <translation type="unfinished">Zeit</translation>
+ <translation>Zeit</translation>
</message>
<message>
<source>Moving Time</source>
- <translation type="unfinished">Reisedauer</translation>
+ <translation>Bewegungszeit</translation>
</message>
<message>
<source>Max speed</source>
- <translation type="unfinished"></translation>
+ <translation>Höchstgeschwindigkeit</translation>
</message>
<message>
<source>%1 mi/h</source>
- <translation type="unfinished">%1 mi/h</translation>
+ <translation>%1 mi/h</translation>
</message>
<message>
<source>%1 km/h</source>
- <translation type="unfinished">%1 km/h</translation>
+ <translation>%1 km/h</translation>
</message>
<message>
<source>Elevation min/max</source>
- <translation type="unfinished">Höhe min/max</translation>
+ <translation>Höhe min/max</translation>
</message>
<message>
<source>%1 / %2 ft a.s.l.</source>
- <translation type="unfinished">%1 / %2 ft ü. M.</translation>
+ <translation>%1 / %2 ft ü. M.</translation>
</message>
<message>
<source>%1 / %2 m a.s.l.</source>
- <translation type="unfinished">%1 / %2 m ü. M.</translation>
+ <translation>%1 / %2 m ü. M.</translation>
</message>
<message>
<source>Ascent</source>
- <translation type="unfinished">Anstieg</translation>
+ <translation>Anstieg</translation>
</message>
<message>
<source>Descent</source>
- <translation type="unfinished">Abstieg</translation>
+ <translation>Abstieg</translation>
</message>
<message>
<source>Unknown type</source>
- <translation type="unfinished"></translation>
+ <translation>Unbekannter Typ</translation>
</message>
<message>
<source>Track count</source>
- <translation type="unfinished"></translation>
+ <translation>Anzahl Tracks</translation>
</message>
</context>
<context>
@@ -574,6 +574,10 @@
<source>Show none on map</source>
<translation>Zeige nichts auf Karte</translation>
</message>
+ <message>
+ <source>Pull down to import collection or create empty one</source>
+ <translation>Ziehe nach unten um eine Sammlung zu importieren oder eine leere zu generieren</translation>
+ </message>
</context>
<context>
<name>Cover</name>
@@ -921,6 +925,10 @@
<extracomment>remorse dialog</extracomment>
<translation>Lösche</translation>
</message>
+ <message>
+ <source>Scroll down for more entries</source>
+ <translation>Scrolle nach unten für weitere Einträge</translation>
+ </message>
</context>
<context>
<name>NavigationInstructions</name>
@@ -1332,12 +1340,12 @@
</message>
<message>
<source>Prefer English names</source>
- <translation type="unfinished">Bevorzuge Englische Bezeichnungen</translation>
+ <translation>Bevorzuge englische Namen</translation>
</message>
<message>
<source>On the map, search and place info</source>
<extracomment>description of "Prefer English names" switch</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Auf der Karte, Suche und Ortsinformationen</translation>
</message>
</context>
<context>
@@ -1751,18 +1759,14 @@
<extracomment>track type</extracomment>
<translation>Art</translation>
</message>
+ <message>
+ <source>You can return to the map, tracking will continue on background</source>
+ <translation>Du kannst zur Karte zurückkehren, das Tracking wird im Hintergrund fortgesetzt</translation>
+ </message>
</context>
<context>
<name>Utils</name>
<message>
- <source>meters</source>
- <translation>Meter</translation>
- </message>
- <message>
- <source>km</source>
- <translation>km</translation>
- </message>
- <message>
<source>west</source>
<extracomment>in sense indicating location of some place: "place is located WEST"</extracomment>
<translation>westlich</translation>
@@ -1815,36 +1819,91 @@
<translation>Nordwest</translation>
</message>
<message>
- <source>feet</source>
- <translation>Fuß</translation>
+ <source>ft</source>
+ <translation type="vanished">ft</translation>
</message>
<message>
- <source>miles</source>
- <translation>Meilen</translation>
+ <source>mi</source>
+ <translation type="vanished">mi</translation>
</message>
<message>
- <source>yards</source>
- <translation>Yards</translation>
+ <source>m</source>
+ <translation type="vanished">m</translation>
</message>
- <message>
- <source>ft</source>
- <translation>ft</translation>
+ <message numerus="yes">
+ <source>%n miles</source>
+ <translation>
+ <numerusform>%n Meile</numerusform>
+ <numerusform>%n Meilen</numerusform>
+ </translation>
</message>
- <message>
- <source>mi</source>
- <translation>mi</translation>
+ <message numerus="yes">
+ <source>%n meters</source>
+ <translation>
+ <numerusform>% Meter</numerusform>
+ <numerusform>%n Meter</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n km</source>
+ <extracomment>N kilometers</extracomment>
+ <translation>
+ <numerusform>%n km</numerusform>
+ <numerusform>%n km</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n ft</source>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/translations/en.ts
^
|
| @@ -574,6 +574,10 @@
<source>Show none on map</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Pull down to import collection or create empty one</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Cover</name>
@@ -921,6 +925,10 @@
<extracomment>remorse dialog</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Scroll down for more entries</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>NavigationInstructions</name>
@@ -1751,17 +1759,13 @@
<extracomment>track type</extracomment>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>Utils</name>
- <message>
- <source>meters</source>
- <translation type="unfinished"></translation>
- </message>
<message>
- <source>km</source>
+ <source>You can return to the map, tracking will continue on background</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>Utils</name>
<message>
<source>west</source>
<extracomment>in sense indicating location of some place: "place is located WEST"</extracomment>
@@ -1815,36 +1819,91 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>feet</source>
- <translation type="unfinished"></translation>
+ <source>ft</source>
+ <translation type="vanished">ft</translation>
</message>
<message>
- <source>miles</source>
- <translation type="unfinished"></translation>
+ <source>mi</source>
+ <translation type="vanished">mi</translation>
</message>
<message>
- <source>yards</source>
- <translation type="unfinished"></translation>
+ <source>m</source>
+ <translation type="vanished">m</translation>
</message>
- <message>
- <source>ft</source>
- <translation>ft</translation>
+ <message numerus="yes">
+ <source>%n miles</source>
+ <translation>
+ <numerusform>%n mile</numerusform>
+ <numerusform>%n miles</numerusform>
+ </translation>
</message>
- <message>
- <source>mi</source>
- <translation>mi</translation>
+ <message numerus="yes">
+ <source>%n meters</source>
+ <translation>
+ <numerusform>% meter</numerusform>
+ <numerusform>%n meters</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n km</source>
+ <extracomment>N kilometers</extracomment>
+ <translation>
+ <numerusform>%n km</numerusform>
+ <numerusform>%n km</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n ft</source>
+ <extracomment>N feet</extracomment>
+ <translation>
+ <numerusform>%n ft</numerusform>
+ <numerusform>%n ft</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n mi</source>
+ <extracomment>N miles</extracomment>
+ <translation>
+ <numerusform>%n mi</numerusform>
+ <numerusform>%n mi</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n m</source>
+ <extracomment>N meters</extracomment>
+ <translation>
+ <numerusform>%n m</numerusform>
+ <numerusform>%n m</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n feet</source>
+ <translation>
+ <numerusform>%n foot</numerusform>
+ <numerusform>%n feet</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n yards</source>
+ <translation>
+ <numerusform>%n yard</numerusform>
+ <numerusform>%n yards</numerusform>
+ </translation>
</message>
<message>
- <source>m</source>
- <translation>m</translation>
+ <source>%1 miles</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation>%1 miles</translation>
</message>
<message>
- <source>%1 ft</source>
- <translation type="unfinished"></translation>
+ <source>%1 km</source>
+ <extracomment>fraction of kilometers, %n cannot be used</extracomment>
+ <translation>%1 km</translation>
</message>
<message>
- <source>%1 m</source>
- <translation type="unfinished"></translation>
+ <source>%1 mi</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation>%1 mi</translation>
</message>
</context>
<context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/translations/es.ts
^
|
| @@ -574,6 +574,10 @@
<source>Show none on map</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Pull down to import collection or create empty one</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Cover</name>
@@ -921,6 +925,10 @@
<extracomment>remorse dialog</extracomment>
<translation type="unfinished">Borrando</translation>
</message>
+ <message>
+ <source>Scroll down for more entries</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>NavigationInstructions</name>
@@ -1751,18 +1759,14 @@
<extracomment>track type</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>You can return to the map, tracking will continue on background</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Utils</name>
<message>
- <source>meters</source>
- <translation>metros</translation>
- </message>
- <message>
- <source>km</source>
- <translation>km</translation>
- </message>
- <message>
<source>west</source>
<extracomment>in sense indicating location of some place: "place is located WEST"</extracomment>
<translation>oeste</translation>
@@ -1815,36 +1819,91 @@
<translation>noroeste</translation>
</message>
<message>
- <source>feet</source>
- <translation>pies</translation>
+ <source>ft</source>
+ <translation type="vanished">ps</translation>
</message>
<message>
- <source>miles</source>
- <translation>millas</translation>
+ <source>mi</source>
+ <translation type="vanished">mi</translation>
</message>
<message>
- <source>yards</source>
- <translation>Yardas</translation>
+ <source>m</source>
+ <translation type="vanished">m</translation>
</message>
- <message>
- <source>ft</source>
- <translation>ps</translation>
+ <message numerus="yes">
+ <source>%n miles</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
- <message>
- <source>mi</source>
- <translation>mi</translation>
+ <message numerus="yes">
+ <source>%n meters</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n km</source>
+ <extracomment>N kilometers</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n ft</source>
+ <extracomment>N feet</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n mi</source>
+ <extracomment>N miles</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n m</source>
+ <extracomment>N meters</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n feet</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n yards</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
- <source>m</source>
- <translation>m</translation>
+ <source>%1 miles</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 ft</source>
- <translation>%1 pi</translation>
+ <source>%1 km</source>
+ <extracomment>fraction of kilometers, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 m</source>
- <translation>%1 m</translation>
+ <source>%1 mi</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/translations/et.ts
^
|
| @@ -574,6 +574,10 @@
<source>Show none on map</source>
<translation>Ära näita kaardil ühtegi</translation>
</message>
+ <message>
+ <source>Pull down to import collection or create empty one</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Cover</name>
@@ -921,6 +925,10 @@
<extracomment>remorse dialog</extracomment>
<translation>Kustutan</translation>
</message>
+ <message>
+ <source>Scroll down for more entries</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>NavigationInstructions</name>
@@ -1751,18 +1759,14 @@
<extracomment>track type</extracomment>
<translation>Tüüp</translation>
</message>
+ <message>
+ <source>You can return to the map, tracking will continue on background</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Utils</name>
<message>
- <source>meters</source>
- <translation>meetrit</translation>
- </message>
- <message>
- <source>km</source>
- <translation>km</translation>
- </message>
- <message>
<source>west</source>
<extracomment>in sense indicating location of some place: "place is located WEST"</extracomment>
<translation>läänes</translation>
@@ -1815,36 +1819,91 @@
<translation>loodes</translation>
</message>
<message>
- <source>feet</source>
- <translation>jalga</translation>
+ <source>ft</source>
+ <translation type="vanished">ft</translation>
</message>
<message>
- <source>miles</source>
- <translation>miili</translation>
+ <source>mi</source>
+ <translation type="vanished">mi</translation>
</message>
<message>
- <source>yards</source>
- <translation>jardi</translation>
+ <source>m</source>
+ <translation type="vanished">m</translation>
</message>
- <message>
- <source>ft</source>
- <translation>ft</translation>
+ <message numerus="yes">
+ <source>%n miles</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
- <message>
- <source>mi</source>
- <translation>mi</translation>
+ <message numerus="yes">
+ <source>%n meters</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n km</source>
+ <extracomment>N kilometers</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n ft</source>
+ <extracomment>N feet</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n mi</source>
+ <extracomment>N miles</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n m</source>
+ <extracomment>N meters</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n feet</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n yards</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
- <source>m</source>
- <translation>m</translation>
+ <source>%1 miles</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 ft</source>
- <translation>%1 ft</translation>
+ <source>%1 km</source>
+ <extracomment>fraction of kilometers, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 m</source>
- <translation>%1 m</translation>
+ <source>%1 mi</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/translations/fa.ts
^
|
| @@ -574,6 +574,10 @@
<source>Show none on map</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Pull down to import collection or create empty one</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Cover</name>
@@ -921,6 +925,10 @@
<extracomment>remorse dialog</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Scroll down for more entries</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>NavigationInstructions</name>
@@ -1750,18 +1758,14 @@
<extracomment>track type</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>You can return to the map, tracking will continue on background</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Utils</name>
<message>
- <source>meters</source>
- <translation>متر</translation>
- </message>
- <message>
- <source>km</source>
- <translation>کیلومتر</translation>
- </message>
- <message>
<source>west</source>
<extracomment>in sense indicating location of some place: "place is located WEST"</extracomment>
<translation>غرب</translation>
@@ -1814,36 +1818,83 @@
<translation>شمال غرب</translation>
</message>
<message>
- <source>feet</source>
- <translation type="unfinished"></translation>
+ <source>ft</source>
+ <translation type="vanished">ft</translation>
</message>
<message>
- <source>miles</source>
- <translation type="unfinished"></translation>
+ <source>mi</source>
+ <translation type="vanished">mi</translation>
</message>
<message>
- <source>yards</source>
- <translation type="unfinished"></translation>
+ <source>m</source>
+ <translation type="vanished">m</translation>
</message>
- <message>
- <source>ft</source>
- <translation>ft</translation>
+ <message numerus="yes">
+ <source>%n miles</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
- <message>
- <source>mi</source>
- <translation>mi</translation>
+ <message numerus="yes">
+ <source>%n meters</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n km</source>
+ <extracomment>N kilometers</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n ft</source>
+ <extracomment>N feet</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n mi</source>
+ <extracomment>N miles</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n m</source>
+ <extracomment>N meters</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n feet</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n yards</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
- <source>m</source>
- <translation>m</translation>
+ <source>%1 miles</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 ft</source>
- <translation>%1 ft</translation>
+ <source>%1 km</source>
+ <extracomment>fraction of kilometers, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 m</source>
- <translation>%1 m</translation>
+ <source>%1 mi</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/translations/fr.ts
^
|
| @@ -574,6 +574,10 @@
<source>Show none on map</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Pull down to import collection or create empty one</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Cover</name>
@@ -921,6 +925,10 @@
<extracomment>remorse dialog</extracomment>
<translation type="unfinished">Suppression</translation>
</message>
+ <message>
+ <source>Scroll down for more entries</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>NavigationInstructions</name>
@@ -1751,18 +1759,14 @@
<extracomment>track type</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>You can return to the map, tracking will continue on background</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Utils</name>
<message>
- <source>meters</source>
- <translation>mètres</translation>
- </message>
- <message>
- <source>km</source>
- <translation>km</translation>
- </message>
- <message>
<source>west</source>
<extracomment>in sense indicating location of some place: "place is located WEST"</extracomment>
<translation>ouest</translation>
@@ -1815,36 +1819,91 @@
<translation>nord-ouest</translation>
</message>
<message>
- <source>feet</source>
- <translation>pied</translation>
+ <source>ft</source>
+ <translation type="vanished">ft</translation>
</message>
<message>
- <source>miles</source>
- <translation>milles</translation>
+ <source>mi</source>
+ <translation type="vanished">mi</translation>
</message>
<message>
- <source>yards</source>
- <translation>yards</translation>
+ <source>m</source>
+ <translation type="vanished">m</translation>
</message>
- <message>
- <source>ft</source>
- <translation>ft</translation>
+ <message numerus="yes">
+ <source>%n miles</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
- <message>
- <source>mi</source>
- <translation>mi</translation>
+ <message numerus="yes">
+ <source>%n meters</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n km</source>
+ <extracomment>N kilometers</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n ft</source>
+ <extracomment>N feet</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n mi</source>
+ <extracomment>N miles</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n m</source>
+ <extracomment>N meters</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n feet</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n yards</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
- <source>m</source>
- <translation>m</translation>
+ <source>%1 miles</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 ft</source>
- <translation>%1 pieds</translation>
+ <source>%1 km</source>
+ <extracomment>fraction of kilometers, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 m</source>
- <translation>%1 m</translation>
+ <source>%1 mi</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/translations/hu.ts
^
|
| @@ -574,6 +574,10 @@
<source>Show none on map</source>
<translation>Semmi ne jelenjen meg a térképen</translation>
</message>
+ <message>
+ <source>Pull down to import collection or create empty one</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Cover</name>
@@ -921,6 +925,10 @@
<extracomment>remorse dialog</extracomment>
<translation>Törlés</translation>
</message>
+ <message>
+ <source>Scroll down for more entries</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>NavigationInstructions</name>
@@ -1750,18 +1758,14 @@
<extracomment>track type</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>You can return to the map, tracking will continue on background</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Utils</name>
<message>
- <source>meters</source>
- <translation>méter</translation>
- </message>
- <message>
- <source>km</source>
- <translation>km</translation>
- </message>
- <message>
<source>west</source>
<extracomment>in sense indicating location of some place: "place is located WEST"</extracomment>
<translation>nyugat</translation>
@@ -1814,36 +1818,83 @@
<translation>északnyugat</translation>
</message>
<message>
- <source>feet</source>
- <translation>láb</translation>
+ <source>ft</source>
+ <translation type="vanished">ft</translation>
</message>
<message>
- <source>miles</source>
- <translation>mérföld</translation>
+ <source>mi</source>
+ <translation type="vanished">mi</translation>
</message>
<message>
- <source>yards</source>
- <translation>yard</translation>
+ <source>m</source>
+ <translation type="vanished">m</translation>
</message>
- <message>
- <source>ft</source>
- <translation>ft</translation>
+ <message numerus="yes">
+ <source>%n miles</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
- <message>
- <source>mi</source>
- <translation>mi</translation>
+ <message numerus="yes">
+ <source>%n meters</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n km</source>
+ <extracomment>N kilometers</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n ft</source>
+ <extracomment>N feet</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n mi</source>
+ <extracomment>N miles</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n m</source>
+ <extracomment>N meters</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n feet</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n yards</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
- <source>m</source>
- <translation>m</translation>
+ <source>%1 miles</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 ft</source>
- <translation>%1 ft</translation>
+ <source>%1 km</source>
+ <extracomment>fraction of kilometers, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 m</source>
- <translation>%1 m</translation>
+ <source>%1 mi</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/translations/it.ts
^
|
| @@ -574,6 +574,10 @@
<source>Show none on map</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Pull down to import collection or create empty one</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Cover</name>
@@ -921,6 +925,10 @@
<extracomment>remorse dialog</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Scroll down for more entries</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>NavigationInstructions</name>
@@ -1751,17 +1759,13 @@
<extracomment>track type</extracomment>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>Utils</name>
<message>
- <source>meters</source>
+ <source>You can return to the map, tracking will continue on background</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <source>km</source>
- <translation>km</translation>
- </message>
+</context>
+<context>
+ <name>Utils</name>
<message>
<source>west</source>
<extracomment>in sense indicating location of some place: "place is located WEST"</extracomment>
@@ -1815,36 +1819,91 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>feet</source>
- <translation type="unfinished"></translation>
+ <source>ft</source>
+ <translation type="vanished">ft</translation>
</message>
<message>
- <source>miles</source>
- <translation type="unfinished"></translation>
+ <source>mi</source>
+ <translation type="vanished">mi</translation>
</message>
<message>
- <source>yards</source>
- <translation type="unfinished"></translation>
+ <source>m</source>
+ <translation type="vanished">m</translation>
</message>
- <message>
- <source>ft</source>
- <translation>ft</translation>
+ <message numerus="yes">
+ <source>%n miles</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
- <message>
- <source>mi</source>
- <translation>mi</translation>
+ <message numerus="yes">
+ <source>%n meters</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n km</source>
+ <extracomment>N kilometers</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n ft</source>
+ <extracomment>N feet</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n mi</source>
+ <extracomment>N miles</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n m</source>
+ <extracomment>N meters</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n feet</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n yards</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
- <source>m</source>
- <translation>m</translation>
+ <source>%1 miles</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 ft</source>
- <translation>%1 ft</translation>
+ <source>%1 km</source>
+ <extracomment>fraction of kilometers, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 m</source>
- <translation>%1 m</translation>
+ <source>%1 mi</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/translations/nb.ts
^
|
| @@ -574,6 +574,10 @@
<source>Show none on map</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Pull down to import collection or create empty one</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Cover</name>
@@ -921,6 +925,10 @@
<extracomment>remorse dialog</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Scroll down for more entries</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>NavigationInstructions</name>
@@ -1751,18 +1759,14 @@
<extracomment>track type</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>You can return to the map, tracking will continue on background</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Utils</name>
<message>
- <source>meters</source>
- <translation>meter</translation>
- </message>
- <message>
- <source>km</source>
- <translation>km</translation>
- </message>
- <message>
<source>west</source>
<extracomment>in sense indicating location of some place: "place is located WEST"</extracomment>
<translation>vest</translation>
@@ -1815,36 +1819,91 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>feet</source>
- <translation type="unfinished"></translation>
+ <source>ft</source>
+ <translation type="vanished">ft</translation>
</message>
<message>
- <source>miles</source>
- <translation type="unfinished"></translation>
+ <source>mi</source>
+ <translation type="vanished">mi</translation>
</message>
<message>
- <source>yards</source>
- <translation type="unfinished"></translation>
+ <source>m</source>
+ <translation type="vanished">m</translation>
</message>
- <message>
- <source>ft</source>
- <translation>ft</translation>
+ <message numerus="yes">
+ <source>%n miles</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
- <message>
- <source>mi</source>
- <translation>mi</translation>
+ <message numerus="yes">
+ <source>%n meters</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n km</source>
+ <extracomment>N kilometers</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n ft</source>
+ <extracomment>N feet</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n mi</source>
+ <extracomment>N miles</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n m</source>
+ <extracomment>N meters</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n feet</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n yards</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
- <source>m</source>
- <translation>m</translation>
+ <source>%1 miles</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 ft</source>
- <translation>%1 ft</translation>
+ <source>%1 km</source>
+ <extracomment>fraction of kilometers, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 m</source>
- <translation>%1 m</translation>
+ <source>%1 mi</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/translations/nl.ts
^
|
| @@ -574,6 +574,10 @@
<source>Show none on map</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Pull down to import collection or create empty one</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Cover</name>
@@ -921,6 +925,10 @@
<extracomment>remorse dialog</extracomment>
<translation type="unfinished">Wordt verwijderd</translation>
</message>
+ <message>
+ <source>Scroll down for more entries</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>NavigationInstructions</name>
@@ -1751,18 +1759,14 @@
<extracomment>track type</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>You can return to the map, tracking will continue on background</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Utils</name>
<message>
- <source>meters</source>
- <translation>meter</translation>
- </message>
- <message>
- <source>km</source>
- <translation>km</translation>
- </message>
- <message>
<source>west</source>
<extracomment>in sense indicating location of some place: "place is located WEST"</extracomment>
<translation>ten westen</translation>
@@ -1815,36 +1819,91 @@
<translation>ten noordwesten</translation>
</message>
<message>
- <source>feet</source>
- <translation type="unfinished"></translation>
+ <source>ft</source>
+ <translation type="vanished">ft</translation>
</message>
<message>
- <source>miles</source>
- <translation type="unfinished"></translation>
+ <source>mi</source>
+ <translation type="vanished">mi</translation>
</message>
<message>
- <source>yards</source>
- <translation type="unfinished"></translation>
+ <source>m</source>
+ <translation type="vanished">m</translation>
</message>
- <message>
- <source>ft</source>
- <translation>ft</translation>
+ <message numerus="yes">
+ <source>%n miles</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
- <message>
- <source>mi</source>
- <translation>mi</translation>
+ <message numerus="yes">
+ <source>%n meters</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n km</source>
+ <extracomment>N kilometers</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n ft</source>
+ <extracomment>N feet</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n mi</source>
+ <extracomment>N miles</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n m</source>
+ <extracomment>N meters</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n feet</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n yards</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
- <source>m</source>
- <translation>m</translation>
+ <source>%1 miles</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 ft</source>
- <translation>%1 ft</translation>
+ <source>%1 km</source>
+ <extracomment>fraction of kilometers, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 m</source>
- <translation>%1 m</translation>
+ <source>%1 mi</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/translations/nl_BE.ts
^
|
| @@ -574,6 +574,10 @@
<source>Show none on map</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Pull down to import collection or create empty one</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Cover</name>
@@ -921,6 +925,10 @@
<extracomment>remorse dialog</extracomment>
<translation type="unfinished">Wordt verwijderd</translation>
</message>
+ <message>
+ <source>Scroll down for more entries</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>NavigationInstructions</name>
@@ -1751,18 +1759,14 @@
<extracomment>track type</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>You can return to the map, tracking will continue on background</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Utils</name>
<message>
- <source>meters</source>
- <translation>meter</translation>
- </message>
- <message>
- <source>km</source>
- <translation>km</translation>
- </message>
- <message>
<source>west</source>
<extracomment>in sense indicating location of some place: "place is located WEST"</extracomment>
<translation>ten westen</translation>
@@ -1815,36 +1819,91 @@
<translation>ten noordwesten</translation>
</message>
<message>
- <source>feet</source>
- <translation type="unfinished"></translation>
+ <source>ft</source>
+ <translation type="vanished">ft</translation>
</message>
<message>
- <source>miles</source>
- <translation type="unfinished"></translation>
+ <source>mi</source>
+ <translation type="vanished">mi</translation>
</message>
<message>
- <source>yards</source>
- <translation type="unfinished"></translation>
+ <source>m</source>
+ <translation type="vanished">m</translation>
</message>
- <message>
- <source>ft</source>
- <translation>ft</translation>
+ <message numerus="yes">
+ <source>%n miles</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
- <message>
- <source>mi</source>
- <translation>mi</translation>
+ <message numerus="yes">
+ <source>%n meters</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n km</source>
+ <extracomment>N kilometers</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n ft</source>
+ <extracomment>N feet</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n mi</source>
+ <extracomment>N miles</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n m</source>
+ <extracomment>N meters</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n feet</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n yards</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
- <source>m</source>
- <translation>m</translation>
+ <source>%1 miles</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 ft</source>
- <translation>%1 ft</translation>
+ <source>%1 km</source>
+ <extracomment>fraction of kilometers, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 m</source>
- <translation>%1 m</translation>
+ <source>%1 mi</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/translations/pl.ts
^
|
| @@ -574,6 +574,10 @@
<source>Show none on map</source>
<translation>Nie pokazuj na mapie</translation>
</message>
+ <message>
+ <source>Pull down to import collection or create empty one</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Cover</name>
@@ -921,6 +925,10 @@
<extracomment>remorse dialog</extracomment>
<translation>Usuwanie</translation>
</message>
+ <message>
+ <source>Scroll down for more entries</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>NavigationInstructions</name>
@@ -1752,18 +1760,14 @@
<extracomment>track type</extracomment>
<translation>Rodzaj</translation>
</message>
+ <message>
+ <source>You can return to the map, tracking will continue on background</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Utils</name>
<message>
- <source>meters</source>
- <translation>metry</translation>
- </message>
- <message>
- <source>km</source>
- <translation>km</translation>
- </message>
- <message>
<source>west</source>
<extracomment>in sense indicating location of some place: "place is located WEST"</extracomment>
<translation>zachód</translation>
@@ -1816,36 +1820,99 @@
<translation>północny zachód</translation>
</message>
<message>
- <source>feet</source>
- <translation>stóp</translation>
+ <source>ft</source>
+ <translation type="vanished">ft</translation>
</message>
<message>
- <source>miles</source>
- <translation>mile</translation>
+ <source>mi</source>
+ <translation type="vanished">mi</translation>
</message>
<message>
- <source>yards</source>
- <translation>jardy</translation>
+ <source>m</source>
+ <translation type="vanished">m</translation>
</message>
- <message>
- <source>ft</source>
- <translation>ft</translation>
+ <message numerus="yes">
+ <source>%n miles</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
- <message>
- <source>mi</source>
- <translation>mi</translation>
+ <message numerus="yes">
+ <source>%n meters</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n km</source>
+ <extracomment>N kilometers</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n ft</source>
+ <extracomment>N feet</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n mi</source>
+ <extracomment>N miles</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n m</source>
+ <extracomment>N meters</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n feet</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n yards</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
- <source>m</source>
- <translation>m</translation>
+ <source>%1 miles</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 ft</source>
- <translation>%1 ft</translation>
+ <source>%1 km</source>
+ <extracomment>fraction of kilometers, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 m</source>
- <translation>%1 m</translation>
+ <source>%1 mi</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/translations/pt_BR.ts
^
|
| @@ -574,6 +574,10 @@
<source>Show none on map</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Pull down to import collection or create empty one</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Cover</name>
@@ -921,6 +925,10 @@
<extracomment>remorse dialog</extracomment>
<translation type="unfinished">Excluindo</translation>
</message>
+ <message>
+ <source>Scroll down for more entries</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>NavigationInstructions</name>
@@ -1751,18 +1759,14 @@
<extracomment>track type</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>You can return to the map, tracking will continue on background</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Utils</name>
<message>
- <source>meters</source>
- <translation>metros</translation>
- </message>
- <message>
- <source>km</source>
- <translation>km</translation>
- </message>
- <message>
<source>west</source>
<extracomment>in sense indicating location of some place: "place is located WEST"</extracomment>
<translation>oeste</translation>
@@ -1815,36 +1819,91 @@
<translation>noroeste</translation>
</message>
<message>
- <source>feet</source>
- <translation type="unfinished"></translation>
+ <source>ft</source>
+ <translation type="vanished">ft</translation>
</message>
<message>
- <source>miles</source>
- <translation type="unfinished"></translation>
+ <source>mi</source>
+ <translation type="vanished">mi</translation>
</message>
<message>
- <source>yards</source>
- <translation type="unfinished"></translation>
+ <source>m</source>
+ <translation type="vanished">m</translation>
</message>
- <message>
- <source>ft</source>
- <translation>ft</translation>
+ <message numerus="yes">
+ <source>%n miles</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
- <message>
- <source>mi</source>
- <translation>mi</translation>
+ <message numerus="yes">
+ <source>%n meters</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n km</source>
+ <extracomment>N kilometers</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n ft</source>
+ <extracomment>N feet</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n mi</source>
+ <extracomment>N miles</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n m</source>
+ <extracomment>N meters</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n feet</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n yards</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
- <source>m</source>
- <translation>m</translation>
+ <source>%1 miles</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 ft</source>
- <translation>%1 ft</translation>
+ <source>%1 km</source>
+ <extracomment>fraction of kilometers, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 m</source>
- <translation>%1 m</translation>
+ <source>%1 mi</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/translations/ru.ts
^
|
| @@ -574,6 +574,10 @@
<source>Show none on map</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Pull down to import collection or create empty one</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Cover</name>
@@ -921,6 +925,10 @@
<extracomment>remorse dialog</extracomment>
<translation type="unfinished">Удаление</translation>
</message>
+ <message>
+ <source>Scroll down for more entries</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>NavigationInstructions</name>
@@ -1752,18 +1760,14 @@
<extracomment>track type</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>You can return to the map, tracking will continue on background</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Utils</name>
<message>
- <source>meters</source>
- <translation>метров</translation>
- </message>
- <message>
- <source>km</source>
- <translation>км</translation>
- </message>
- <message>
<source>west</source>
<extracomment>in sense indicating location of some place: "place is located WEST"</extracomment>
<translation>к западу</translation>
@@ -1816,36 +1820,99 @@
<translation>на северо-запад</translation>
</message>
<message>
- <source>feet</source>
- <translation>футов</translation>
+ <source>ft</source>
+ <translation type="vanished">ft</translation>
</message>
<message>
- <source>miles</source>
- <translation>миль</translation>
+ <source>mi</source>
+ <translation type="vanished">mi</translation>
</message>
<message>
- <source>yards</source>
- <translation>ярдов</translation>
+ <source>m</source>
+ <translation type="vanished">m</translation>
</message>
- <message>
- <source>ft</source>
- <translation>ft</translation>
+ <message numerus="yes">
+ <source>%n miles</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
- <message>
- <source>mi</source>
- <translation>mi</translation>
+ <message numerus="yes">
+ <source>%n meters</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n km</source>
+ <extracomment>N kilometers</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n ft</source>
+ <extracomment>N feet</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n mi</source>
+ <extracomment>N miles</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n m</source>
+ <extracomment>N meters</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n feet</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n yards</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
- <source>m</source>
- <translation>m</translation>
+ <source>%1 miles</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 ft</source>
- <translation>%1 ft</translation>
+ <source>%1 km</source>
+ <extracomment>fraction of kilometers, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 m</source>
- <translation>%1 м</translation>
+ <source>%1 mi</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/translations/sv.ts
^
|
| @@ -574,6 +574,10 @@
<source>Show none on map</source>
<translation>Visa ingen på kartan</translation>
</message>
+ <message>
+ <source>Pull down to import collection or create empty one</source>
+ <translation>Dra neråt för att importera en samling eller skapa en ny</translation>
+ </message>
</context>
<context>
<name>Cover</name>
@@ -921,6 +925,10 @@
<extracomment>remorse dialog</extracomment>
<translation>Tar bort</translation>
</message>
+ <message>
+ <source>Scroll down for more entries</source>
+ <translation>Skrolla neråt för fler poster</translation>
+ </message>
</context>
<context>
<name>NavigationInstructions</name>
@@ -1751,18 +1759,14 @@
<extracomment>track type</extracomment>
<translation>Typ</translation>
</message>
+ <message>
+ <source>You can return to the map, tracking will continue on background</source>
+ <translation>Du kan återvända till kartan, spårningen fortsätter i bakgrunden.</translation>
+ </message>
</context>
<context>
<name>Utils</name>
<message>
- <source>meters</source>
- <translation>meter</translation>
- </message>
- <message>
- <source>km</source>
- <translation>km</translation>
- </message>
- <message>
<source>west</source>
<extracomment>in sense indicating location of some place: "place is located WEST"</extracomment>
<translation>väst</translation>
@@ -1815,36 +1819,91 @@
<translation>nordväst</translation>
</message>
<message>
- <source>feet</source>
- <translation>feet</translation>
+ <source>ft</source>
+ <translation type="vanished">ft</translation>
</message>
<message>
- <source>miles</source>
- <translation>miles</translation>
+ <source>mi</source>
+ <translation type="vanished">mi</translation>
</message>
<message>
- <source>yards</source>
- <translation>yard</translation>
+ <source>m</source>
+ <translation type="vanished">m</translation>
</message>
- <message>
- <source>ft</source>
- <translation>ft</translation>
+ <message numerus="yes">
+ <source>%n miles</source>
+ <translation>
+ <numerusform>%n mile</numerusform>
+ <numerusform>%n mile</numerusform>
+ </translation>
</message>
- <message>
- <source>mi</source>
- <translation>mi</translation>
+ <message numerus="yes">
+ <source>%n meters</source>
+ <translation>
+ <numerusform>%n meter</numerusform>
+ <numerusform>%n meter</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n km</source>
+ <extracomment>N kilometers</extracomment>
+ <translation>
+ <numerusform>%n km</numerusform>
+ <numerusform>%n km</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n ft</source>
+ <extracomment>N feet</extracomment>
+ <translation>
+ <numerusform>%n ft</numerusform>
+ <numerusform>%n ft</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n mi</source>
+ <extracomment>N miles</extracomment>
+ <translation>
+ <numerusform>%n mi</numerusform>
+ <numerusform>%n mi</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n m</source>
+ <extracomment>N meters</extracomment>
+ <translation>
+ <numerusform>%n m</numerusform>
+ <numerusform>%n m</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n feet</source>
+ <translation>
+ <numerusform>%n fot</numerusform>
+ <numerusform>%n fot</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n yards</source>
+ <translation>
+ <numerusform>%n yard</numerusform>
+ <numerusform>%n yard</numerusform>
+ </translation>
</message>
<message>
- <source>m</source>
- <translation>m</translation>
+ <source>%1 miles</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation>%1 mile</translation>
</message>
<message>
- <source>%1 ft</source>
- <translation>%1 ft</translation>
+ <source>%1 km</source>
+ <extracomment>fraction of kilometers, %n cannot be used</extracomment>
+ <translation>%1 km</translation>
</message>
<message>
- <source>%1 m</source>
- <translation>%1 m</translation>
+ <source>%1 mi</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation>%1 mi</translation>
</message>
</context>
<context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/translations/zh_CN.ts
^
|
| @@ -574,6 +574,10 @@
<source>Show none on map</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Pull down to import collection or create empty one</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Cover</name>
@@ -921,6 +925,10 @@
<extracomment>remorse dialog</extracomment>
<translation type="unfinished">删除中</translation>
</message>
+ <message>
+ <source>Scroll down for more entries</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>NavigationInstructions</name>
@@ -1750,18 +1758,14 @@
<extracomment>track type</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>You can return to the map, tracking will continue on background</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Utils</name>
<message>
- <source>meters</source>
- <translation>米</translation>
- </message>
- <message>
- <source>km</source>
- <translation>km</translation>
- </message>
- <message>
<source>west</source>
<extracomment>in sense indicating location of some place: "place is located WEST"</extracomment>
<translation>西</translation>
@@ -1814,36 +1818,83 @@
<translation>西北</translation>
</message>
<message>
- <source>feet</source>
- <translation>英尺</translation>
+ <source>ft</source>
+ <translation type="vanished">ft</translation>
</message>
<message>
- <source>miles</source>
- <translation>英里</translation>
+ <source>mi</source>
+ <translation type="vanished">mi</translation>
</message>
<message>
- <source>yards</source>
- <translation>码</translation>
+ <source>m</source>
+ <translation type="vanished">m</translation>
</message>
- <message>
- <source>ft</source>
- <translation>ft</translation>
+ <message numerus="yes">
+ <source>%n miles</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
- <message>
- <source>mi</source>
- <translation>mi</translation>
+ <message numerus="yes">
+ <source>%n meters</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n km</source>
+ <extracomment>N kilometers</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n ft</source>
+ <extracomment>N feet</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n mi</source>
+ <extracomment>N miles</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n m</source>
+ <extracomment>N meters</extracomment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n feet</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>%n yards</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
- <source>m</source>
- <translation>m</translation>
+ <source>%1 miles</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 ft</source>
- <translation>%1 英尺</translation>
+ <source>%1 km</source>
+ <extracomment>fraction of kilometers, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 m</source>
- <translation>%1 m</translation>
+ <source>%1 mi</source>
+ <extracomment>fraction of miles, %n cannot be used</extracomment>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.28.tar.bz2/wiki/Local-development.md
^
|
| @@ -31,11 +31,18 @@
./harbour-osmscout --desktop
```
-### Tunning examples
- * Qml profiler
+### Tuning examples
+ * Qml profiler on computer
```
-./harbour-osmscout --desktop --qmljsdebugger=port:12345
+./harbour-osmscout --desktop -qmljsdebugger=port:1234
```
+
+ * Qml profiler on Sailfish OS device:
+```bash
+/usr/bin/harbour-osmscout -qmljsdebugger=port:1234,block,services:CanvasFrameRate,EngineControl,DebugMessages
+```
+Then use QtCreator action "Analyze", "QML Profiler (Attach to Waiting Application)" and connect to device port 1234...
+
* Memory leak detection
```
valgrind -v --track-origins=yes --leak-check=full --show-leak-kinds=all ./harbour-osmscout --desktop
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout.changes.in
^
|
| @@ -420,7 +420,7 @@
- search: support for lookup English region names
- outdoor stylesheet: add protected areas
- update translations (Chinese, Estonian)
-- drop support for old dabase formats (<19, used from year 2019), please update map databases regularly!
+- drop support for old database formats (<19, used from year 2019), please update map databases regularly!
- support for route labels
- add tram and bus line numbers to public transport stylesheet
- add cyclo route numbers to outdoor stylesheet
@@ -571,3 +571,14 @@
- use English names of map objects (search, place detail, administrative regions) when available and English is preferred (in map settings)
- preserve track type and color during track split
- transliterate utf8 characters in prefix-based search. In other words, "snezka" search will return "Sněžka" in results.
+
+* 2023-02-05 Lukáš Karas <lukas.karas@centrum.cz> 2.28
+- update translations (Czech, German, Swedish)
+- fix routing start / destination when searched object is routable (do not use object bounding box center, but object itself)
+- add menu scroll hint, that will be shown when menu is opened first and second time
+- add tracker and collection list interaction hints
+- correct translations of distance unit plurals
+- show elevation in base units (meters or feet)
+- improve loading time of collections (added database indexes)
+- fix decoding of %xx escaping in geo: uri
+- new icon ;-)
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout.yaml
^
|
| @@ -1,6 +1,6 @@
Name: harbour-osmscout
Summary: OSMScout for Sailfish
-Version: 2.27
+Version: 2.28
Release: 1
# The contents of the Group field should be one of the groups listed here:
# http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS
|
