|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/rinigus/pure-maps.git</param>
<param name="branch">master</param>
- <param name="revision">2.7.5</param>
+ <param name="revision">2.8.0</param>
<param name="debian">N</param>
<param name="dumb">N</param>
</service>
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-pure-maps-2.7.5.tar.xz/maps/opencyclemap.json
^
|
| @@ -1,11 +0,0 @@
-{
- "attribution": {
- "© Thunderforest": "https://www.thunderforest.com/",
- "© OpenStreetMap": "https://www.openstreetmap.org/copyright"
- },
- "format": "raster",
- "name": "OpenCycleMap",
- "profiles": ["mixed", "online"],
- "tile_size": 256,
- "tile_url": "https://tile.thunderforest.com/cycle/{z}/{x}/{y}@2x.png?apikey=9a913f34956945b494e3b9f5159968ad"
-}
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-pure-maps-2.7.5.tar.xz/maps/thunderforest_transport.json
^
|
| @@ -1,11 +0,0 @@
-{
- "attribution": {
- "© Thunderforest": "https://www.thunderforest.com/",
- "© OpenStreetMap": "https://www.openstreetmap.org/copyright"
- },
- "format": "raster",
- "name": "Thunderforest Transport",
- "profiles": ["mixed", "online"],
- "tile_size": 256,
- "tile_url": "https://tile.thunderforest.com/transport/{z}/{x}/{y}@2x.png?apikey=9a913f34956945b494e3b9f5159968ad"
-}
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-pure-maps-2.7.5.tar.xz/qml/PositionSourceMapMatched.qml
^
|
| @@ -1,319 +0,0 @@
-/* -*- coding: utf-8-unix -*-
- *
- * Copyright 2018 Rinigus <rinigus.git@gmail.com>
- *
- * MIT License
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-
-import QtQuick 2.0
-import QtPositioning 5.4
-import Nemo.DBus 2.0
-
-Item {
- id: master
-
- // Properties
- property alias active: gps.active
- property real direction: directionMapMatchValid ? directionMapMatch : directionDevice
- property real directionDevice: 0
- property bool directionDeviceValid: false
- property real directionMapMatch: 0
- property bool directionMapMatchValid: false
- property bool directionValid: directionMapMatchValid || directionDeviceValid
- property alias mapMatchingAvailable: scoutbus.available
- property alias mapMatchingMode: scoutbus.mode
- property alias name: gps.name
- property var position
- property alias preferredPositioningMethods: gps.preferredPositioningMethods
- property alias sourceError: gps.sourceError
- property string streetName: ""
- property real streetSpeedAssumed: -1 // in m/s
- property real streetSpeedLimit: -1 // in m/s
- property alias supportedPositioningMethods: gps.supportedPositioningMethods
- property alias updateInterval: gps.updateInterval
- property alias valid: gps.valid
-
- // Timing statistics support
- property bool timingStatsEnable: false
- property real timingOverallAvr: 0
- property real timingOverallMax: 0
- property real timingOverallMin: -1
-
- // Timing statistics support - internal vars
- property int _timingOverallCounter: 0
- property real _timingOverallSum: 0.0
- property bool _timingShot: false
- property var _timingLastCallStart: undefined
-
- // Properties used for testing
- property var testingCoordinate: undefined
-
- // Signals
-
- // signal is not provided by Sailfish version of PositionSource
- // signal updateTimeout()
-
- // Methods
- function start() {
- gps.start()
- }
-
- function stop() {
- gps.stop()
- }
-
- function update() {
- gps.update()
- }
-
- //////////////////////////////////////////////////////////////
- /// Implementation
- //////////////////////////////////////////////////////////////
-
- // provider for actual position
- PositionSource {
- id: gps
-
- property var lastPositionDirectionValid: null
-
- Component.onCompleted: positionUpdate(position)
-
- onPositionChanged: if (testingCoordinate==null) positionUpdate(position)
-
- onActiveChanged: {
- if (!gps.active) scoutbus.stop();
- }
-
- function positionUpdate(positionRaw) {
- // Filter coordinates first to ensure that they
- // are numeric values
- var pos = {}
- for (var i in positionRaw) {
- if (!(positionRaw[i] instanceof Function))
- pos[i] = positionRaw[i]
- }
-
- if (pos.coordinate.latitude == null ||
- isNaN(pos.coordinate.latitude) ||
- pos.coordinate.longitude == null ||
- isNaN(pos.coordinate.longitude))
- pos.coordinate = QtPositioning.coordinate(0, 0);
-
- if (pos.directionValid) {
- master.directionDevice = pos.direction;
- if (!master.directionDeviceValid)
- master.directionDeviceValid = true;
- lastPositionDirectionValid = pos.coordinate;
- } else if (lastPositionDirectionValid == null ||
- // stick to old direction when we stop moving
- pos.coordinate.distanceTo(lastPositionDirectionValid) > 10 /* meters */ )
- {
- master.directionDeviceValid = false;
- master.directionDevice = 0;
- }
-
- if (scoutbus.available &&
- scoutbus.mode &&
- pos.latitudeValid && pos.longitudeValid &&
- pos.horizontalAccuracyValid) {
- if (master.timingStatsEnable && !master._timingShot) {
- master._timingOverallCounter += 1;
- master._timingShot = true;
- master._timingLastCallStart = Date.now();
- }
- scoutbus.mapMatch(pos);
- } else {
- master.position = pos;
- if (scoutbus.mode && scoutbus.running)
- scoutbus.stop();
- }
- }
- }
-
- // interaction with OSM Scout Server via D-Bus
- DBusInterface {
- id: scoutbus
- service: "io.github.rinigus.OSMScoutServer"
- path: "/io/github/rinigus/OSMScoutServer/mapmatching"
- iface: "io.github.rinigus.OSMScoutServer.mapmatching"
-
- property bool available: false
- property int mode: 0
- property bool running: false;
-
- Component.onCompleted: {
- checkAvailable();
- }
-
- function checkAvailable() {
- if (getProperty("Active")) {
- if (!available) {
- available = true;
- if (mode) call('Reset', mode);
- resetValues();
- }
- } else {
- available = false
- resetValues();
- }
- }
-
- function mapMatch(position) {
- if (!mode || !available) return;
-
- typedCall("Update",
- [ {'type': 'i', 'value': mode},
- {'type': 'd', 'value': position.coordinate.latitude},
- {'type': 'd', 'value': position.coordinate.longitude},
- {'type': 'd', 'value': position.horizontalAccuracy} ],
- function(result) {
- // successful call
- var r = JSON.parse(result);
- var pos = {}
- for (var i in position) {
- if (!(position[i] instanceof Function) && i!=="coordinate")
- pos[i] = position[i]
- }
-
- var latitude = position.coordinate.latitude
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/CMakeLists.txt
^
|
| @@ -1,7 +1,7 @@
-cmake_minimum_required(VERSION 3.5.1) # Latest version as supported by Ubuntu Touch
+cmake_minimum_required(VERSION 3.5.1) # Latest version as supported by Ubuntu Touch
project(pure-maps
- VERSION 2.7.5
+ VERSION 2.8.0
DESCRIPTION "Maps and navigation")
# options
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/NEWS.md
^
|
| @@ -1,3 +1,14 @@
+2021-10-17: Pure Maps 2.8.0
+===========================
+
+* Add app-specific PositionSource
+* Add missing icons for navigation instructions [Lolek]
+* Add support for large number of languages by Valhalla
+* Drop support for Thunderforest maps
+* Adjust dependencies
+* Bugfixes and small enhancements
+* Update translations
+
2021-05-22: Pure Maps 2.7.5
===========================
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/README.md
^
|
| @@ -165,13 +165,13 @@
In addition to common dependencies for QML applications, the following
are needed:
-* Nemo DBus https://git.merproject.org/mer-core/nemo-qml-plugin-dbus
* PyOtherSide https://github.com/thp/pyotherside
* PyXDG https://www.freedesktop.org/wiki/Software/pyxdg/
* Mapbox GL Native, Qt version, use the packaged version at https://github.com/rinigus/pkg-mapbox-gl-native
* Mapbox GL QML, unofficial QML bindings, https://github.com/rinigus/mapbox-gl-qml
* GPXPy, https://github.com/tkrajina/gpxpy
* S2 Geometry Library, https://github.com/google/s2geometry
+* For Kirigami platform: Nemo DBus https://git.merproject.org/mer-core/nemo-qml-plugin-dbus
When developing with Kirigami using flatpak builder, dependencies will
be pulled and installed in flatpak. See instructions regarding
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/attic/maps/opencyclemap.json
^
|
| @@ -0,0 +1,11 @@
+{
+ "attribution": {
+ "© Thunderforest": "https://www.thunderforest.com/",
+ "© OpenStreetMap": "https://www.openstreetmap.org/copyright"
+ },
+ "format": "raster",
+ "name": "OpenCycleMap",
+ "profiles": ["mixed", "online"],
+ "tile_size": 256,
+ "tile_url": "https://tile.thunderforest.com/cycle/{z}/{x}/{y}@2x.png?apikey=KEY_GOES_HERE"
+}
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/attic/maps/thunderforest_outdoors.json
^
|
| @@ -0,0 +1,11 @@
+{
+ "attribution": {
+ "© Thunderforest": "https://www.thunderforest.com/",
+ "© OpenStreetMap": "https://www.openstreetmap.org/copyright"
+ },
+ "format": "raster",
+ "name": "Thunderforest Outdoors",
+ "profiles": ["mixed", "online"],
+ "tile_size": 256,
+ "tile_url": "https://tile.thunderforest.com/outdoors/{z}/{x}/{y}@2x.png?apikey=KEY_GOES_HERE"
+}
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/attic/maps/thunderforest_transport.json
^
|
| @@ -0,0 +1,11 @@
+{
+ "attribution": {
+ "© Thunderforest": "https://www.thunderforest.com/",
+ "© OpenStreetMap": "https://www.openstreetmap.org/copyright"
+ },
+ "format": "raster",
+ "name": "Thunderforest Transport",
+ "profiles": ["mixed", "online"],
+ "tile_size": 256,
+ "tile_url": "https://tile.thunderforest.com/transport/{z}/{x}/{y}@2x.png?apikey=KEY_GOES_HERE"
+}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/guides/osmscout_settings.qml
^
|
| @@ -38,8 +38,8 @@
if (routeSwitch.checked) {
page.params.alongRoute = true;
page.params.route = {
- "route_lng": navigator.route.map(x => x.longitude),
- "route_lat": navigator.route.map(x => x.latitude),
+ "route_lng": navigator.route.map(function(x) { return x.longitude }),
+ "route_lat": navigator.route.map(function(x) { return x.latitude }),
};
} else {
page.params.alongRoute = false;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/packaging/click/manifest.json
^
|
| @@ -9,7 +9,7 @@
"desktop": "pure-maps.desktop"
}
},
- "version": "2.7.5",
+ "version": "2.8.0",
"maintainer": "Rinigus <rinigus.git@gmail.org>",
"framework" : "@CLICK_FRAMEWORK@"
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/packaging/pure-maps.appdata.xml
^
|
| @@ -17,7 +17,7 @@
<url type="bugtracker">https://github.com/rinigus/pure-maps/issues</url>
<url type="donation">https://rinigus.github.io/donate</url>
<url type="translate">https://www.transifex.com/rinigus/pure-maps</url>
- <launchable desktop-id="io.github.rinigus.PureMaps"/>
+ <launchable type="desktop-id">io.github.rinigus.PureMaps.desktop</launchable>
<provides>
<binary>pure-maps</binary>
</provides>
@@ -38,6 +38,19 @@
</screenshots>
<metadata_license>CC-BY-SA-3.0</metadata_license>
<releases>
+ <release version="2.8.0" date="2021-10-17">
+ <description>
+ <ul>
+ <li>Add app-specific PositionSource</li>
+ <li>Add missing icons for navigation instructions [Lolek]</li>
+ <li>Add support for large number of languages by Valhalla</li>
+ <li>Drop support for Thunderforest maps</li>
+ <li>Adjust dependencies</li>
+ <li>Bugfixes and small enhancements</li>
+ <li>Update translations</li>
+ </ul>
+ </description>
+ </release>
<release version="2.7.5" date="2021-05-22">
<description>
<ul>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/po/de_DE.po
^
|
| @@ -22,7 +22,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-30 21:01+0300\n"
+"POT-Creation-Date: 2021-10-16 18:03+0300\n"
"PO-Revision-Date: 2018-08-22 13:49+0000\n"
"Last-Translator: rinigus github, 2021\n"
"Language-Team: German (Germany) (https://www.transifex.com/rinigus/teams/89597/de_DE/)\n"
@@ -55,10 +55,10 @@
#: poor/history.py:33 qml/GeocodeItem.qml:209 qml/GeocodeItem.qml:527
#: qml/MenuPage.qml:87 qml/Navigator.qml:192 qml/NearbyPage.qml:30
-#: qml/NearbyPage.qml:155 qml/NearbyPage.qml:170 qml/RoutePage.qml:40
-#: qml/RoutePage.qml:42 qml/RoutePage.qml:46 qml/RoutePage.qml:104
-#: qml/RoutePage.qml:461 qml/RoutePage.qml:466 qml/RoutePage.qml:693
-#: qml/RoutePage.qml:736 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
+#: qml/NearbyPage.qml:161 qml/NearbyPage.qml:176 qml/RoutePage.qml:40
+#: qml/RoutePage.qml:42 qml/RoutePage.qml:102 qml/RoutePage.qml:461
+#: qml/RoutePage.qml:466 qml/RoutePage.qml:694 qml/RoutePage.qml:723
+#: qml/RoutePage.qml:747 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
msgid "Current position"
msgstr "Aktuelle Position"
@@ -240,11 +240,11 @@
msgid "{:d} h {:d} min"
msgstr "{:d} h {:d} min"
-#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:114
-#: routers/ValhallaSettings.qml:150 routers/ValhallaSettings.qml:203
-#: routers/ValhallaSettings.qml:221 routers/ValhallaSettings.qml:238
-#: routers/ValhallaSettings.qml:254 routers/ValhallaSettings.qml:274
-#: routers/ValhallaSettings.qml:290
+#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:133
+#: routers/ValhallaSettings.qml:169 routers/ValhallaSettings.qml:222
+#: routers/ValhallaSettings.qml:240 routers/ValhallaSettings.qml:257
+#: routers/ValhallaSettings.qml:273 routers/ValhallaSettings.qml:293
+#: routers/ValhallaSettings.qml:309
msgid "Prefer"
msgstr "Bevorzugen"
@@ -352,7 +352,7 @@
#: qml/AttributionPage.qml:61 qml/GeocodeItem.qml:38 qml/GeocodePage.qml:27
#: qml/MenuPage.qml:54 qml/NearbyPage.qml:28 qml/PlaceTypePage.qml:79
-#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:685
+#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:643
msgid "Search"
msgstr "Suchen"
@@ -361,13 +361,13 @@
msgstr "Veranstaltungs-Orte"
#: qml/AttributionPage.qml:119 qml/MenuPage.qml:60 qml/NavigationPage.qml:27
-#: qml/PreferencesPage.qml:404 qml/RoutePage.qml:25
+#: qml/PreferencesPage.qml:362 qml/RoutePage.qml:25
msgid "Navigation"
msgstr "Navigation"
#: qml/BasemapButton.qml:225 qml/NearbyPage.qml:106 qml/PoiEditPage.qml:57
-#: routers/gpx_osmscout_settings.qml:52 routers/gpx_settings.qml:52
-#: routers/mapquest_open_settings.qml:27 routers/ValhallaSettings.qml:36
+#: routers/gpx_osmscout_settings.qml:54 routers/gpx_settings.qml:52
+#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
msgid "Type"
msgstr "Typ"
@@ -415,23 +415,23 @@
msgid "Transport"
msgstr "Verkehrsmittel"
-#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Bicycle"
msgstr "Fahrrad"
-#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Car"
msgstr "Auto"
-#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:131
+#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:150
msgid "Walking"
msgstr "Gehen"
-#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:38
msgid "Public transport"
msgstr "Öffentlicher Nahverkehr"
@@ -447,15 +447,15 @@
msgid "Map: %1"
msgstr "Karte: %1"
-#: qml/CenterButton.qml:110 qml/MapGestureArea.qml:46
+#: qml/CenterButton.qml:111 qml/MapGestureArea.qml:47
msgid "Auto-center off"
msgstr "Autozentrierung aus"
-#: qml/CenterButton.qml:118 qml/MapGestureArea.qml:45
+#: qml/CenterButton.qml:119 qml/MapGestureArea.qml:46
msgid "Auto-center on"
msgstr "Autozentrierung an"
-#: qml/CenterButton.qml:124
+#: qml/CenterButton.qml:125
msgid "Tap center button again for auto-center"
msgstr "Für Autozentrierung noch einmal den Zentrierknopf tippen "
@@ -464,7 +464,7 @@
msgstr "keine Auswahl"
#: qml/GeocodeItem.qml:134 qml/NavigationPage.qml:185 qml/PlaceNamePage.qml:48
-#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:258
+#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:257
#: qml/RoutePage.qml:443 qml/RoutePage.qml:558
msgid "Remove"
msgstr "Entfernen"
@@ -503,7 +503,7 @@
msgid "Recent searches (%1)"
msgstr "Letzte Suchanfragen (%1)"
-#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:54
+#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:52
msgid "Change provider (%1)"
msgstr "Anbieter wechseln (%1)"
@@ -523,11 +523,11 @@
msgid "Search engine"
msgstr "Suchmaschine"
-#: qml/InitPage.qml:33
+#: qml/InitPage.qml:32
msgid "Initializing"
msgstr "Initialisiere"
-#: qml/InitPage.qml:46 qml/RoutePage.qml:194
+#: qml/InitPage.qml:46 qml/RoutePage.qml:193
msgid "Dismiss"
msgstr "Abbrechen"
@@ -546,6 +546,20 @@
"„Einstellungen\" ein. Dieser Schlüssel wird nicht benötigt, wenn du „Pure "
"Maps\" mit lokalen Karten benutzen möchtest. "
+#: qml/LanguageSelector.qml:24
+msgid "Language"
+msgstr "Sprache"
+
+#: qml/LanguageSelector.qml:43 qml/PreferencesPage.qml:71
+#: qml/PreferencesPage.qml:760
+msgid "English"
+msgstr "Englisch"
+
+#: qml/LanguageSelector.qml:44 routers/gpx_osmscout_settings.qml:84
+#: routers/mapquest_open_settings.qml:59 routers/ValhallaSettings.qml:67
+msgid "English (United States)"
+msgstr "Englisch (Vereinigte Staaten)"
+
#: qml/MapErrorPage.qml:25
msgid "Error"
msgstr "Fehler"
@@ -604,24 +618,24 @@
msgid "Mixed"
msgstr "Gemischt"
-#: qml/MapGestureArea.qml:63 qml/MapGestureArea.qml:81
+#: qml/MapGestureArea.qml:64 qml/MapGestureArea.qml:82
msgid "Stop navigation to select POI"
msgstr "Stoppe Navigation um POI auszuwählen"
-#: qml/Map.qml:641 qml/NavigationPage.qml:207 qml/PoiBlock.qml:251
-#: qml/RoutePage.qml:174
+#: qml/Map.qml:643 qml/NavigationPage.qml:207 qml/PoiBlock.qml:251
+#: qml/RoutePage.qml:173
msgid "Origin"
msgstr "Start"
-#: qml/Map.qml:643 qml/NavigationPage.qml:210 qml/PoiBlock.qml:271
+#: qml/Map.qml:645 qml/NavigationPage.qml:210 qml/PoiBlock.qml:271
msgid "Final destination"
msgstr "Endgültiges Ziel"
-#: qml/Map.qml:645
+#: qml/Map.qml:647
msgid "✓"
msgstr "✓"
-#: qml/Map.qml:648
+#: qml/Map.qml:650
msgid "#%1"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/po/es.po
^
|
| @@ -4,17 +4,17 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
-# rinigus github, 2018
# Carmen Fernández B., 2021
+# rinigus github, 2021
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-30 21:01+0300\n"
+"POT-Creation-Date: 2021-10-16 18:03+0300\n"
"PO-Revision-Date: 2018-08-22 13:49+0000\n"
-"Last-Translator: Carmen Fernández B., 2021\n"
+"Last-Translator: rinigus github, 2021\n"
"Language-Team: Spanish (https://www.transifex.com/rinigus/teams/89597/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -45,10 +45,10 @@
#: poor/history.py:33 qml/GeocodeItem.qml:209 qml/GeocodeItem.qml:527
#: qml/MenuPage.qml:87 qml/Navigator.qml:192 qml/NearbyPage.qml:30
-#: qml/NearbyPage.qml:155 qml/NearbyPage.qml:170 qml/RoutePage.qml:40
-#: qml/RoutePage.qml:42 qml/RoutePage.qml:46 qml/RoutePage.qml:104
-#: qml/RoutePage.qml:461 qml/RoutePage.qml:466 qml/RoutePage.qml:693
-#: qml/RoutePage.qml:736 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
+#: qml/NearbyPage.qml:161 qml/NearbyPage.qml:176 qml/RoutePage.qml:40
+#: qml/RoutePage.qml:42 qml/RoutePage.qml:102 qml/RoutePage.qml:461
+#: qml/RoutePage.qml:466 qml/RoutePage.qml:694 qml/RoutePage.qml:723
+#: qml/RoutePage.qml:747 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
msgid "Current position"
msgstr "Posición actual"
@@ -230,11 +230,11 @@
msgid "{:d} h {:d} min"
msgstr "{:d} h {:d} min"
-#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:114
-#: routers/ValhallaSettings.qml:150 routers/ValhallaSettings.qml:203
-#: routers/ValhallaSettings.qml:221 routers/ValhallaSettings.qml:238
-#: routers/ValhallaSettings.qml:254 routers/ValhallaSettings.qml:274
-#: routers/ValhallaSettings.qml:290
+#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:133
+#: routers/ValhallaSettings.qml:169 routers/ValhallaSettings.qml:222
+#: routers/ValhallaSettings.qml:240 routers/ValhallaSettings.qml:257
+#: routers/ValhallaSettings.qml:273 routers/ValhallaSettings.qml:293
+#: routers/ValhallaSettings.qml:309
msgid "Prefer"
msgstr "Preferir"
@@ -344,7 +344,7 @@
#: qml/AttributionPage.qml:61 qml/GeocodeItem.qml:38 qml/GeocodePage.qml:27
#: qml/MenuPage.qml:54 qml/NearbyPage.qml:28 qml/PlaceTypePage.qml:79
-#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:685
+#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:643
msgid "Search"
msgstr "Buscar"
@@ -353,13 +353,13 @@
msgstr "Lugares"
#: qml/AttributionPage.qml:119 qml/MenuPage.qml:60 qml/NavigationPage.qml:27
-#: qml/PreferencesPage.qml:404 qml/RoutePage.qml:25
+#: qml/PreferencesPage.qml:362 qml/RoutePage.qml:25
msgid "Navigation"
msgstr "Navegación"
#: qml/BasemapButton.qml:225 qml/NearbyPage.qml:106 qml/PoiEditPage.qml:57
-#: routers/gpx_osmscout_settings.qml:52 routers/gpx_settings.qml:52
-#: routers/mapquest_open_settings.qml:27 routers/ValhallaSettings.qml:36
+#: routers/gpx_osmscout_settings.qml:54 routers/gpx_settings.qml:52
+#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
msgid "Type"
msgstr "Tipo"
@@ -407,23 +407,23 @@
msgid "Transport"
msgstr "Transporte"
-#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Bicycle"
msgstr "Bicicleta"
-#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Car"
msgstr "Coche"
-#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:131
+#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:150
msgid "Walking"
msgstr "A pie"
-#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:38
msgid "Public transport"
msgstr "T. Público"
@@ -439,15 +439,15 @@
msgid "Map: %1"
msgstr "Mapa: %1"
-#: qml/CenterButton.qml:110 qml/MapGestureArea.qml:46
+#: qml/CenterButton.qml:111 qml/MapGestureArea.qml:47
msgid "Auto-center off"
msgstr "Auto-centrado desactivado"
-#: qml/CenterButton.qml:118 qml/MapGestureArea.qml:45
+#: qml/CenterButton.qml:119 qml/MapGestureArea.qml:46
msgid "Auto-center on"
msgstr "Auto-centrado activado"
-#: qml/CenterButton.qml:124
+#: qml/CenterButton.qml:125
msgid "Tap center button again for auto-center"
msgstr "Pulsa de nuevo para activar auto-centrado"
@@ -456,7 +456,7 @@
msgstr "Sin seleccionar"
#: qml/GeocodeItem.qml:134 qml/NavigationPage.qml:185 qml/PlaceNamePage.qml:48
-#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:258
+#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:257
#: qml/RoutePage.qml:443 qml/RoutePage.qml:558
msgid "Remove"
msgstr "Borrar"
@@ -495,7 +495,7 @@
msgid "Recent searches (%1)"
msgstr "Búsquedas recientes (%1)"
-#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:54
+#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:52
msgid "Change provider (%1)"
msgstr "Cambiar proveedor (%1)"
@@ -515,11 +515,11 @@
msgid "Search engine"
msgstr "Motor de búsqueda"
-#: qml/InitPage.qml:33
+#: qml/InitPage.qml:32
msgid "Initializing"
msgstr "Inicializando"
-#: qml/InitPage.qml:46 qml/RoutePage.qml:194
+#: qml/InitPage.qml:46 qml/RoutePage.qml:193
msgid "Dismiss"
msgstr "Descartar"
@@ -537,6 +537,20 @@
"Mapbox y cumplimenta tu clave API personal en Preferencias. Esta clave no es"
" necesaria si planeas usar Pure Maps con el proveedor de mapas sin conexión."
+#: qml/LanguageSelector.qml:24
+msgid "Language"
+msgstr "Idioma"
+
+#: qml/LanguageSelector.qml:43 qml/PreferencesPage.qml:71
+#: qml/PreferencesPage.qml:760
+msgid "English"
+msgstr "Inglés"
+
+#: qml/LanguageSelector.qml:44 routers/gpx_osmscout_settings.qml:84
+#: routers/mapquest_open_settings.qml:59 routers/ValhallaSettings.qml:67
+msgid "English (United States)"
+msgstr "inglés (Estados Unidos)"
+
#: qml/MapErrorPage.qml:25
msgid "Error"
msgstr "Error"
@@ -596,24 +610,24 @@
msgid "Mixed"
msgstr "Mixto"
-#: qml/MapGestureArea.qml:63 qml/MapGestureArea.qml:81
+#: qml/MapGestureArea.qml:64 qml/MapGestureArea.qml:82
msgid "Stop navigation to select POI"
msgstr "Detener navegación para seleccionar POI"
-#: qml/Map.qml:641 qml/NavigationPage.qml:207 qml/PoiBlock.qml:251
-#: qml/RoutePage.qml:174
+#: qml/Map.qml:643 qml/NavigationPage.qml:207 qml/PoiBlock.qml:251
+#: qml/RoutePage.qml:173
msgid "Origin"
msgstr "Origen"
-#: qml/Map.qml:643 qml/NavigationPage.qml:210 qml/PoiBlock.qml:271
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/po/et.po
^
|
| @@ -5,15 +5,16 @@
#
# Translators:
# Priit Jõerüüt <transifex@joeruut.com>, 2021
+# rinigus github, 2021
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-20 16:10+0200\n"
+"POT-Creation-Date: 2021-10-16 18:03+0300\n"
"PO-Revision-Date: 2018-08-22 13:49+0000\n"
-"Last-Translator: Priit Jõerüüt <transifex@joeruut.com>, 2021\n"
+"Last-Translator: rinigus github, 2021\n"
"Language-Team: Estonian (https://www.transifex.com/rinigus/teams/89597/et/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -44,10 +45,10 @@
#: poor/history.py:33 qml/GeocodeItem.qml:209 qml/GeocodeItem.qml:527
#: qml/MenuPage.qml:87 qml/Navigator.qml:192 qml/NearbyPage.qml:30
-#: qml/NearbyPage.qml:155 qml/NearbyPage.qml:170 qml/RoutePage.qml:40
-#: qml/RoutePage.qml:42 qml/RoutePage.qml:46 qml/RoutePage.qml:104
-#: qml/RoutePage.qml:461 qml/RoutePage.qml:466 qml/RoutePage.qml:693
-#: qml/RoutePage.qml:736 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
+#: qml/NearbyPage.qml:161 qml/NearbyPage.qml:176 qml/RoutePage.qml:40
+#: qml/RoutePage.qml:42 qml/RoutePage.qml:102 qml/RoutePage.qml:461
+#: qml/RoutePage.qml:466 qml/RoutePage.qml:694 qml/RoutePage.qml:723
+#: qml/RoutePage.qml:747 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
msgid "Current position"
msgstr "Praegune asukoht"
@@ -229,11 +230,11 @@
msgid "{:d} h {:d} min"
msgstr "{:d} h {:d} min"
-#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:114
-#: routers/ValhallaSettings.qml:150 routers/ValhallaSettings.qml:203
-#: routers/ValhallaSettings.qml:221 routers/ValhallaSettings.qml:238
-#: routers/ValhallaSettings.qml:254 routers/ValhallaSettings.qml:274
-#: routers/ValhallaSettings.qml:290
+#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:133
+#: routers/ValhallaSettings.qml:169 routers/ValhallaSettings.qml:222
+#: routers/ValhallaSettings.qml:240 routers/ValhallaSettings.qml:257
+#: routers/ValhallaSettings.qml:273 routers/ValhallaSettings.qml:293
+#: routers/ValhallaSettings.qml:309
msgid "Prefer"
msgstr "Eelista"
@@ -343,7 +344,7 @@
#: qml/AttributionPage.qml:61 qml/GeocodeItem.qml:38 qml/GeocodePage.qml:27
#: qml/MenuPage.qml:54 qml/NearbyPage.qml:28 qml/PlaceTypePage.qml:79
-#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:685
+#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:643
msgid "Search"
msgstr "Otsi"
@@ -352,13 +353,13 @@
msgstr "Kohad ja paigad"
#: qml/AttributionPage.qml:119 qml/MenuPage.qml:60 qml/NavigationPage.qml:27
-#: qml/PreferencesPage.qml:404 qml/RoutePage.qml:25
+#: qml/PreferencesPage.qml:362 qml/RoutePage.qml:25
msgid "Navigation"
msgstr "Sinu teekond"
#: qml/BasemapButton.qml:225 qml/NearbyPage.qml:106 qml/PoiEditPage.qml:57
-#: routers/gpx_osmscout_settings.qml:52 routers/gpx_settings.qml:52
-#: routers/mapquest_open_settings.qml:27 routers/ValhallaSettings.qml:36
+#: routers/gpx_osmscout_settings.qml:54 routers/gpx_settings.qml:52
+#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
msgid "Type"
msgstr "Tüüp"
@@ -406,23 +407,23 @@
msgid "Transport"
msgstr "Transpordikaart"
-#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Bicycle"
msgstr "Jalgratas"
-#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Car"
msgstr "Auto"
-#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:131
+#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:150
msgid "Walking"
msgstr "Jalgsi"
-#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:38
msgid "Public transport"
msgstr "Ühistransport"
@@ -438,15 +439,15 @@
msgid "Map: %1"
msgstr "Kaart: %1"
-#: qml/CenterButton.qml:110 qml/MapGestureArea.qml:46
+#: qml/CenterButton.qml:111 qml/MapGestureArea.qml:47
msgid "Auto-center off"
msgstr "Kaardivaade ei ole automaatselt joondatud keskele"
-#: qml/CenterButton.qml:118 qml/MapGestureArea.qml:45
+#: qml/CenterButton.qml:119 qml/MapGestureArea.qml:46
msgid "Auto-center on"
msgstr "Kaardivaade on automaatselt joondatud keskele"
-#: qml/CenterButton.qml:124
+#: qml/CenterButton.qml:125
msgid "Tap center button again for auto-center"
msgstr "Kaardi joondamiseks keskele klõpsi musta mummu"
@@ -455,7 +456,7 @@
msgstr "Valik puudub"
#: qml/GeocodeItem.qml:134 qml/NavigationPage.qml:185 qml/PlaceNamePage.qml:48
-#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:258
+#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:257
#: qml/RoutePage.qml:443 qml/RoutePage.qml:558
msgid "Remove"
msgstr "Eemalda"
@@ -494,7 +495,7 @@
msgid "Recent searches (%1)"
msgstr "Hiljutised otsingud (%1)"
-#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:54
+#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:52
msgid "Change provider (%1)"
msgstr "Muuda teenusepakkujat (%1)"
@@ -514,11 +515,11 @@
msgid "Search engine"
msgstr "Otsingumootor"
-#: qml/InitPage.qml:33
+#: qml/InitPage.qml:32
msgid "Initializing"
msgstr "Käivitan rakendust"
-#: qml/InitPage.qml:46 qml/RoutePage.qml:194
+#: qml/InitPage.qml:46 qml/RoutePage.qml:193
msgid "Dismiss"
msgstr "Jäta pooleli"
@@ -536,6 +537,20 @@
"ja sisesta seadistustes oma isiklik Mapbox API võti. Kui sa kasutad Pure "
"Maps'is võrguvaba kaarditeenuse pakkujat, siis seda pole vaja teha."
+#: qml/LanguageSelector.qml:24
+msgid "Language"
+msgstr "Keel"
+
+#: qml/LanguageSelector.qml:43 qml/PreferencesPage.qml:71
+#: qml/PreferencesPage.qml:760
+msgid "English"
+msgstr "inglise"
+
+#: qml/LanguageSelector.qml:44 routers/gpx_osmscout_settings.qml:84
+#: routers/mapquest_open_settings.qml:59 routers/ValhallaSettings.qml:67
+msgid "English (United States)"
+msgstr "inglise (Ameerika Ühendriigid)"
+
#: qml/MapErrorPage.qml:25
msgid "Error"
msgstr "Viga"
@@ -596,24 +611,24 @@
msgid "Mixed"
msgstr "Kombineeritud kaardid"
-#: qml/MapGestureArea.qml:63 qml/MapGestureArea.qml:81
+#: qml/MapGestureArea.qml:64 qml/MapGestureArea.qml:82
msgid "Stop navigation to select POI"
msgstr "Huvipunkti valimiseks peata tee näitamine"
-#: qml/Map.qml:638 qml/NavigationPage.qml:207 qml/PoiBlock.qml:251
-#: qml/RoutePage.qml:174
+#: qml/Map.qml:643 qml/NavigationPage.qml:207 qml/PoiBlock.qml:251
+#: qml/RoutePage.qml:173
msgid "Origin"
msgstr "Lähtepunkt"
-#: qml/Map.qml:640 qml/NavigationPage.qml:210 qml/PoiBlock.qml:271
+#: qml/Map.qml:645 qml/NavigationPage.qml:210 qml/PoiBlock.qml:271
msgid "Final destination"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/po/fi.po
^
|
| @@ -4,18 +4,18 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
-# rinigus github, 2018
# Jiri Grönroos <jiri.gronroos@iki.fi>, 2020
# JR Fi <juho@reivo.fi>, 2021
+# rinigus github, 2021
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-30 21:01+0300\n"
+"POT-Creation-Date: 2021-10-16 18:03+0300\n"
"PO-Revision-Date: 2018-08-22 13:49+0000\n"
-"Last-Translator: JR Fi <juho@reivo.fi>, 2021\n"
+"Last-Translator: rinigus github, 2021\n"
"Language-Team: Finnish (https://www.transifex.com/rinigus/teams/89597/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -46,10 +46,10 @@
#: poor/history.py:33 qml/GeocodeItem.qml:209 qml/GeocodeItem.qml:527
#: qml/MenuPage.qml:87 qml/Navigator.qml:192 qml/NearbyPage.qml:30
-#: qml/NearbyPage.qml:155 qml/NearbyPage.qml:170 qml/RoutePage.qml:40
-#: qml/RoutePage.qml:42 qml/RoutePage.qml:46 qml/RoutePage.qml:104
-#: qml/RoutePage.qml:461 qml/RoutePage.qml:466 qml/RoutePage.qml:693
-#: qml/RoutePage.qml:736 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
+#: qml/NearbyPage.qml:161 qml/NearbyPage.qml:176 qml/RoutePage.qml:40
+#: qml/RoutePage.qml:42 qml/RoutePage.qml:102 qml/RoutePage.qml:461
+#: qml/RoutePage.qml:466 qml/RoutePage.qml:694 qml/RoutePage.qml:723
+#: qml/RoutePage.qml:747 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
msgid "Current position"
msgstr "Nykyinen sijainti"
@@ -231,11 +231,11 @@
msgid "{:d} h {:d} min"
msgstr "{:d} h {:d} min"
-#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:114
-#: routers/ValhallaSettings.qml:150 routers/ValhallaSettings.qml:203
-#: routers/ValhallaSettings.qml:221 routers/ValhallaSettings.qml:238
-#: routers/ValhallaSettings.qml:254 routers/ValhallaSettings.qml:274
-#: routers/ValhallaSettings.qml:290
+#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:133
+#: routers/ValhallaSettings.qml:169 routers/ValhallaSettings.qml:222
+#: routers/ValhallaSettings.qml:240 routers/ValhallaSettings.qml:257
+#: routers/ValhallaSettings.qml:273 routers/ValhallaSettings.qml:293
+#: routers/ValhallaSettings.qml:309
msgid "Prefer"
msgstr "Suosi"
@@ -345,7 +345,7 @@
#: qml/AttributionPage.qml:61 qml/GeocodeItem.qml:38 qml/GeocodePage.qml:27
#: qml/MenuPage.qml:54 qml/NearbyPage.qml:28 qml/PlaceTypePage.qml:79
-#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:685
+#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:643
msgid "Search"
msgstr "Haku"
@@ -354,13 +354,13 @@
msgstr "Paikat"
#: qml/AttributionPage.qml:119 qml/MenuPage.qml:60 qml/NavigationPage.qml:27
-#: qml/PreferencesPage.qml:404 qml/RoutePage.qml:25
+#: qml/PreferencesPage.qml:362 qml/RoutePage.qml:25
msgid "Navigation"
msgstr "Navigointi"
#: qml/BasemapButton.qml:225 qml/NearbyPage.qml:106 qml/PoiEditPage.qml:57
-#: routers/gpx_osmscout_settings.qml:52 routers/gpx_settings.qml:52
-#: routers/mapquest_open_settings.qml:27 routers/ValhallaSettings.qml:36
+#: routers/gpx_osmscout_settings.qml:54 routers/gpx_settings.qml:52
+#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
msgid "Type"
msgstr "Tyyppi"
@@ -408,23 +408,23 @@
msgid "Transport"
msgstr "Kulkutapa"
-#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Bicycle"
msgstr "Polkupyörä"
-#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Car"
msgstr "Auto"
-#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:131
+#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:150
msgid "Walking"
msgstr "Kävely"
-#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:38
msgid "Public transport"
msgstr "Julkinen liikenne"
@@ -440,15 +440,15 @@
msgid "Map: %1"
msgstr "Kartta: %1"
-#: qml/CenterButton.qml:110 qml/MapGestureArea.qml:46
+#: qml/CenterButton.qml:111 qml/MapGestureArea.qml:47
msgid "Auto-center off"
msgstr "Automaattinen keskitys pois"
-#: qml/CenterButton.qml:118 qml/MapGestureArea.qml:45
+#: qml/CenterButton.qml:119 qml/MapGestureArea.qml:46
msgid "Auto-center on"
msgstr "Automaattinen keskitys päällä"
-#: qml/CenterButton.qml:124
+#: qml/CenterButton.qml:125
msgid "Tap center button again for auto-center"
msgstr "Kosketa keskinappia uudelleen automaatti-keskittämiseksi"
@@ -457,7 +457,7 @@
msgstr "Ei valintaa"
#: qml/GeocodeItem.qml:134 qml/NavigationPage.qml:185 qml/PlaceNamePage.qml:48
-#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:258
+#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:257
#: qml/RoutePage.qml:443 qml/RoutePage.qml:558
msgid "Remove"
msgstr "Poista"
@@ -496,7 +496,7 @@
msgid "Recent searches (%1)"
msgstr "Viimeiset haut (%1)"
-#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:54
+#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:52
msgid "Change provider (%1)"
msgstr "Vaihda palveluntarjoajaa (%1)"
@@ -516,11 +516,11 @@
msgid "Search engine"
msgstr "Hakukone"
-#: qml/InitPage.qml:33
+#: qml/InitPage.qml:32
msgid "Initializing"
msgstr "Valmistelee"
-#: qml/InitPage.qml:46 qml/RoutePage.qml:194
+#: qml/InitPage.qml:46 qml/RoutePage.qml:193
msgid "Dismiss"
msgstr "Keskeytä"
@@ -539,6 +539,20 @@
"koodia ei tarvita, mikäli suunnittelet käyttäväsi Pure Maps:ia yhteydettömän"
" tilan karttalähteen kanssa."
+#: qml/LanguageSelector.qml:24
+msgid "Language"
+msgstr "Kieli"
+
+#: qml/LanguageSelector.qml:43 qml/PreferencesPage.qml:71
+#: qml/PreferencesPage.qml:760
+msgid "English"
+msgstr "englanti"
+
+#: qml/LanguageSelector.qml:44 routers/gpx_osmscout_settings.qml:84
+#: routers/mapquest_open_settings.qml:59 routers/ValhallaSettings.qml:67
+msgid "English (United States)"
+msgstr "englanti (Yhdysvallat)"
+
#: qml/MapErrorPage.qml:25
msgid "Error"
msgstr "Virhe"
@@ -598,24 +612,24 @@
msgid "Mixed"
msgstr "Yhdistetty tila"
-#: qml/MapGestureArea.qml:63 qml/MapGestureArea.qml:81
+#: qml/MapGestureArea.qml:64 qml/MapGestureArea.qml:82
msgid "Stop navigation to select POI"
msgstr "Lopeta navigointi valitaksesi kohdepisteen"
-#: qml/Map.qml:641 qml/NavigationPage.qml:207 qml/PoiBlock.qml:251
-#: qml/RoutePage.qml:174
+#: qml/Map.qml:643 qml/NavigationPage.qml:207 qml/PoiBlock.qml:251
+#: qml/RoutePage.qml:173
msgid "Origin"
msgstr "Alkupiste"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/po/fr.po
^
|
| @@ -4,21 +4,21 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
-# rinigus github, 2018
# Roman Meier <meierrom@gmail.com>, 2018
# Florian, 2019
# lutinotmalin, 2019
# Jordi, 2021
# Anne017, 2021
+# rinigus github, 2021
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-30 21:01+0300\n"
+"POT-Creation-Date: 2021-10-16 18:03+0300\n"
"PO-Revision-Date: 2018-08-22 13:49+0000\n"
-"Last-Translator: Anne017, 2021\n"
+"Last-Translator: rinigus github, 2021\n"
"Language-Team: French (https://www.transifex.com/rinigus/teams/89597/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -49,10 +49,10 @@
#: poor/history.py:33 qml/GeocodeItem.qml:209 qml/GeocodeItem.qml:527
#: qml/MenuPage.qml:87 qml/Navigator.qml:192 qml/NearbyPage.qml:30
-#: qml/NearbyPage.qml:155 qml/NearbyPage.qml:170 qml/RoutePage.qml:40
-#: qml/RoutePage.qml:42 qml/RoutePage.qml:46 qml/RoutePage.qml:104
-#: qml/RoutePage.qml:461 qml/RoutePage.qml:466 qml/RoutePage.qml:693
-#: qml/RoutePage.qml:736 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
+#: qml/NearbyPage.qml:161 qml/NearbyPage.qml:176 qml/RoutePage.qml:40
+#: qml/RoutePage.qml:42 qml/RoutePage.qml:102 qml/RoutePage.qml:461
+#: qml/RoutePage.qml:466 qml/RoutePage.qml:694 qml/RoutePage.qml:723
+#: qml/RoutePage.qml:747 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
msgid "Current position"
msgstr "Position actuelle"
@@ -234,11 +234,11 @@
msgid "{:d} h {:d} min"
msgstr "{:d} h {:d} min"
-#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:114
-#: routers/ValhallaSettings.qml:150 routers/ValhallaSettings.qml:203
-#: routers/ValhallaSettings.qml:221 routers/ValhallaSettings.qml:238
-#: routers/ValhallaSettings.qml:254 routers/ValhallaSettings.qml:274
-#: routers/ValhallaSettings.qml:290
+#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:133
+#: routers/ValhallaSettings.qml:169 routers/ValhallaSettings.qml:222
+#: routers/ValhallaSettings.qml:240 routers/ValhallaSettings.qml:257
+#: routers/ValhallaSettings.qml:273 routers/ValhallaSettings.qml:293
+#: routers/ValhallaSettings.qml:309
msgid "Prefer"
msgstr "Filtre"
@@ -347,7 +347,7 @@
#: qml/AttributionPage.qml:61 qml/GeocodeItem.qml:38 qml/GeocodePage.qml:27
#: qml/MenuPage.qml:54 qml/NearbyPage.qml:28 qml/PlaceTypePage.qml:79
-#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:685
+#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:643
msgid "Search"
msgstr "Rechercher"
@@ -356,13 +356,13 @@
msgstr "Lieux"
#: qml/AttributionPage.qml:119 qml/MenuPage.qml:60 qml/NavigationPage.qml:27
-#: qml/PreferencesPage.qml:404 qml/RoutePage.qml:25
+#: qml/PreferencesPage.qml:362 qml/RoutePage.qml:25
msgid "Navigation"
msgstr "Navigation"
#: qml/BasemapButton.qml:225 qml/NearbyPage.qml:106 qml/PoiEditPage.qml:57
-#: routers/gpx_osmscout_settings.qml:52 routers/gpx_settings.qml:52
-#: routers/mapquest_open_settings.qml:27 routers/ValhallaSettings.qml:36
+#: routers/gpx_osmscout_settings.qml:54 routers/gpx_settings.qml:52
+#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
msgid "Type"
msgstr "Type"
@@ -410,23 +410,23 @@
msgid "Transport"
msgstr "Transport"
-#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Bicycle"
msgstr "Vélo"
-#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Car"
msgstr "Voiture"
-#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:131
+#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:150
msgid "Walking"
msgstr "Marche"
-#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:38
msgid "Public transport"
msgstr "Transports en commun"
@@ -442,15 +442,15 @@
msgid "Map: %1"
msgstr "Carte : %1"
-#: qml/CenterButton.qml:110 qml/MapGestureArea.qml:46
+#: qml/CenterButton.qml:111 qml/MapGestureArea.qml:47
msgid "Auto-center off"
msgstr "Centrage automatique désactivé"
-#: qml/CenterButton.qml:118 qml/MapGestureArea.qml:45
+#: qml/CenterButton.qml:119 qml/MapGestureArea.qml:46
msgid "Auto-center on"
msgstr "Centrage automatique activé"
-#: qml/CenterButton.qml:124
+#: qml/CenterButton.qml:125
msgid "Tap center button again for auto-center"
msgstr "Réappuyez sur le bouton central pour centrer automatiquement"
@@ -459,7 +459,7 @@
msgstr "Aucune sélection"
#: qml/GeocodeItem.qml:134 qml/NavigationPage.qml:185 qml/PlaceNamePage.qml:48
-#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:258
+#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:257
#: qml/RoutePage.qml:443 qml/RoutePage.qml:558
msgid "Remove"
msgstr "Supprimer"
@@ -498,7 +498,7 @@
msgid "Recent searches (%1)"
msgstr "Dernières recherches (%1)"
-#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:54
+#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:52
msgid "Change provider (%1)"
msgstr "Changer de fournisseur (%1)"
@@ -518,11 +518,11 @@
msgid "Search engine"
msgstr "Moteur de recherche"
-#: qml/InitPage.qml:33
+#: qml/InitPage.qml:32
msgid "Initializing"
msgstr "Initialisation"
-#: qml/InitPage.qml:46 qml/RoutePage.qml:194
+#: qml/InitPage.qml:46 qml/RoutePage.qml:193
msgid "Dismiss"
msgstr "Écarter"
@@ -541,6 +541,20 @@
"dans les paramètres de l'application. Cette clé n'est toutefois pas requise "
"si vous destinez Pure Maps à une utilisation hors-ligne."
+#: qml/LanguageSelector.qml:24
+msgid "Language"
+msgstr "Langue"
+
+#: qml/LanguageSelector.qml:43 qml/PreferencesPage.qml:71
+#: qml/PreferencesPage.qml:760
+msgid "English"
+msgstr "Anglais"
+
+#: qml/LanguageSelector.qml:44 routers/gpx_osmscout_settings.qml:84
+#: routers/mapquest_open_settings.qml:59 routers/ValhallaSettings.qml:67
+msgid "English (United States)"
+msgstr "anglais (États-Unis)"
+
#: qml/MapErrorPage.qml:25
msgid "Error"
msgstr "Erreur"
@@ -600,24 +614,24 @@
msgid "Mixed"
msgstr "Les deux"
-#: qml/MapGestureArea.qml:63 qml/MapGestureArea.qml:81
+#: qml/MapGestureArea.qml:64 qml/MapGestureArea.qml:82
msgid "Stop navigation to select POI"
msgstr "Arrêter la navigation vers le point d'intérêt sélectionné"
-#: qml/Map.qml:641 qml/NavigationPage.qml:207 qml/PoiBlock.qml:251
-#: qml/RoutePage.qml:174
+#: qml/Map.qml:643 qml/NavigationPage.qml:207 qml/PoiBlock.qml:251
+#: qml/RoutePage.qml:173
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/po/fur.po
^
|
| @@ -4,16 +4,17 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
-# Fabio Tomat <f.t.public@gmail.com>, 2020
+# Fabio Tomat <f.t.public@gmail.com>, 2021
+# rinigus github, 2021
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-17 22:10+0200\n"
+"POT-Creation-Date: 2021-10-16 18:03+0300\n"
"PO-Revision-Date: 2018-08-22 13:49+0000\n"
-"Last-Translator: Fabio Tomat <f.t.public@gmail.com>, 2020\n"
+"Last-Translator: rinigus github, 2021\n"
"Language-Team: Friulian (https://www.transifex.com/rinigus/teams/89597/fur/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -44,10 +45,10 @@
#: poor/history.py:33 qml/GeocodeItem.qml:209 qml/GeocodeItem.qml:527
#: qml/MenuPage.qml:87 qml/Navigator.qml:192 qml/NearbyPage.qml:30
-#: qml/NearbyPage.qml:155 qml/NearbyPage.qml:170 qml/RoutePage.qml:40
-#: qml/RoutePage.qml:42 qml/RoutePage.qml:46 qml/RoutePage.qml:104
-#: qml/RoutePage.qml:461 qml/RoutePage.qml:466 qml/RoutePage.qml:693
-#: qml/RoutePage.qml:736 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
+#: qml/NearbyPage.qml:161 qml/NearbyPage.qml:176 qml/RoutePage.qml:40
+#: qml/RoutePage.qml:42 qml/RoutePage.qml:102 qml/RoutePage.qml:461
+#: qml/RoutePage.qml:466 qml/RoutePage.qml:694 qml/RoutePage.qml:723
+#: qml/RoutePage.qml:747 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
msgid "Current position"
msgstr "Posizion atuâl"
@@ -228,11 +229,11 @@
msgid "{:d} h {:d} min"
msgstr "{:d} h {:d} min"
-#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:114
-#: routers/ValhallaSettings.qml:150 routers/ValhallaSettings.qml:203
-#: routers/ValhallaSettings.qml:221 routers/ValhallaSettings.qml:238
-#: routers/ValhallaSettings.qml:254 routers/ValhallaSettings.qml:274
-#: routers/ValhallaSettings.qml:290
+#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:133
+#: routers/ValhallaSettings.qml:169 routers/ValhallaSettings.qml:222
+#: routers/ValhallaSettings.qml:240 routers/ValhallaSettings.qml:257
+#: routers/ValhallaSettings.qml:273 routers/ValhallaSettings.qml:293
+#: routers/ValhallaSettings.qml:309
msgid "Prefer"
msgstr "Preferìs"
@@ -342,7 +343,7 @@
#: qml/AttributionPage.qml:61 qml/GeocodeItem.qml:38 qml/GeocodePage.qml:27
#: qml/MenuPage.qml:54 qml/NearbyPage.qml:28 qml/PlaceTypePage.qml:79
-#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:685
+#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:643
msgid "Search"
msgstr "Cîr"
@@ -351,13 +352,13 @@
msgstr "Lûcs"
#: qml/AttributionPage.qml:119 qml/MenuPage.qml:60 qml/NavigationPage.qml:27
-#: qml/PreferencesPage.qml:404 qml/RoutePage.qml:25
+#: qml/PreferencesPage.qml:362 qml/RoutePage.qml:25
msgid "Navigation"
msgstr "Navigazion"
#: qml/BasemapButton.qml:225 qml/NearbyPage.qml:106 qml/PoiEditPage.qml:57
-#: routers/gpx_osmscout_settings.qml:52 routers/gpx_settings.qml:52
-#: routers/mapquest_open_settings.qml:27 routers/ValhallaSettings.qml:36
+#: routers/gpx_osmscout_settings.qml:54 routers/gpx_settings.qml:52
+#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
msgid "Type"
msgstr "Gjenar"
@@ -405,23 +406,23 @@
msgid "Transport"
msgstr "Mieç di traspuart"
-#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Bicycle"
msgstr "Biciclete"
-#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Car"
msgstr "Machine"
-#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:131
+#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:150
msgid "Walking"
msgstr "A pît"
-#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:38
msgid "Public transport"
msgstr "Traspuart public"
@@ -437,15 +438,15 @@
msgid "Map: %1"
msgstr "Mape: %1"
-#: qml/CenterButton.qml:110 qml/MapGestureArea.qml:46
+#: qml/CenterButton.qml:111 qml/MapGestureArea.qml:47
msgid "Auto-center off"
msgstr "Auto-centrament disativât"
-#: qml/CenterButton.qml:118 qml/MapGestureArea.qml:45
+#: qml/CenterButton.qml:119 qml/MapGestureArea.qml:46
msgid "Auto-center on"
msgstr "Auto-centrament ativât"
-#: qml/CenterButton.qml:124
+#: qml/CenterButton.qml:125
msgid "Tap center button again for auto-center"
msgstr "Torne batuce il boton par centrâ in automatic"
@@ -454,7 +455,7 @@
msgstr "Nissune selezion"
#: qml/GeocodeItem.qml:134 qml/NavigationPage.qml:185 qml/PlaceNamePage.qml:48
-#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:258
+#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:257
#: qml/RoutePage.qml:443 qml/RoutePage.qml:558
msgid "Remove"
msgstr "Gjave"
@@ -493,7 +494,7 @@
msgid "Recent searches (%1)"
msgstr "Ricercjis resintis (%1)"
-#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:54
+#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:52
msgid "Change provider (%1)"
msgstr "Cambie furnidôr (%1)"
@@ -513,11 +514,11 @@
msgid "Search engine"
msgstr "Motôr di ricercje"
-#: qml/InitPage.qml:33
+#: qml/InitPage.qml:32
msgid "Initializing"
msgstr "Inizializazion"
-#: qml/InitPage.qml:46 qml/RoutePage.qml:194
+#: qml/InitPage.qml:46 qml/RoutePage.qml:193
msgid "Dismiss"
msgstr "Pare vie"
@@ -536,6 +537,20 @@
"cheste clâf se tu programis di doprâ Pure Maps cul furnidôr di mapis fûr "
"rêt."
+#: qml/LanguageSelector.qml:24
+msgid "Language"
+msgstr "Lenghe"
+
+#: qml/LanguageSelector.qml:43 qml/PreferencesPage.qml:71
+#: qml/PreferencesPage.qml:760
+msgid "English"
+msgstr "Inglês"
+
+#: qml/LanguageSelector.qml:44 routers/gpx_osmscout_settings.qml:84
+#: routers/mapquest_open_settings.qml:59 routers/ValhallaSettings.qml:67
+msgid "English (United States)"
+msgstr "inglês (Stâts Unîts)"
+
#: qml/MapErrorPage.qml:25
msgid "Error"
msgstr "Erôr"
@@ -560,6 +575,11 @@
"Flathub, or your distribution. See <a href=\"https://rinigus.github.io"
"/osmscout-server\">OSM Scout Server manual</a> for details."
msgstr ""
+"Tu stâs doprant un profîl fûr rêt. Siguriti di vê instalât e in esecuzion "
+"OSM Scout Server. In base al to sisteme, al è disponibil o tai dipuesits des"
+" aplicazions (OpenRepos par Sailfish OS, OpenStore par Ubuntu Touch), "
+"Flathub o te tô distribuzion. Viôt il <a href=\"https://rinigus.github.io"
+"/osmscout-server\">manuâl di OSM Scout Server</a> par vê plui detais."
#: qml/MapErrorPage.qml:62
msgid ""
@@ -589,26 +609,26 @@
msgid "Mixed"
msgstr "Miscliç"
-#: qml/MapGestureArea.qml:63 qml/MapGestureArea.qml:81
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/po/nl.po
^
|
| @@ -4,18 +4,18 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
-# rinigus github, 2018
# Heimen Stoffels <vistausss@fastmail.com>, 2021
# Nathan Follens, 2021
+# rinigus github, 2021
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-30 21:01+0300\n"
+"POT-Creation-Date: 2021-10-16 18:03+0300\n"
"PO-Revision-Date: 2018-08-22 13:49+0000\n"
-"Last-Translator: Nathan Follens, 2021\n"
+"Last-Translator: rinigus github, 2021\n"
"Language-Team: Dutch (https://www.transifex.com/rinigus/teams/89597/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -46,10 +46,10 @@
#: poor/history.py:33 qml/GeocodeItem.qml:209 qml/GeocodeItem.qml:527
#: qml/MenuPage.qml:87 qml/Navigator.qml:192 qml/NearbyPage.qml:30
-#: qml/NearbyPage.qml:155 qml/NearbyPage.qml:170 qml/RoutePage.qml:40
-#: qml/RoutePage.qml:42 qml/RoutePage.qml:46 qml/RoutePage.qml:104
-#: qml/RoutePage.qml:461 qml/RoutePage.qml:466 qml/RoutePage.qml:693
-#: qml/RoutePage.qml:736 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
+#: qml/NearbyPage.qml:161 qml/NearbyPage.qml:176 qml/RoutePage.qml:40
+#: qml/RoutePage.qml:42 qml/RoutePage.qml:102 qml/RoutePage.qml:461
+#: qml/RoutePage.qml:466 qml/RoutePage.qml:694 qml/RoutePage.qml:723
+#: qml/RoutePage.qml:747 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
msgid "Current position"
msgstr "Huidige positie"
@@ -231,11 +231,11 @@
msgid "{:d} h {:d} min"
msgstr "{:d} u {:d} min"
-#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:114
-#: routers/ValhallaSettings.qml:150 routers/ValhallaSettings.qml:203
-#: routers/ValhallaSettings.qml:221 routers/ValhallaSettings.qml:238
-#: routers/ValhallaSettings.qml:254 routers/ValhallaSettings.qml:274
-#: routers/ValhallaSettings.qml:290
+#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:133
+#: routers/ValhallaSettings.qml:169 routers/ValhallaSettings.qml:222
+#: routers/ValhallaSettings.qml:240 routers/ValhallaSettings.qml:257
+#: routers/ValhallaSettings.qml:273 routers/ValhallaSettings.qml:293
+#: routers/ValhallaSettings.qml:309
msgid "Prefer"
msgstr "Verkiezen"
@@ -343,7 +343,7 @@
#: qml/AttributionPage.qml:61 qml/GeocodeItem.qml:38 qml/GeocodePage.qml:27
#: qml/MenuPage.qml:54 qml/NearbyPage.qml:28 qml/PlaceTypePage.qml:79
-#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:685
+#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:643
msgid "Search"
msgstr "Zoeken"
@@ -352,13 +352,13 @@
msgstr "Plaatsen"
#: qml/AttributionPage.qml:119 qml/MenuPage.qml:60 qml/NavigationPage.qml:27
-#: qml/PreferencesPage.qml:404 qml/RoutePage.qml:25
+#: qml/PreferencesPage.qml:362 qml/RoutePage.qml:25
msgid "Navigation"
msgstr "Navigatie"
#: qml/BasemapButton.qml:225 qml/NearbyPage.qml:106 qml/PoiEditPage.qml:57
-#: routers/gpx_osmscout_settings.qml:52 routers/gpx_settings.qml:52
-#: routers/mapquest_open_settings.qml:27 routers/ValhallaSettings.qml:36
+#: routers/gpx_osmscout_settings.qml:54 routers/gpx_settings.qml:52
+#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
msgid "Type"
msgstr "Soort"
@@ -406,23 +406,23 @@
msgid "Transport"
msgstr "Transport"
-#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Bicycle"
msgstr "Fiets"
-#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Car"
msgstr "Auto"
-#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:131
+#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:150
msgid "Walking"
msgstr "Lopen"
-#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:38
msgid "Public transport"
msgstr "Openbaar vervoer"
@@ -438,15 +438,15 @@
msgid "Map: %1"
msgstr "Kaart: %1"
-#: qml/CenterButton.qml:110 qml/MapGestureArea.qml:46
+#: qml/CenterButton.qml:111 qml/MapGestureArea.qml:47
msgid "Auto-center off"
msgstr "Automatisch centreren uit"
-#: qml/CenterButton.qml:118 qml/MapGestureArea.qml:45
+#: qml/CenterButton.qml:119 qml/MapGestureArea.qml:46
msgid "Auto-center on"
msgstr "Automatisch centreren aan"
-#: qml/CenterButton.qml:124
+#: qml/CenterButton.qml:125
msgid "Tap center button again for auto-center"
msgstr "Druk nogmaals op de centreerknop om automatisch te centreren"
@@ -455,7 +455,7 @@
msgstr "Geen selectie"
#: qml/GeocodeItem.qml:134 qml/NavigationPage.qml:185 qml/PlaceNamePage.qml:48
-#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:258
+#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:257
#: qml/RoutePage.qml:443 qml/RoutePage.qml:558
msgid "Remove"
msgstr "Verwijderen"
@@ -494,7 +494,7 @@
msgid "Recent searches (%1)"
msgstr "Recente zoekopdrachten (%1)"
-#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:54
+#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:52
msgid "Change provider (%1)"
msgstr "Andere dienst kiezen (%1)"
@@ -514,11 +514,11 @@
msgid "Search engine"
msgstr "Zoekmotor"
-#: qml/InitPage.qml:33
+#: qml/InitPage.qml:32
msgid "Initializing"
msgstr "Bezig met initialiseren"
-#: qml/InitPage.qml:46 qml/RoutePage.qml:194
+#: qml/InitPage.qml:46 qml/RoutePage.qml:193
msgid "Dismiss"
msgstr "Sluiten"
@@ -537,6 +537,20 @@
"sleutel is niet nodig als je Pure Maps enkel met de offlinekaartdienst wilt "
"gebruiken."
+#: qml/LanguageSelector.qml:24
+msgid "Language"
+msgstr "Taal"
+
+#: qml/LanguageSelector.qml:43 qml/PreferencesPage.qml:71
+#: qml/PreferencesPage.qml:760
+msgid "English"
+msgstr "Engels"
+
+#: qml/LanguageSelector.qml:44 routers/gpx_osmscout_settings.qml:84
+#: routers/mapquest_open_settings.qml:59 routers/ValhallaSettings.qml:67
+msgid "English (United States)"
+msgstr "Engels (Verenigde Staten)"
+
#: qml/MapErrorPage.qml:25
msgid "Error"
msgstr "Fout"
@@ -596,24 +610,24 @@
msgid "Mixed"
msgstr "Gemengd"
-#: qml/MapGestureArea.qml:63 qml/MapGestureArea.qml:81
+#: qml/MapGestureArea.qml:64 qml/MapGestureArea.qml:82
msgid "Stop navigation to select POI"
msgstr "Navigatie stoppen om nuttige plaats te selecteren"
-#: qml/Map.qml:641 qml/NavigationPage.qml:207 qml/PoiBlock.qml:251
-#: qml/RoutePage.qml:174
+#: qml/Map.qml:643 qml/NavigationPage.qml:207 qml/PoiBlock.qml:251
+#: qml/RoutePage.qml:173
msgid "Origin"
msgstr "Vertrekpunt"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/po/pl.po
^
|
| @@ -4,17 +4,17 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
-# rinigus github, 2018
# Atlochowski <hucul@o2.pl>, 2021
+# rinigus github, 2021
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-22 13:51+0300\n"
+"POT-Creation-Date: 2021-10-16 18:03+0300\n"
"PO-Revision-Date: 2018-08-22 13:49+0000\n"
-"Last-Translator: Atlochowski <hucul@o2.pl>, 2021\n"
+"Last-Translator: rinigus github, 2021\n"
"Language-Team: Polish (https://www.transifex.com/rinigus/teams/89597/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -45,10 +45,10 @@
#: poor/history.py:33 qml/GeocodeItem.qml:209 qml/GeocodeItem.qml:527
#: qml/MenuPage.qml:87 qml/Navigator.qml:192 qml/NearbyPage.qml:30
-#: qml/NearbyPage.qml:155 qml/NearbyPage.qml:170 qml/RoutePage.qml:40
-#: qml/RoutePage.qml:42 qml/RoutePage.qml:46 qml/RoutePage.qml:104
-#: qml/RoutePage.qml:461 qml/RoutePage.qml:466 qml/RoutePage.qml:693
-#: qml/RoutePage.qml:736 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
+#: qml/NearbyPage.qml:161 qml/NearbyPage.qml:176 qml/RoutePage.qml:40
+#: qml/RoutePage.qml:42 qml/RoutePage.qml:102 qml/RoutePage.qml:461
+#: qml/RoutePage.qml:466 qml/RoutePage.qml:694 qml/RoutePage.qml:723
+#: qml/RoutePage.qml:747 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
msgid "Current position"
msgstr "Obecna pozycja"
@@ -230,11 +230,11 @@
msgid "{:d} h {:d} min"
msgstr "{:d} g {:d} min"
-#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:114
-#: routers/ValhallaSettings.qml:150 routers/ValhallaSettings.qml:203
-#: routers/ValhallaSettings.qml:221 routers/ValhallaSettings.qml:238
-#: routers/ValhallaSettings.qml:254 routers/ValhallaSettings.qml:274
-#: routers/ValhallaSettings.qml:290
+#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:133
+#: routers/ValhallaSettings.qml:169 routers/ValhallaSettings.qml:222
+#: routers/ValhallaSettings.qml:240 routers/ValhallaSettings.qml:257
+#: routers/ValhallaSettings.qml:273 routers/ValhallaSettings.qml:293
+#: routers/ValhallaSettings.qml:309
msgid "Prefer"
msgstr "Preferowana"
@@ -344,7 +344,7 @@
#: qml/AttributionPage.qml:61 qml/GeocodeItem.qml:38 qml/GeocodePage.qml:27
#: qml/MenuPage.qml:54 qml/NearbyPage.qml:28 qml/PlaceTypePage.qml:79
-#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:685
+#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:643
msgid "Search"
msgstr "Wyszukaj"
@@ -353,13 +353,13 @@
msgstr "Miejsca"
#: qml/AttributionPage.qml:119 qml/MenuPage.qml:60 qml/NavigationPage.qml:27
-#: qml/PreferencesPage.qml:404 qml/RoutePage.qml:25
+#: qml/PreferencesPage.qml:362 qml/RoutePage.qml:25
msgid "Navigation"
msgstr "Nawigacja"
#: qml/BasemapButton.qml:225 qml/NearbyPage.qml:106 qml/PoiEditPage.qml:57
-#: routers/gpx_osmscout_settings.qml:52 routers/gpx_settings.qml:52
-#: routers/mapquest_open_settings.qml:27 routers/ValhallaSettings.qml:36
+#: routers/gpx_osmscout_settings.qml:54 routers/gpx_settings.qml:52
+#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
msgid "Type"
msgstr "Rodzaj"
@@ -407,23 +407,23 @@
msgid "Transport"
msgstr "Transport"
-#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Bicycle"
msgstr "Rower"
-#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Car"
msgstr "Samochód"
-#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:131
+#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:150
msgid "Walking"
msgstr "Pieszo"
-#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:38
msgid "Public transport"
msgstr "Transport publiczny"
@@ -439,15 +439,15 @@
msgid "Map: %1"
msgstr "Mapa: %1"
-#: qml/CenterButton.qml:110 qml/MapGestureArea.qml:46
+#: qml/CenterButton.qml:111 qml/MapGestureArea.qml:47
msgid "Auto-center off"
msgstr "Automatyczne wyśrodkowanie wyłączone"
-#: qml/CenterButton.qml:118 qml/MapGestureArea.qml:45
+#: qml/CenterButton.qml:119 qml/MapGestureArea.qml:46
msgid "Auto-center on"
msgstr "Automatyczne wyśrodkowanie włączone"
-#: qml/CenterButton.qml:124
+#: qml/CenterButton.qml:125
msgid "Tap center button again for auto-center"
msgstr "Naciśnij ponownie środkowy przycisk, aby wyśrodkować"
@@ -456,7 +456,7 @@
msgstr "Brak zaznaczenia"
#: qml/GeocodeItem.qml:134 qml/NavigationPage.qml:185 qml/PlaceNamePage.qml:48
-#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:258
+#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:257
#: qml/RoutePage.qml:443 qml/RoutePage.qml:558
msgid "Remove"
msgstr "Usuń"
@@ -495,7 +495,7 @@
msgid "Recent searches (%1)"
msgstr "Ostatnie wyszukiwania (%1)"
-#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:54
+#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:52
msgid "Change provider (%1)"
msgstr "Zmień dostawcę (%1)"
@@ -515,19 +515,19 @@
msgid "Search engine"
msgstr "Silnik wyszukiwania"
-#: qml/InitPage.qml:33
+#: qml/InitPage.qml:32
msgid "Initializing"
msgstr "Uruchamianie"
-#: qml/InitPage.qml:47 qml/RoutePage.qml:194
+#: qml/InitPage.qml:46 qml/RoutePage.qml:193
msgid "Dismiss"
msgstr "Odrzuć"
-#: qml/InitPage.qml:48
+#: qml/InitPage.qml:47
msgid "Missing Mapbox key"
msgstr "Brakujący klucz Mapbox"
-#: qml/InitPage.qml:49
+#: qml/InitPage.qml:48
msgid ""
"Your installation is missing Mapbox API key. Please register at Mapbox and "
"fill in your personal API key in Preferences. This key is not needed if you "
@@ -537,6 +537,20 @@
"wpisz swój osobisty klucz API w Preferencjach. Ten klucz nie jest potrzebny,"
" jeśli masz zamiar używać Pure Maps z dostawcą map offline."
+#: qml/LanguageSelector.qml:24
+msgid "Language"
+msgstr "Język"
+
+#: qml/LanguageSelector.qml:43 qml/PreferencesPage.qml:71
+#: qml/PreferencesPage.qml:760
+msgid "English"
+msgstr "Angielski"
+
+#: qml/LanguageSelector.qml:44 routers/gpx_osmscout_settings.qml:84
+#: routers/mapquest_open_settings.qml:59 routers/ValhallaSettings.qml:67
+msgid "English (United States)"
+msgstr "angielski (Stany Zjednoczone)"
+
#: qml/MapErrorPage.qml:25
msgid "Error"
msgstr "Błąd"
@@ -590,24 +604,24 @@
msgid "Mixed"
msgstr "Mieszany"
-#: qml/MapGestureArea.qml:63 qml/MapGestureArea.qml:81
+#: qml/MapGestureArea.qml:64 qml/MapGestureArea.qml:82
msgid "Stop navigation to select POI"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/po/pt_BR.po
^
|
| @@ -4,18 +4,18 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
-# rinigus github, 2018
# Gustavo Martins <gustavo737@gmail.com>, 2020
# Caio2k, 2021
+# rinigus github, 2021
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-22 13:51+0300\n"
+"POT-Creation-Date: 2021-10-16 18:03+0300\n"
"PO-Revision-Date: 2018-08-22 13:49+0000\n"
-"Last-Translator: Caio2k, 2021\n"
+"Last-Translator: rinigus github, 2021\n"
"Language-Team: Portuguese (Brazil) (https://www.transifex.com/rinigus/teams/89597/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -46,10 +46,10 @@
#: poor/history.py:33 qml/GeocodeItem.qml:209 qml/GeocodeItem.qml:527
#: qml/MenuPage.qml:87 qml/Navigator.qml:192 qml/NearbyPage.qml:30
-#: qml/NearbyPage.qml:155 qml/NearbyPage.qml:170 qml/RoutePage.qml:40
-#: qml/RoutePage.qml:42 qml/RoutePage.qml:46 qml/RoutePage.qml:104
-#: qml/RoutePage.qml:461 qml/RoutePage.qml:466 qml/RoutePage.qml:693
-#: qml/RoutePage.qml:736 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
+#: qml/NearbyPage.qml:161 qml/NearbyPage.qml:176 qml/RoutePage.qml:40
+#: qml/RoutePage.qml:42 qml/RoutePage.qml:102 qml/RoutePage.qml:461
+#: qml/RoutePage.qml:466 qml/RoutePage.qml:694 qml/RoutePage.qml:723
+#: qml/RoutePage.qml:747 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
msgid "Current position"
msgstr "Posição atual"
@@ -231,11 +231,11 @@
msgid "{:d} h {:d} min"
msgstr "{:d}h{:d}min"
-#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:114
-#: routers/ValhallaSettings.qml:150 routers/ValhallaSettings.qml:203
-#: routers/ValhallaSettings.qml:221 routers/ValhallaSettings.qml:238
-#: routers/ValhallaSettings.qml:254 routers/ValhallaSettings.qml:274
-#: routers/ValhallaSettings.qml:290
+#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:133
+#: routers/ValhallaSettings.qml:169 routers/ValhallaSettings.qml:222
+#: routers/ValhallaSettings.qml:240 routers/ValhallaSettings.qml:257
+#: routers/ValhallaSettings.qml:273 routers/ValhallaSettings.qml:293
+#: routers/ValhallaSettings.qml:309
msgid "Prefer"
msgstr "Preferência"
@@ -345,7 +345,7 @@
#: qml/AttributionPage.qml:61 qml/GeocodeItem.qml:38 qml/GeocodePage.qml:27
#: qml/MenuPage.qml:54 qml/NearbyPage.qml:28 qml/PlaceTypePage.qml:79
-#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:685
+#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:643
msgid "Search"
msgstr "Pesquisar"
@@ -354,13 +354,13 @@
msgstr "Locais"
#: qml/AttributionPage.qml:119 qml/MenuPage.qml:60 qml/NavigationPage.qml:27
-#: qml/PreferencesPage.qml:404 qml/RoutePage.qml:25
+#: qml/PreferencesPage.qml:362 qml/RoutePage.qml:25
msgid "Navigation"
msgstr "Navegação"
#: qml/BasemapButton.qml:225 qml/NearbyPage.qml:106 qml/PoiEditPage.qml:57
-#: routers/gpx_osmscout_settings.qml:52 routers/gpx_settings.qml:52
-#: routers/mapquest_open_settings.qml:27 routers/ValhallaSettings.qml:36
+#: routers/gpx_osmscout_settings.qml:54 routers/gpx_settings.qml:52
+#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
msgid "Type"
msgstr "Tipo"
@@ -408,23 +408,23 @@
msgid "Transport"
msgstr "Transporte"
-#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Bicycle"
msgstr "Bicicleta"
-#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Car"
msgstr "Carro"
-#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:131
+#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:150
msgid "Walking"
msgstr "Caminhada"
-#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:38
msgid "Public transport"
msgstr "Transporte público"
@@ -440,15 +440,15 @@
msgid "Map: %1"
msgstr "Mapa: %1"
-#: qml/CenterButton.qml:110 qml/MapGestureArea.qml:46
+#: qml/CenterButton.qml:111 qml/MapGestureArea.qml:47
msgid "Auto-center off"
msgstr "Centralização automática desativada"
-#: qml/CenterButton.qml:118 qml/MapGestureArea.qml:45
+#: qml/CenterButton.qml:119 qml/MapGestureArea.qml:46
msgid "Auto-center on"
msgstr "Centralização automática ativa"
-#: qml/CenterButton.qml:124
+#: qml/CenterButton.qml:125
msgid "Tap center button again for auto-center"
msgstr "Toque no botão do meio para auto centralizar"
@@ -457,7 +457,7 @@
msgstr "Nada selecionado"
#: qml/GeocodeItem.qml:134 qml/NavigationPage.qml:185 qml/PlaceNamePage.qml:48
-#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:258
+#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:257
#: qml/RoutePage.qml:443 qml/RoutePage.qml:558
msgid "Remove"
msgstr "Remover"
@@ -496,7 +496,7 @@
msgid "Recent searches (%1)"
msgstr "Pesquisas recentes (%1)"
-#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:54
+#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:52
msgid "Change provider (%1)"
msgstr "Mudar provedor (%1)"
@@ -516,19 +516,19 @@
msgid "Search engine"
msgstr "Motor de busca"
-#: qml/InitPage.qml:33
+#: qml/InitPage.qml:32
msgid "Initializing"
msgstr "Iniciando"
-#: qml/InitPage.qml:47 qml/RoutePage.qml:194
+#: qml/InitPage.qml:46 qml/RoutePage.qml:193
msgid "Dismiss"
msgstr "Dispensar"
-#: qml/InitPage.qml:48
+#: qml/InitPage.qml:47
msgid "Missing Mapbox key"
msgstr "Faltando chave do Mapbox"
-#: qml/InitPage.qml:49
+#: qml/InitPage.qml:48
msgid ""
"Your installation is missing Mapbox API key. Please register at Mapbox and "
"fill in your personal API key in Preferences. This key is not needed if you "
@@ -539,6 +539,20 @@
"Preferências. Essa chave não é necessária se não pretende usar o Pure Maps "
"com o provedor de mapas offline."
+#: qml/LanguageSelector.qml:24
+msgid "Language"
+msgstr "Língua"
+
+#: qml/LanguageSelector.qml:43 qml/PreferencesPage.qml:71
+#: qml/PreferencesPage.qml:760
+msgid "English"
+msgstr "Inglês"
+
+#: qml/LanguageSelector.qml:44 routers/gpx_osmscout_settings.qml:84
+#: routers/mapquest_open_settings.qml:59 routers/ValhallaSettings.qml:67
+msgid "English (United States)"
+msgstr "inglês (Estados Unidos)"
+
#: qml/MapErrorPage.qml:25
msgid "Error"
msgstr "Erro"
@@ -598,24 +612,24 @@
msgid "Mixed"
msgstr "Misto"
-#: qml/MapGestureArea.qml:63 qml/MapGestureArea.qml:81
+#: qml/MapGestureArea.qml:64 qml/MapGestureArea.qml:82
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/po/pure-maps.pot
^
|
| @@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-22 13:51+0300\n"
+"POT-Creation-Date: 2021-10-17 12:41+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,10 +40,10 @@
#: poor/history.py:33 qml/GeocodeItem.qml:209 qml/GeocodeItem.qml:527
#: qml/MenuPage.qml:87 qml/Navigator.qml:192 qml/NearbyPage.qml:30
-#: qml/NearbyPage.qml:155 qml/NearbyPage.qml:170 qml/RoutePage.qml:40
-#: qml/RoutePage.qml:42 qml/RoutePage.qml:46 qml/RoutePage.qml:104
-#: qml/RoutePage.qml:461 qml/RoutePage.qml:466 qml/RoutePage.qml:693
-#: qml/RoutePage.qml:736 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
+#: qml/NearbyPage.qml:161 qml/NearbyPage.qml:176 qml/RoutePage.qml:40
+#: qml/RoutePage.qml:42 qml/RoutePage.qml:102 qml/RoutePage.qml:461
+#: qml/RoutePage.qml:466 qml/RoutePage.qml:694 qml/RoutePage.qml:723
+#: qml/RoutePage.qml:747 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
msgid "Current position"
msgstr ""
@@ -213,11 +213,11 @@
msgid "{:d} h {:d} min"
msgstr ""
-#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:114
-#: routers/ValhallaSettings.qml:150 routers/ValhallaSettings.qml:203
-#: routers/ValhallaSettings.qml:221 routers/ValhallaSettings.qml:238
-#: routers/ValhallaSettings.qml:254 routers/ValhallaSettings.qml:274
-#: routers/ValhallaSettings.qml:290
+#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:133
+#: routers/ValhallaSettings.qml:169 routers/ValhallaSettings.qml:222
+#: routers/ValhallaSettings.qml:240 routers/ValhallaSettings.qml:257
+#: routers/ValhallaSettings.qml:273 routers/ValhallaSettings.qml:293
+#: routers/ValhallaSettings.qml:309
msgid "Prefer"
msgstr ""
@@ -311,7 +311,7 @@
#: qml/AttributionPage.qml:61 qml/GeocodeItem.qml:38 qml/GeocodePage.qml:27
#: qml/MenuPage.qml:54 qml/NearbyPage.qml:28 qml/PlaceTypePage.qml:79
-#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:685
+#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:643
msgid "Search"
msgstr ""
@@ -320,13 +320,13 @@
msgstr ""
#: qml/AttributionPage.qml:119 qml/MenuPage.qml:60 qml/NavigationPage.qml:27
-#: qml/PreferencesPage.qml:404 qml/RoutePage.qml:25
+#: qml/PreferencesPage.qml:362 qml/RoutePage.qml:25
msgid "Navigation"
msgstr ""
#: qml/BasemapButton.qml:225 qml/NearbyPage.qml:106 qml/PoiEditPage.qml:57
-#: routers/gpx_osmscout_settings.qml:52 routers/gpx_settings.qml:52
-#: routers/mapquest_open_settings.qml:27 routers/ValhallaSettings.qml:36
+#: routers/gpx_osmscout_settings.qml:54 routers/gpx_settings.qml:52
+#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
msgid "Type"
msgstr ""
@@ -374,23 +374,23 @@
msgid "Transport"
msgstr ""
-#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Bicycle"
msgstr ""
-#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Car"
msgstr ""
-#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:131
+#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:150
msgid "Walking"
msgstr ""
-#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:38
msgid "Public transport"
msgstr ""
@@ -406,15 +406,15 @@
msgid "Map: %1"
msgstr ""
-#: qml/CenterButton.qml:110 qml/MapGestureArea.qml:46
+#: qml/CenterButton.qml:111 qml/MapGestureArea.qml:47
msgid "Auto-center off"
msgstr ""
-#: qml/CenterButton.qml:118 qml/MapGestureArea.qml:45
+#: qml/CenterButton.qml:119 qml/MapGestureArea.qml:46
msgid "Auto-center on"
msgstr ""
-#: qml/CenterButton.qml:124
+#: qml/CenterButton.qml:125
msgid "Tap center button again for auto-center"
msgstr ""
@@ -423,7 +423,7 @@
msgstr ""
#: qml/GeocodeItem.qml:134 qml/NavigationPage.qml:185 qml/PlaceNamePage.qml:48
-#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:258
+#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:257
#: qml/RoutePage.qml:443 qml/RoutePage.qml:558
msgid "Remove"
msgstr ""
@@ -462,7 +462,7 @@
msgid "Recent searches (%1)"
msgstr ""
-#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:54
+#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:52
msgid "Change provider (%1)"
msgstr ""
@@ -482,25 +482,39 @@
msgid "Search engine"
msgstr ""
-#: qml/InitPage.qml:33
+#: qml/InitPage.qml:32
msgid "Initializing"
msgstr ""
-#: qml/InitPage.qml:47 qml/RoutePage.qml:194
+#: qml/InitPage.qml:46 qml/RoutePage.qml:193
msgid "Dismiss"
msgstr ""
-#: qml/InitPage.qml:48
+#: qml/InitPage.qml:47
msgid "Missing Mapbox key"
msgstr ""
-#: qml/InitPage.qml:49
+#: qml/InitPage.qml:48
msgid ""
"Your installation is missing Mapbox API key. Please register at Mapbox and "
"fill in your personal API key in Preferences. This key is not needed if you "
"plan to use Pure Maps with the offline map provider."
msgstr ""
+#: qml/LanguageSelector.qml:24
+msgid "Language"
+msgstr ""
+
+#: qml/LanguageSelector.qml:43 qml/PreferencesPage.qml:71
+#: qml/PreferencesPage.qml:760
+msgid "English"
+msgstr ""
+
+#: qml/LanguageSelector.qml:44 routers/gpx_osmscout_settings.qml:84
+#: routers/mapquest_open_settings.qml:59 routers/ValhallaSettings.qml:67
+msgid "English (United States)"
+msgstr ""
+
#: qml/MapErrorPage.qml:25
msgid "Error"
msgstr ""
@@ -552,24 +566,24 @@
msgid "Mixed"
msgstr ""
-#: qml/MapGestureArea.qml:63 qml/MapGestureArea.qml:81
+#: qml/MapGestureArea.qml:64 qml/MapGestureArea.qml:82
msgid "Stop navigation to select POI"
msgstr ""
-#: qml/Map.qml:641 qml/NavigationPage.qml:207 qml/PoiBlock.qml:251
-#: qml/RoutePage.qml:174
+#: qml/Map.qml:643 qml/NavigationPage.qml:207 qml/PoiBlock.qml:251
+#: qml/RoutePage.qml:173
msgid "Origin"
msgstr ""
-#: qml/Map.qml:643 qml/NavigationPage.qml:210 qml/PoiBlock.qml:271
+#: qml/Map.qml:645 qml/NavigationPage.qml:210 qml/PoiBlock.qml:271
msgid "Final destination"
msgstr ""
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/po/ru.po
^
|
| @@ -4,18 +4,18 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
-# rinigus github, 2019
# Вячеслав Диконов <sdiconov@mail.ru>, 2020
# Oleg Artobolevsky <artobolevsky.oleg@yandex.ru>, 2021
+# rinigus github, 2021
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-30 21:01+0300\n"
+"POT-Creation-Date: 2021-10-16 18:03+0300\n"
"PO-Revision-Date: 2018-08-22 13:49+0000\n"
-"Last-Translator: Oleg Artobolevsky <artobolevsky.oleg@yandex.ru>, 2021\n"
+"Last-Translator: rinigus github, 2021\n"
"Language-Team: Russian (https://www.transifex.com/rinigus/teams/89597/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -46,10 +46,10 @@
#: poor/history.py:33 qml/GeocodeItem.qml:209 qml/GeocodeItem.qml:527
#: qml/MenuPage.qml:87 qml/Navigator.qml:192 qml/NearbyPage.qml:30
-#: qml/NearbyPage.qml:155 qml/NearbyPage.qml:170 qml/RoutePage.qml:40
-#: qml/RoutePage.qml:42 qml/RoutePage.qml:46 qml/RoutePage.qml:104
-#: qml/RoutePage.qml:461 qml/RoutePage.qml:466 qml/RoutePage.qml:693
-#: qml/RoutePage.qml:736 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
+#: qml/NearbyPage.qml:161 qml/NearbyPage.qml:176 qml/RoutePage.qml:40
+#: qml/RoutePage.qml:42 qml/RoutePage.qml:102 qml/RoutePage.qml:461
+#: qml/RoutePage.qml:466 qml/RoutePage.qml:694 qml/RoutePage.qml:723
+#: qml/RoutePage.qml:747 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
msgid "Current position"
msgstr "Текущая позиция"
@@ -232,11 +232,11 @@
msgid "{:d} h {:d} min"
msgstr "{:d} ч {:d} мин"
-#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:114
-#: routers/ValhallaSettings.qml:150 routers/ValhallaSettings.qml:203
-#: routers/ValhallaSettings.qml:221 routers/ValhallaSettings.qml:238
-#: routers/ValhallaSettings.qml:254 routers/ValhallaSettings.qml:274
-#: routers/ValhallaSettings.qml:290
+#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:133
+#: routers/ValhallaSettings.qml:169 routers/ValhallaSettings.qml:222
+#: routers/ValhallaSettings.qml:240 routers/ValhallaSettings.qml:257
+#: routers/ValhallaSettings.qml:273 routers/ValhallaSettings.qml:293
+#: routers/ValhallaSettings.qml:309
msgid "Prefer"
msgstr "Настройка"
@@ -345,7 +345,7 @@
#: qml/AttributionPage.qml:61 qml/GeocodeItem.qml:38 qml/GeocodePage.qml:27
#: qml/MenuPage.qml:54 qml/NearbyPage.qml:28 qml/PlaceTypePage.qml:79
-#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:685
+#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:643
msgid "Search"
msgstr "Поиск"
@@ -354,13 +354,13 @@
msgstr "Заведения"
#: qml/AttributionPage.qml:119 qml/MenuPage.qml:60 qml/NavigationPage.qml:27
-#: qml/PreferencesPage.qml:404 qml/RoutePage.qml:25
+#: qml/PreferencesPage.qml:362 qml/RoutePage.qml:25
msgid "Navigation"
msgstr "Навигация"
#: qml/BasemapButton.qml:225 qml/NearbyPage.qml:106 qml/PoiEditPage.qml:57
-#: routers/gpx_osmscout_settings.qml:52 routers/gpx_settings.qml:52
-#: routers/mapquest_open_settings.qml:27 routers/ValhallaSettings.qml:36
+#: routers/gpx_osmscout_settings.qml:54 routers/gpx_settings.qml:52
+#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
msgid "Type"
msgstr "Тип"
@@ -408,23 +408,23 @@
msgid "Transport"
msgstr "Транспорт"
-#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Bicycle"
msgstr "Велосипед"
-#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Car"
msgstr "Автомобиль"
-#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:131
+#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:150
msgid "Walking"
msgstr "Ходьба"
-#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:38
msgid "Public transport"
msgstr "Общественный транспорт"
@@ -440,15 +440,15 @@
msgid "Map: %1"
msgstr "Карта: %1"
-#: qml/CenterButton.qml:110 qml/MapGestureArea.qml:46
+#: qml/CenterButton.qml:111 qml/MapGestureArea.qml:47
msgid "Auto-center off"
msgstr "Автоматическое центрирование карты выключено"
-#: qml/CenterButton.qml:118 qml/MapGestureArea.qml:45
+#: qml/CenterButton.qml:119 qml/MapGestureArea.qml:46
msgid "Auto-center on"
msgstr "Автоматическое центрирование карты включено"
-#: qml/CenterButton.qml:124
+#: qml/CenterButton.qml:125
msgid "Tap center button again for auto-center"
msgstr "Повторно нажать кнопку центрирования для автоцентрирования"
@@ -457,7 +457,7 @@
msgstr "Нет выбора"
#: qml/GeocodeItem.qml:134 qml/NavigationPage.qml:185 qml/PlaceNamePage.qml:48
-#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:258
+#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:257
#: qml/RoutePage.qml:443 qml/RoutePage.qml:558
msgid "Remove"
msgstr "Удалить"
@@ -496,7 +496,7 @@
msgid "Recent searches (%1)"
msgstr "Недавние запросы (%1)"
-#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:54
+#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:52
msgid "Change provider (%1)"
msgstr "Сменить провайдера (%1)"
@@ -516,11 +516,11 @@
msgid "Search engine"
msgstr "Поисковый движок"
-#: qml/InitPage.qml:33
+#: qml/InitPage.qml:32
msgid "Initializing"
msgstr "Инициализация"
-#: qml/InitPage.qml:46 qml/RoutePage.qml:194
+#: qml/InitPage.qml:46 qml/RoutePage.qml:193
msgid "Dismiss"
msgstr "Отклонить"
@@ -538,6 +538,20 @@
"личный ключ API в Персональных настройках. Этот ключ не требуется, если "
"использовать Pure Maps с автономным источником карт."
+#: qml/LanguageSelector.qml:24
+msgid "Language"
+msgstr "Язык"
+
+#: qml/LanguageSelector.qml:43 qml/PreferencesPage.qml:71
+#: qml/PreferencesPage.qml:760
+msgid "English"
+msgstr "Английский"
+
+#: qml/LanguageSelector.qml:44 routers/gpx_osmscout_settings.qml:84
+#: routers/mapquest_open_settings.qml:59 routers/ValhallaSettings.qml:67
+msgid "English (United States)"
+msgstr "английский (Соединенные Штаты)"
+
#: qml/MapErrorPage.qml:25
msgid "Error"
msgstr "Ошибка"
@@ -597,24 +611,24 @@
msgid "Mixed"
msgstr "Смешанный"
-#: qml/MapGestureArea.qml:63 qml/MapGestureArea.qml:81
+#: qml/MapGestureArea.qml:64 qml/MapGestureArea.qml:82
msgid "Stop navigation to select POI"
msgstr "Остановить навигацию для выбора точек интереса"
-#: qml/Map.qml:641 qml/NavigationPage.qml:207 qml/PoiBlock.qml:251
-#: qml/RoutePage.qml:174
+#: qml/Map.qml:643 qml/NavigationPage.qml:207 qml/PoiBlock.qml:251
+#: qml/RoutePage.qml:173
msgid "Origin"
msgstr "Пункт отправления"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/po/sk_SK.po
^
|
| @@ -5,15 +5,16 @@
#
# Translators:
# Ladislav Hodas <ladislav@hodas.sk>, 2021
+# rinigus github, 2021
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-30 21:01+0300\n"
+"POT-Creation-Date: 2021-10-16 18:03+0300\n"
"PO-Revision-Date: 2018-08-22 13:49+0000\n"
-"Last-Translator: Ladislav Hodas <ladislav@hodas.sk>, 2021\n"
+"Last-Translator: rinigus github, 2021\n"
"Language-Team: Slovak (Slovakia) (https://www.transifex.com/rinigus/teams/89597/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -44,10 +45,10 @@
#: poor/history.py:33 qml/GeocodeItem.qml:209 qml/GeocodeItem.qml:527
#: qml/MenuPage.qml:87 qml/Navigator.qml:192 qml/NearbyPage.qml:30
-#: qml/NearbyPage.qml:155 qml/NearbyPage.qml:170 qml/RoutePage.qml:40
-#: qml/RoutePage.qml:42 qml/RoutePage.qml:46 qml/RoutePage.qml:104
-#: qml/RoutePage.qml:461 qml/RoutePage.qml:466 qml/RoutePage.qml:693
-#: qml/RoutePage.qml:736 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
+#: qml/NearbyPage.qml:161 qml/NearbyPage.qml:176 qml/RoutePage.qml:40
+#: qml/RoutePage.qml:42 qml/RoutePage.qml:102 qml/RoutePage.qml:461
+#: qml/RoutePage.qml:466 qml/RoutePage.qml:694 qml/RoutePage.qml:723
+#: qml/RoutePage.qml:747 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
msgid "Current position"
msgstr "Aktuálna poloha"
@@ -229,11 +230,11 @@
msgid "{:d} h {:d} min"
msgstr "{:d} h {:d} min"
-#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:114
-#: routers/ValhallaSettings.qml:150 routers/ValhallaSettings.qml:203
-#: routers/ValhallaSettings.qml:221 routers/ValhallaSettings.qml:238
-#: routers/ValhallaSettings.qml:254 routers/ValhallaSettings.qml:274
-#: routers/ValhallaSettings.qml:290
+#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:133
+#: routers/ValhallaSettings.qml:169 routers/ValhallaSettings.qml:222
+#: routers/ValhallaSettings.qml:240 routers/ValhallaSettings.qml:257
+#: routers/ValhallaSettings.qml:273 routers/ValhallaSettings.qml:293
+#: routers/ValhallaSettings.qml:309
msgid "Prefer"
msgstr "Uprednostniť"
@@ -321,7 +322,7 @@
"You can add new user interface translations or contribute to existing ones "
"at Transifex."
msgstr ""
-" Do Transifex môžete pridať nový preklad používateľského rozhrania alebo "
+"Do Transifex môžete pridať nový preklad používateľského rozhrania alebo "
"prispieť k existujúcemu."
#: qml/AboutPage.qml:142
@@ -343,7 +344,7 @@
#: qml/AttributionPage.qml:61 qml/GeocodeItem.qml:38 qml/GeocodePage.qml:27
#: qml/MenuPage.qml:54 qml/NearbyPage.qml:28 qml/PlaceTypePage.qml:79
-#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:685
+#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:643
msgid "Search"
msgstr "Hľadať"
@@ -352,13 +353,13 @@
msgstr "Miesta"
#: qml/AttributionPage.qml:119 qml/MenuPage.qml:60 qml/NavigationPage.qml:27
-#: qml/PreferencesPage.qml:404 qml/RoutePage.qml:25
+#: qml/PreferencesPage.qml:362 qml/RoutePage.qml:25
msgid "Navigation"
msgstr "Navigácia"
#: qml/BasemapButton.qml:225 qml/NearbyPage.qml:106 qml/PoiEditPage.qml:57
-#: routers/gpx_osmscout_settings.qml:52 routers/gpx_settings.qml:52
-#: routers/mapquest_open_settings.qml:27 routers/ValhallaSettings.qml:36
+#: routers/gpx_osmscout_settings.qml:54 routers/gpx_settings.qml:52
+#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
msgid "Type"
msgstr "Typ"
@@ -406,23 +407,23 @@
msgid "Transport"
msgstr "Doprava"
-#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Bicycle"
msgstr "Bicykel"
-#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Car"
msgstr "Automobil"
-#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:131
+#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:150
msgid "Walking"
msgstr "Chôdza"
-#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:38
msgid "Public transport"
msgstr "Verejná doprava"
@@ -438,15 +439,15 @@
msgid "Map: %1"
msgstr "Mapa: %1"
-#: qml/CenterButton.qml:110 qml/MapGestureArea.qml:46
+#: qml/CenterButton.qml:111 qml/MapGestureArea.qml:47
msgid "Auto-center off"
msgstr "Automatické centrovanie vypnuté"
-#: qml/CenterButton.qml:118 qml/MapGestureArea.qml:45
+#: qml/CenterButton.qml:119 qml/MapGestureArea.qml:46
msgid "Auto-center on"
msgstr "Automatické centrovanie zapnuté"
-#: qml/CenterButton.qml:124
+#: qml/CenterButton.qml:125
msgid "Tap center button again for auto-center"
msgstr "Pre automatické centrovanie ťuknite opäť centrovacie tlačidlo"
@@ -455,7 +456,7 @@
msgstr "Žiaden výber"
#: qml/GeocodeItem.qml:134 qml/NavigationPage.qml:185 qml/PlaceNamePage.qml:48
-#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:258
+#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:257
#: qml/RoutePage.qml:443 qml/RoutePage.qml:558
msgid "Remove"
msgstr "Odstrániť"
@@ -494,7 +495,7 @@
msgid "Recent searches (%1)"
msgstr "Predošlé hľadania (%1)"
-#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:54
+#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:52
msgid "Change provider (%1)"
msgstr "Zmeniť poskytovateľa (%1)"
@@ -514,11 +515,11 @@
msgid "Search engine"
msgstr "Vyhľadávací stroj"
-#: qml/InitPage.qml:33
+#: qml/InitPage.qml:32
msgid "Initializing"
msgstr "Spúšťanie"
-#: qml/InitPage.qml:46 qml/RoutePage.qml:194
+#: qml/InitPage.qml:46 qml/RoutePage.qml:193
msgid "Dismiss"
msgstr "Odmietnuť"
@@ -536,6 +537,20 @@
"osobný kľúč API v Predvoľbách. Tento kľúč nie je potrebný ak plánujete "
"používať Pure Maps s poskytovateľom offline máp."
+#: qml/LanguageSelector.qml:24
+msgid "Language"
+msgstr "Jazyk"
+
+#: qml/LanguageSelector.qml:43 qml/PreferencesPage.qml:71
+#: qml/PreferencesPage.qml:760
+msgid "English"
+msgstr "Angličtina"
+
+#: qml/LanguageSelector.qml:44 routers/gpx_osmscout_settings.qml:84
+#: routers/mapquest_open_settings.qml:59 routers/ValhallaSettings.qml:67
+msgid "English (United States)"
+msgstr "angličtina (Spojené štáty)"
+
#: qml/MapErrorPage.qml:25
msgid "Error"
msgstr "Chyba"
@@ -595,24 +610,24 @@
msgid "Mixed"
msgstr "Zmiešaný"
-#: qml/MapGestureArea.qml:63 qml/MapGestureArea.qml:81
+#: qml/MapGestureArea.qml:64 qml/MapGestureArea.qml:82
msgid "Stop navigation to select POI"
msgstr "Pre výber POI zastavte navigáciu"
-#: qml/Map.qml:641 qml/NavigationPage.qml:207 qml/PoiBlock.qml:251
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/po/sv.po
^
|
| @@ -4,17 +4,17 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
-# rinigus github, 2018
# Åke Engelbrektson, 2021
+# rinigus github, 2021
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-20 16:10+0200\n"
+"POT-Creation-Date: 2021-10-16 18:03+0300\n"
"PO-Revision-Date: 2018-08-22 13:49+0000\n"
-"Last-Translator: Åke Engelbrektson, 2021\n"
+"Last-Translator: rinigus github, 2021\n"
"Language-Team: Swedish (https://www.transifex.com/rinigus/teams/89597/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -45,10 +45,10 @@
#: poor/history.py:33 qml/GeocodeItem.qml:209 qml/GeocodeItem.qml:527
#: qml/MenuPage.qml:87 qml/Navigator.qml:192 qml/NearbyPage.qml:30
-#: qml/NearbyPage.qml:155 qml/NearbyPage.qml:170 qml/RoutePage.qml:40
-#: qml/RoutePage.qml:42 qml/RoutePage.qml:46 qml/RoutePage.qml:104
-#: qml/RoutePage.qml:461 qml/RoutePage.qml:466 qml/RoutePage.qml:693
-#: qml/RoutePage.qml:736 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
+#: qml/NearbyPage.qml:161 qml/NearbyPage.qml:176 qml/RoutePage.qml:40
+#: qml/RoutePage.qml:42 qml/RoutePage.qml:102 qml/RoutePage.qml:461
+#: qml/RoutePage.qml:466 qml/RoutePage.qml:694 qml/RoutePage.qml:723
+#: qml/RoutePage.qml:747 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
msgid "Current position"
msgstr "Aktuell position"
@@ -230,11 +230,11 @@
msgid "{:d} h {:d} min"
msgstr "{:d} t {:d} min"
-#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:114
-#: routers/ValhallaSettings.qml:150 routers/ValhallaSettings.qml:203
-#: routers/ValhallaSettings.qml:221 routers/ValhallaSettings.qml:238
-#: routers/ValhallaSettings.qml:254 routers/ValhallaSettings.qml:274
-#: routers/ValhallaSettings.qml:290
+#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:133
+#: routers/ValhallaSettings.qml:169 routers/ValhallaSettings.qml:222
+#: routers/ValhallaSettings.qml:240 routers/ValhallaSettings.qml:257
+#: routers/ValhallaSettings.qml:273 routers/ValhallaSettings.qml:293
+#: routers/ValhallaSettings.qml:309
msgid "Prefer"
msgstr "Föredra"
@@ -343,7 +343,7 @@
#: qml/AttributionPage.qml:61 qml/GeocodeItem.qml:38 qml/GeocodePage.qml:27
#: qml/MenuPage.qml:54 qml/NearbyPage.qml:28 qml/PlaceTypePage.qml:79
-#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:685
+#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:643
msgid "Search"
msgstr "Sök"
@@ -352,13 +352,13 @@
msgstr "Platser"
#: qml/AttributionPage.qml:119 qml/MenuPage.qml:60 qml/NavigationPage.qml:27
-#: qml/PreferencesPage.qml:404 qml/RoutePage.qml:25
+#: qml/PreferencesPage.qml:362 qml/RoutePage.qml:25
msgid "Navigation"
msgstr "Navigation"
#: qml/BasemapButton.qml:225 qml/NearbyPage.qml:106 qml/PoiEditPage.qml:57
-#: routers/gpx_osmscout_settings.qml:52 routers/gpx_settings.qml:52
-#: routers/mapquest_open_settings.qml:27 routers/ValhallaSettings.qml:36
+#: routers/gpx_osmscout_settings.qml:54 routers/gpx_settings.qml:52
+#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
msgid "Type"
msgstr "Typ"
@@ -406,23 +406,23 @@
msgid "Transport"
msgstr "Transport"
-#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Bicycle"
msgstr "Cykel"
-#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Car"
msgstr "Bil"
-#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:131
+#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:150
msgid "Walking"
msgstr "Gång"
-#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:38
msgid "Public transport"
msgstr "Kollektivtrafik"
@@ -438,15 +438,15 @@
msgid "Map: %1"
msgstr "Karta: %1"
-#: qml/CenterButton.qml:110 qml/MapGestureArea.qml:46
+#: qml/CenterButton.qml:111 qml/MapGestureArea.qml:47
msgid "Auto-center off"
msgstr "Autocentrering av"
-#: qml/CenterButton.qml:118 qml/MapGestureArea.qml:45
+#: qml/CenterButton.qml:119 qml/MapGestureArea.qml:46
msgid "Auto-center on"
msgstr "Autocentrering på"
-#: qml/CenterButton.qml:124
+#: qml/CenterButton.qml:125
msgid "Tap center button again for auto-center"
msgstr "Tryck på centreringsknappen igen, för automatisk centrering"
@@ -455,7 +455,7 @@
msgstr "Inget valt"
#: qml/GeocodeItem.qml:134 qml/NavigationPage.qml:185 qml/PlaceNamePage.qml:48
-#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:258
+#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:257
#: qml/RoutePage.qml:443 qml/RoutePage.qml:558
msgid "Remove"
msgstr "Ta bort"
@@ -494,7 +494,7 @@
msgid "Recent searches (%1)"
msgstr "Tidigare sökningar (%1)"
-#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:54
+#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:52
msgid "Change provider (%1)"
msgstr "Byt leverantör (%1)"
@@ -514,11 +514,11 @@
msgid "Search engine"
msgstr "Sökmotor"
-#: qml/InitPage.qml:33
+#: qml/InitPage.qml:32
msgid "Initializing"
msgstr "Startar"
-#: qml/InitPage.qml:46 qml/RoutePage.qml:194
+#: qml/InitPage.qml:46 qml/RoutePage.qml:193
msgid "Dismiss"
msgstr "Avfärda"
@@ -536,6 +536,20 @@
" i din personliga API-nyckel i Inställningar. Denna nyckel behövs om du "
"tänker använda Pure Maps med offline-kartleverantören."
+#: qml/LanguageSelector.qml:24
+msgid "Language"
+msgstr "Språk"
+
+#: qml/LanguageSelector.qml:43 qml/PreferencesPage.qml:71
+#: qml/PreferencesPage.qml:760
+msgid "English"
+msgstr "Engelska"
+
+#: qml/LanguageSelector.qml:44 routers/gpx_osmscout_settings.qml:84
+#: routers/mapquest_open_settings.qml:59 routers/ValhallaSettings.qml:67
+msgid "English (United States)"
+msgstr "engelska (USA)"
+
#: qml/MapErrorPage.qml:25
msgid "Error"
msgstr "Fel"
@@ -595,24 +609,24 @@
msgid "Mixed"
msgstr "Blandat"
-#: qml/MapGestureArea.qml:63 qml/MapGestureArea.qml:81
+#: qml/MapGestureArea.qml:64 qml/MapGestureArea.qml:82
msgid "Stop navigation to select POI"
msgstr "Stoppa navigeringen för att välja POI"
-#: qml/Map.qml:638 qml/NavigationPage.qml:207 qml/PoiBlock.qml:251
-#: qml/RoutePage.qml:174
+#: qml/Map.qml:643 qml/NavigationPage.qml:207 qml/PoiBlock.qml:251
+#: qml/RoutePage.qml:173
msgid "Origin"
msgstr "Ursprung"
-#: qml/Map.qml:640 qml/NavigationPage.qml:210 qml/PoiBlock.qml:271
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/po/zh_CN.po
^
|
| @@ -5,15 +5,16 @@
#
# Translators:
# rui kon <facebookmail@qq.com>, 2021
+# rinigus github, 2021
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-30 21:01+0300\n"
+"POT-Creation-Date: 2021-10-16 18:03+0300\n"
"PO-Revision-Date: 2018-08-22 13:49+0000\n"
-"Last-Translator: rui kon <facebookmail@qq.com>, 2021\n"
+"Last-Translator: rinigus github, 2021\n"
"Language-Team: Chinese (China) (https://www.transifex.com/rinigus/teams/89597/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -44,10 +45,10 @@
#: poor/history.py:33 qml/GeocodeItem.qml:209 qml/GeocodeItem.qml:527
#: qml/MenuPage.qml:87 qml/Navigator.qml:192 qml/NearbyPage.qml:30
-#: qml/NearbyPage.qml:155 qml/NearbyPage.qml:170 qml/RoutePage.qml:40
-#: qml/RoutePage.qml:42 qml/RoutePage.qml:46 qml/RoutePage.qml:104
-#: qml/RoutePage.qml:461 qml/RoutePage.qml:466 qml/RoutePage.qml:693
-#: qml/RoutePage.qml:736 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
+#: qml/NearbyPage.qml:161 qml/NearbyPage.qml:176 qml/RoutePage.qml:40
+#: qml/RoutePage.qml:42 qml/RoutePage.qml:102 qml/RoutePage.qml:461
+#: qml/RoutePage.qml:466 qml/RoutePage.qml:694 qml/RoutePage.qml:723
+#: qml/RoutePage.qml:747 qml/RoutePoint.qml:44 qml/RoutePoint.qml:62
msgid "Current position"
msgstr "当前位置"
@@ -217,11 +218,11 @@
msgid "{:d} h {:d} min"
msgstr "{:d} 小时 {:d} 分钟"
-#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:114
-#: routers/ValhallaSettings.qml:150 routers/ValhallaSettings.qml:203
-#: routers/ValhallaSettings.qml:221 routers/ValhallaSettings.qml:238
-#: routers/ValhallaSettings.qml:254 routers/ValhallaSettings.qml:274
-#: routers/ValhallaSettings.qml:290
+#: guides/foursquare_settings.qml:28 routers/ValhallaSettings.qml:133
+#: routers/ValhallaSettings.qml:169 routers/ValhallaSettings.qml:222
+#: routers/ValhallaSettings.qml:240 routers/ValhallaSettings.qml:257
+#: routers/ValhallaSettings.qml:273 routers/ValhallaSettings.qml:293
+#: routers/ValhallaSettings.qml:309
msgid "Prefer"
msgstr "偏好"
@@ -322,7 +323,7 @@
#: qml/AttributionPage.qml:61 qml/GeocodeItem.qml:38 qml/GeocodePage.qml:27
#: qml/MenuPage.qml:54 qml/NearbyPage.qml:28 qml/PlaceTypePage.qml:79
-#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:685
+#: qml/PoiPage.qml:136 qml/PreferencesPage.qml:643
msgid "Search"
msgstr "搜索"
@@ -331,13 +332,13 @@
msgstr "场所"
#: qml/AttributionPage.qml:119 qml/MenuPage.qml:60 qml/NavigationPage.qml:27
-#: qml/PreferencesPage.qml:404 qml/RoutePage.qml:25
+#: qml/PreferencesPage.qml:362 qml/RoutePage.qml:25
msgid "Navigation"
msgstr "导航"
#: qml/BasemapButton.qml:225 qml/NearbyPage.qml:106 qml/PoiEditPage.qml:57
-#: routers/gpx_osmscout_settings.qml:52 routers/gpx_settings.qml:52
-#: routers/mapquest_open_settings.qml:27 routers/ValhallaSettings.qml:36
+#: routers/gpx_osmscout_settings.qml:54 routers/gpx_settings.qml:52
+#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
msgid "Type"
msgstr "类型"
@@ -385,23 +386,23 @@
msgid "Transport"
msgstr "交通"
-#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Bicycle"
msgstr "自行车"
-#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:383 qml/RoutePage.qml:644
-#: routers/gpx_osmscout_settings.qml:53 routers/gpx_settings.qml:53
-#: routers/mapquest_open_settings.qml:28 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:341 qml/RoutePage.qml:644
+#: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53
+#: routers/mapquest_open_settings.qml:29 routers/ValhallaSettings.qml:38
msgid "Car"
msgstr "汽车"
-#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:131
+#: qml/BasemapButton.qml:320 routers/ValhallaSettings.qml:150
msgid "Walking"
msgstr "步行"
-#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:37
+#: qml/BasemapButton.qml:321 routers/ValhallaSettings.qml:38
msgid "Public transport"
msgstr "公共交通"
@@ -417,15 +418,15 @@
msgid "Map: %1"
msgstr "地图 : %1"
-#: qml/CenterButton.qml:110 qml/MapGestureArea.qml:46
+#: qml/CenterButton.qml:111 qml/MapGestureArea.qml:47
msgid "Auto-center off"
msgstr "已关闭自动居中"
-#: qml/CenterButton.qml:118 qml/MapGestureArea.qml:45
+#: qml/CenterButton.qml:119 qml/MapGestureArea.qml:46
msgid "Auto-center on"
msgstr "已开启自动居中"
-#: qml/CenterButton.qml:124
+#: qml/CenterButton.qml:125
msgid "Tap center button again for auto-center"
msgstr "再次点击集中按钮以自动集中"
@@ -434,7 +435,7 @@
msgstr "无选择"
#: qml/GeocodeItem.qml:134 qml/NavigationPage.qml:185 qml/PlaceNamePage.qml:48
-#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:258
+#: qml/PlaceTypePage.qml:45 qml/PoiPage.qml:108 qml/RoutePage.qml:257
#: qml/RoutePage.qml:443 qml/RoutePage.qml:558
msgid "Remove"
msgstr "移除"
@@ -473,7 +474,7 @@
msgid "Recent searches (%1)"
msgstr "最近搜索 (%1)"
-#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:54
+#: qml/GeocodePage.qml:31 qml/NearbyPage.qml:36 qml/RoutePage.qml:52
msgid "Change provider (%1)"
msgstr "更换服务提供商 (%1)"
@@ -493,11 +494,11 @@
msgid "Search engine"
msgstr "搜索引擎"
-#: qml/InitPage.qml:33
+#: qml/InitPage.qml:32
msgid "Initializing"
msgstr "正在加载"
-#: qml/InitPage.qml:46 qml/RoutePage.qml:194
+#: qml/InitPage.qml:46 qml/RoutePage.qml:193
msgid "Dismiss"
msgstr "拒绝"
@@ -514,6 +515,20 @@
"安装缺失 Mapbox API 秘钥。请在 Mapbox 注册, 并在 \"偏好\" 中填写你的私人 API 密钥。如果想以脱机地图方式使用 Pure "
"Maps 则无需进行设置。"
+#: qml/LanguageSelector.qml:24
+msgid "Language"
+msgstr "语言"
+
+#: qml/LanguageSelector.qml:43 qml/PreferencesPage.qml:71
+#: qml/PreferencesPage.qml:760
+msgid "English"
+msgstr "英语"
+
+#: qml/LanguageSelector.qml:44 routers/gpx_osmscout_settings.qml:84
+#: routers/mapquest_open_settings.qml:59 routers/ValhallaSettings.qml:67
+msgid "English (United States)"
+msgstr "英语（美国）"
+
#: qml/MapErrorPage.qml:25
msgid "Error"
msgstr "出错"
@@ -570,24 +585,24 @@
msgid "Mixed"
msgstr "混合"
-#: qml/MapGestureArea.qml:63 qml/MapGestureArea.qml:81
+#: qml/MapGestureArea.qml:64 qml/MapGestureArea.qml:82
msgid "Stop navigation to select POI"
msgstr "停止导航以选择 POI"
-#: qml/Map.qml:641 qml/NavigationPage.qml:207 qml/PoiBlock.qml:251
-#: qml/RoutePage.qml:174
+#: qml/Map.qml:643 qml/NavigationPage.qml:207 qml/PoiBlock.qml:251
+#: qml/RoutePage.qml:173
msgid "Origin"
msgstr "起点"
-#: qml/Map.qml:643 qml/NavigationPage.qml:210 qml/PoiBlock.qml:271
+#: qml/Map.qml:645 qml/NavigationPage.qml:210 qml/PoiBlock.qml:271
msgid "Final destination"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/poor/util.py
^
|
| @@ -276,7 +276,7 @@
def format_location_message(x, y, extra_text, html=False, extra=True, osm=True, gmaps=False):
"""Format coordinates of a point into a location message."""
if osm: osm_url = short_osm(y,x)
- if gmaps: gm = 'http://maps.google.com/?q={y:.5f},{x:.5f}'.format(x=x, y=y)
+ if gmaps: gm = 'https://maps.google.com/?q={y:.5f},{x:.5f}'.format(x=x, y=y)
plus = olc_encode(y,x)
if html:
if extra_text and extra: r = extra_text + '<br>'
@@ -419,11 +419,11 @@
Provide coordinates and optional zoom level. e.g.:
>>> short_osm(50.671530961990356, 6.09715461730957)
- http://osm.org/go/0GAjIv8h
+ https://osm.org/go/0GAjIv8h
>>> short_osm(0, 0, 3)
- http://osm.org/go/wAAA--
+ https://osm.org/go/wAAA--
>>> short_osm(0, 0, 4)
- http://osm.org/go/wAAA
+ https://osm.org/go/wAAA
"""
# OSM short link, from https://gist.github.com/mdornseif/5652824
# osm_shortlink.py - MAximillian Dornseif 2013 - Public Domain
@@ -464,7 +464,7 @@
c = (c << 1) | ((y >> i) & 1)
return c
- return 'http://osm.org/go/' + _encode(lat, lon, zoom) + "?m"
+ return 'https://osm.org/go/' + _encode(lat, lon, zoom) + "?m"
def path2uri(path):
"""Convert local filepath to URI."""
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/poor/voice.py
^
|
| @@ -194,7 +194,7 @@
commands = ["mimic", "harbour-mimic"]
description = "Mimic Pirate"
voices = {
- "en-US-x-pirate": {"male": "awb", "female": "slt"},
+ "en_US_x_pirate": {"male": "awb", "female": "slt"},
}
phonemes = { "Arrr": "aa r ah0 r r .",
"Cap'n": "k ae1 p n",
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/CenterButton.qml
^
|
| @@ -23,6 +23,7 @@
id: button
anchors.top: northArrow.bottom
anchors.right: parent.right
+ enabled: gps.coordinateValid
iconHeight: styler.themeIconSizeSmall
iconSource: app.getIcon("icons/center")
indicator: map.autoCenter
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/Compass.qml
^
|
| @@ -33,21 +33,21 @@
id: compass
// It makes sense to use compass on low speeds, with valid position and speed
active: app.conf.compassUse && app.running && gps.ready &&
- gps.position.speedValid != null && gps.position.speedValid && gps.position.speed < 2.78 // limiting to 10 km/h
+ gps.speedValid && gps.speed < 2.78 // limiting to 10 km/h
alwaysOn: false
skipDuplicates: true
}
Connections {
target: gps
- onPositionChanged: {
+ onPositionUpdated: {
if (!cmp.active) return;
- if (_last_call && gps.position.timestamp - _last_call < 1000*300 )
+ if (_last_call && gps.timestamp - _last_call < 1000*300 )
return;
- _last_call = gps.position.timestamp;
+ _last_call = gps.timestamp;
py.call("poor.app.magfield.declination",
- [gps.position.coordinate.latitude,
- gps.position.coordinate.longitude],
+ [gps.coordinate.latitude,
+ gps.coordinate.longitude],
function (dec) {
if (Math.abs(cmp.declination-dec) > 0.1)
cmp.declination = dec;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/GeocodeItem.qml
^
|
| @@ -325,8 +325,8 @@
if (!query || query === geo._prevAutocompleteQuery) return;
geo._autocompletePending = true;
geo._prevAutocompleteQuery = query;
- var x = gps.position.coordinate.longitude;
- var y = gps.position.coordinate.latitude;
+ var x = gps.coordinate.longitude;
+ var y = gps.coordinate.latitude;
py.call("poor.app.geocoder.autocomplete", [query, x, y], function(results) {
if (!geo._autocompletePending) return;
@@ -352,8 +352,8 @@
setSearchResults([]);
_autocompletePending = false; // skip any ongoing autocomplete search
py.call_sync("poor.app.history.add_place", [query]);
- var x = gps.position.coordinate.longitude;
- var y = gps.position.coordinate.latitude;
+ var x = gps.coordinate.longitude;
+ var y = gps.coordinate.latitude;
geo.update();
py.call("poor.app.geocoder.geocode", [query, x, y, null], function(results) {
// skip, new search or autocomplete was started
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/InitPage.qml
^
|
| @@ -24,7 +24,6 @@
id: page
title: "Pure Maps"
- property bool mapboxKeyMissing: false
property bool ready: false
BusyModal {
@@ -51,7 +50,7 @@
"in Preferences. This key is not needed if you plan to use " +
"Pure Maps with the offline map provider.")
});
- mapboxKeyMissing = true;
+ app.mapboxKeyMissing = true;
} else start();
}
}
@@ -60,7 +59,5 @@
function start() {
app.rootPage = app.pages.replace(Qt.resolvedUrl("RootPage.qml"));
- app.initialize();
- if (mapboxKeyMissing) app.showMenu();
}
}
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/LanguageSelector.qml
^
|
| @@ -0,0 +1,70 @@
+/* -*- coding: utf-8-unix -*-
+ *
+ * Copyright (C) 2021 Rinigus
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import "platform"
+
+ComboBoxPL {
+ id: comboBox
+ label: app.tr("Language")
+ model: []
+
+ property string key
+ property int languageIndex: -1 // current selected index
+ property var languages // has to be set on construction
+
+ Component.onCompleted: {
+ var p = [];
+ for (var i=0; i < languages.length; i++)
+ p.push(languages[i].name);
+ p.sort();
+ model = p;
+ // as ancient Qt used by SFOS is unaware of findIndex
+ var index = languageIndex;
+ for (var i=0; i < languages.length && index < 0; i++)
+ if (languages[i].key === key)
+ index = i;
+ if (index < 0) { // set to English by default
+ var eng = app.tr("English");
+ var eng_us = app.tr("English (United States)");
+ for (var i=0; i < languages.length && index < 0; i++)
+ if (languages[i].name === eng || languages[i].name === eng_us)
+ index = i;
+ }
+ // TODO: replace with the implementation for newer Qt
+ // var index = languages.findIndex(function (l) { return l.key === key; } );
+ // if (index < 0) { // set to English by default
+ // var eng = app.tr("English");
+ // index = languages.findIndex(function (l) { return l.name === eng; } );
+ // }
+ index = model.indexOf(languages[index].name);
+ comboBox.currentIndex = index;
+ }
+ onCurrentIndexChanged: {
+ if (comboBox.currentIndex < 0) return;
+ var name = model[comboBox.currentIndex];
+ var index = -1;
+ for (var i=0; i < languages.length && index < 0; i++)
+ if (languages[i].name === name)
+ index = i;
+ if (index > -1) {
+ key = languages[index].key;
+ languageIndex = index;
+ }
+ }
+}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/Map.qml
^
|
| @@ -46,8 +46,9 @@
if (app.mode === modes.explore || app.mode === modes.exploreRoute)
return 1000;
// support smooth animations for position marker
- // and map center only if GPS is accurate and is desired
- return (gps.accurate && app.conf.smoothPositionAnimationWhenNavigating ? gps.timePerUpdate : 0);
+ // and map center only if GPS is accurate and
+ // smooth animation is desired
+ return (gps.accurate && app.conf.smoothPositionAnimationWhenNavigating ? gps.updateInterval : 0);
}
property bool autoCenter: false
property bool autoRotate: false
@@ -125,7 +126,7 @@
Behavior on center {
CoordinateAnimation {
- duration: map.ready ? animationTime : 0
+ duration: animationTime
easing.type: app.mode === modes.explore || app.mode === modes.exploreRoute ? Easing.InOutQuad : Easing.Linear
}
}
@@ -201,9 +202,9 @@
onMppChanged: zmref = map.zoomLevel
onTriggered: {
- if (!gps.position.speedValid) return;
+ if (!gps.speedValid) return;
var dist = mpp * map.height;
- var speed = gps.position.speed;
+ var speed = gps.speed;
var newZoom = zmref;
var zstep = 0.1;
if (speed > 0) newZoom -= Math.log(speed*app.conf.mapZoomAutoTime / dist) / Math.log(2);
@@ -222,7 +223,7 @@
// daytime bias timer
interval: 1000*60
repeat: true
- running: app.conf.basemapAutoLight==="sunrise/sunset" && gps.position.latitudeValid && gps.position.longitudeValid //false
+ running: app.conf.basemapAutoLight==="sunrise/sunset" && gps.ready //false
property bool lastLight: false
@@ -231,10 +232,10 @@
onTriggered: update()
function update(force) {
- if (app.conf.basemapAutoLight!=="sunrise/sunset" || !gps.position.latitudeValid || !gps.position.longitudeValid)
+ if (app.conf.basemapAutoLight!=="sunrise/sunset" || !gps.ready)
return;
- py.call("poor.app.sun.day", [gps.position.coordinate.latitude,
- gps.position.coordinate.longitude],
+ py.call("poor.app.sun.day", [gps.coordinate.latitude,
+ gps.coordinate.longitude],
function(light) {
if (force || lastLight !== light) {
py.call("poor.app.basemap.set_bias", [{'light': light ? 'day' : 'night'}]);
@@ -253,7 +254,7 @@
Connections {
target: gps
- onPositionChanged: {
+ onPositionUpdated: {
map.autoCenter && map.centerOnPosition();
}
}
@@ -343,9 +344,10 @@
}
function centerOnPosition() {
- // Center on the current position.
- map.setCenter( gps.position.coordinate.longitude,
- gps.position.coordinate.latitude );
+ // Center on the current position
+ if (gps.coordinateValid)
+ map.setCenter( gps.coordinate.longitude,
+ gps.coordinate.latitude );
}
function configureLayers() {
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/MapButton.qml
^
|
| @@ -25,6 +25,7 @@
height: bg.height + 2*styler.themePaddingLarge
width: bg.width + 2*styler.themePaddingLarge
+ property alias enabled: mouse.enabled
property alias iconColorize: button.iconColorize
property alias iconHeight: button.iconHeight
property alias iconName: button.iconName
@@ -48,6 +49,7 @@
radius: styler.shadowRadius
samples: 1 + radius*2
}
+ opacity: item.enabled ? 1.0 : 0.75
radius: wh/2
width: wh
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/MapGestureArea.qml
^
|
| @@ -39,7 +39,8 @@
if (app.mode !== modes.navigate &&
app.mode !== modes.followMe &&
app.mode !== modes.navigatePost &&
- area.coordinatesMatch(geocoordinate, gps.position.coordinate)) {
+ gps.ready &&
+ area.coordinatesMatch(geocoordinate, gps.coordinate)) {
map.autoCenter = !map.autoCenter;
notification.flash(map.autoCenter ?
app.tr("Auto-center on") :
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/Meters.qml
^
|
| @@ -83,30 +83,30 @@
var lines = ["—", "—"];
if (app.conf.units === "american") {
labels.text = " %1\n %2".arg(app.tr("mph")).arg(app.tr("ft"))
- if (gps.position.speedValid)
- lines[0] = Math.round(gps.position.speed * 2.23694);
- if (gps.ready && gps.position.horizontalAccuracyValid)
- lines[1] = Util.siground(gps.position.horizontalAccuracy * 3.28084, 2);
+ if (gps.speedValid)
+ lines[0] = Math.round(gps.speed * 2.23694);
+ if (gps.coordinateValid && gps.horizontalAccuracyValid)
+ lines[1] = Util.siground(gps.horizontalAccuracy * 3.28084, 2);
lines[1] = "\u2300 %1".arg(lines[1]);
values.text = lines.join("\n");
values.doLayout();
} else if (app.conf.units === "british") {
labels.text = " %1\n %2".arg(app.tr("mph")).arg(app.tr("yd"))
- if (gps.position.speedValid)
- lines[0] = Math.round(gps.position.speed * 2.23694);
- if (gps.ready && gps.position.horizontalAccuracyValid)
- lines[1] = Util.siground(gps.position.horizontalAccuracy * 1.09361, 2);
+ if (gps.speedValid)
+ lines[0] = Math.round(gps.speed * 2.23694);
+ if (gps.coordinateValid && gps.horizontalAccuracyValid)
+ lines[1] = Util.siground(gps.horizontalAccuracy * 1.09361, 2);
lines[1] = "\u2300 %1".arg(lines[1]);
values.text = lines.join("\n");
values.doLayout();
} else {
labels.text = " %1\n %2".arg(app.tr("km/h")).arg(app.tr("m"))
- if (gps.position.speedValid)
- lines[0] = Math.round(gps.position.speed * 3.6);
- if (gps.ready && gps.position.horizontalAccuracyValid)
- lines[1] = Util.siground(gps.position.horizontalAccuracy, 2);
+ if (gps.speedValid)
+ lines[0] = Math.round(gps.speed * 3.6);
+ if (gps.coordinateValid && gps.horizontalAccuracyValid)
+ lines[1] = Util.siground(gps.horizontalAccuracy, 2);
lines[1] = "\u2300 %1".arg(lines[1]);
values.text = lines.join("\n");
values.doLayout();
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/NavigationCurrentBlock.qml
^
|
| @@ -329,23 +329,17 @@
color: _pressed ? styler.themeHighlightColor : styler.themePrimaryColor
font.pixelSize: styler.themeFontSizeHuge
height: implicitHeight + styler.themePaddingMedium
- verticalAlignment: Text.AlignBottom
-
- function update() {
- // Update speed and positioning accuracy values in user's preferred units.
- if (!gps.position.speedValid) {
- text = ""
- return;
- }
-
- if (app.conf.units === "american") {
- text = "%1".arg(Math.round(gps.position.speed * 2.23694))
- } else if (app.conf.units === "british") {
- text = "%1".arg(Math.round(gps.position.speed * 2.23694))
- } else {
- text = "%1".arg(Math.round(gps.position.speed * 3.6))
- }
+ text: {
+ if (!gps.speedValid)
+ return "";
+
+ if (app.conf.units === "american")
+ return "%1".arg(Math.round(gps.speed * 2.23694));
+ else if (app.conf.units === "british")
+ return "%1".arg(Math.round(gps.speed * 2.23694));
+ return "%1".arg(Math.round(gps.speed * 3.6)); // km/h
}
+ verticalAlignment: Text.AlignBottom
}
LabelPL {
@@ -356,17 +350,12 @@
anchors.rightMargin: styler.themeHorizontalPageMargin
color: _pressed ? styler.themeSecondaryHighlightColor : styler.themeSecondaryColor
font.pixelSize: styler.themeFontSizeMedium
- visible: speed.text ? true : false
-
- function update() {
- if (app.conf.units === "american") {
- text = app.tr("mph")
- } else if (app.conf.units === "british") {
- text = app.tr("mph")
- } else {
- text = app.tr("km/h")
- }
+ text: {
+ if (app.conf.units === "american") return app.tr("mph");
+ else if (app.conf.units === "british") return app.tr("mph");
+ return app.tr("km/h")
}
+ visible: speed.text ? true : false
}
Image {
@@ -400,24 +389,7 @@
visible: nextAfterNextVisible && text
}
- Connections {
- target: app.conf
- onUnitsChanged: block.update()
- }
-
- Connections {
- target: gps
- onPositionChanged: speed.update()
- }
-
- Component.onCompleted: block.update()
-
function openNavigation() {
if (visible) app.showNavigationPages()
}
-
- function update() {
- speed.update();
- speedUnit.update();
- }
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/NavigationSpeedBlock.qml
^
|
| @@ -56,23 +56,17 @@
color: styler.themePrimaryColor
font.pixelSize: styler.themeFontSizeHuge
height: implicitHeight + styler.themePaddingMedium - parent.anchors.rightMargin
- verticalAlignment: Text.AlignBottom
-
- function update() {
- // Update speed and positioning accuracy values in user's preferred units.
- if (!gps.position.speedValid) {
- text = ""
- return;
- }
-
- if (app.conf.units === "american") {
- text = "%1".arg(Math.round(gps.position.speed * 2.23694))
- } else if (app.conf.units === "british") {
- text = "%1".arg(Math.round(gps.position.speed * 2.23694))
- } else {
- text = "%1".arg(Math.round(gps.position.speed * 3.6))
- }
+ text: {
+ if (!gps.speedValid)
+ return "";
+
+ if (app.conf.units === "american")
+ return "%1".arg(Math.round(gps.speed * 2.23694));
+ else if (app.conf.units === "british")
+ return "%1".arg(Math.round(gps.speed * 2.23694));
+ return "%1".arg(Math.round(gps.speed * 3.6)); // km/h
}
+ verticalAlignment: Text.AlignBottom
}
LabelPL {
@@ -83,34 +77,11 @@
anchors.rightMargin: styler.themeHorizontalPageMargin - block.anchors.rightMargin
color: styler.themeSecondaryColor
font.pixelSize: styler.themeFontSizeMedium
- visible: speed.text ? true : false
-
- function update() {
- if (app.conf.units === "american") {
- text = app.tr("mph")
- } else if (app.conf.units === "british") {
- text = app.tr("mph")
- } else {
- text = app.tr("km/h")
- }
+ text: {
+ if (app.conf.units === "american") return app.tr("mph");
+ else if (app.conf.units === "british") return app.tr("mph");
+ return app.tr("km/h")
}
- }
-
-
- Connections {
- target: app.conf
- onUnitsChanged: block.update()
- }
-
- Connections {
- target: gps
- onPositionChanged: speed.update()
- }
-
- Component.onCompleted: block.update()
-
- function update() {
- speed.update();
- speedUnit.update();
+ visible: speed.text ? true : false
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/Navigator.qml
^
|
| @@ -141,11 +141,11 @@
function updatePosition() {
if (destReached) return; // no more updates
- navigatorBase.setPosition(gps.position.coordinate,
+ navigatorBase.setPosition(gps.coordinate,
gps.directionDeviceValid ? gps.directionDevice : gps.direction,
- gps.position.horizontalAccuracy,
- gps.position.horizontalAccuracyValid &&
- gps.position.latitudeValid && gps.position.longitudeValid &&
+ gps.horizontalAccuracy,
+ gps.horizontalAccuracyValid &&
+ gps.ready &&
gps.directionValid);
}
}
@@ -160,7 +160,7 @@
Connections {
target: gps
- onPositionChanged: navigatorBase.updatePosition()
+ onPositionUpdated: navigatorBase.updatePosition()
}
Component.onCompleted: {
@@ -181,7 +181,7 @@
var loc = locations || navigatorBase.locations;
// note that GPX trace does not use locations
if (loc.length >= 1 && !loc[0].origin) {
- if (!gps.ready) {
+ if (!gps.coordinateValid) {
app.notification.flash(app.tr("Routing failed: current position not known"), notifyId);
return;
}
@@ -265,8 +265,8 @@
// Find a new route if conditions are met.
if (!app.conf.reroute) return;
if (app.mode !== modes.navigate) return;
- if (!gps.position.horizontalAccuracyValid) return;
- if (gps.position.horizontalAccuracy > 100) return;
+ if (!gps.horizontalAccuracyValid || !gps.ready) return;
+ if (gps.horizontalAccuracy > 100) return;
if (!py.evaluate("poor.app.router.can_reroute")) return;
if (hasBeenAlongRoute) rerouteConsecutiveIgnored = 0;
var interval = 5000*Math.pow(2, Math.min(4, rerouteConsecutiveErrors + rerouteConsecutiveIgnored));
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/NearbyPage.qml
^
|
| @@ -27,7 +27,7 @@
acceptIconName: styler.iconNearby
acceptText: app.tr("Search")
canNavigateForward: page.near &&
- (page.nearText !== app.tr("Current position") || gps.ready) &&
+ (page.nearText !== app.tr("Current position") || gps.coordinateValid) &&
(page.queryType.length > 0 || page.queryName.length > 0)
pageMenu: PageMenuPL {
@@ -142,7 +142,13 @@
var uri = Qt.resolvedUrl(py.evaluate("poor.app.guide.settings_qml_uri"));
if (!uri) return;
var component = Qt.createComponent(uri);
+ if (component.status === Component.Error) {
+ console.log('Error while creating component');
+ console.log(component.errorString());
+ return null;
+ }
column.settings = component.createObject(column);
+ if (!column.settings) return;
column.settings.anchors.left = column.left;
column.settings.anchors.right = column.right;
column.settings.width = column.width;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/PlaceTypePage.qml
^
|
| @@ -123,8 +123,8 @@
if (query === dialog.prevAutocompleteQuery) return;
dialog.autocompletePending = true;
dialog.prevAutocompleteQuery = query;
- var x = gps.position.coordinate.longitude;
- var y = gps.position.coordinate.latitude;
+ var x = gps.coordinate.longitude;
+ var y = gps.coordinate.latitude;
py.call("poor.app.guide.autocomplete_type", [query], function(results) {
dialog.autocompletePending = false;
if (!dialog.active) return;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/PositionMarker.qml
^
|
| @@ -28,7 +28,8 @@
property var positionShown
property bool _animatePosition: app.conf.smoothPositionAnimationWhenNavigating &&
- (app.mode === modes.navigate || app.mode === modes.followMe || app.mode === modes.navigatePost)
+ (app.mode === modes.navigate || app.mode === modes.followMe || app.mode === modes.navigatePost) &&
+ map.animationTime > 0
readonly property var images: QtObject {
readonly property string moving: "pure-position-moving"
@@ -45,10 +46,11 @@
CoordinateAnimation {
id: animate
- duration: marker._animatePosition ? map.animationTime : 0
+ duration: map.animationTime
easing.type: Easing.Linear
target: marker
property: "positionShown"
+ property bool initialized: false
}
Connections {
@@ -59,18 +61,24 @@
Connections {
target: gps
- onPositionChanged: {
+ onReadyChanged: marker.updateVisibility()
+ onPositionUpdated: {
+ if (!gps.coordinateValid) return;
if (!positionShown || !marker._animatePosition) {
- positionShown = QtPositioning.coordinate(gps.position.coordinate.latitude, gps.position.coordinate.longitude);
- marker.position = QtPositioning.coordinate(gps.position.coordinate.latitude, gps.position.coordinate.longitude);
- animate.to = marker.position;
+ positionShown = QtPositioning.coordinate(gps.coordinate.latitude, gps.coordinate.longitude);
+ marker.position = QtPositioning.coordinate(gps.coordinate.latitude, gps.coordinate.longitude);
} else {
animate.complete();
+ if (!animate.initialized) {
+ animate.from = QtPositioning.coordinate(gps.coordinate.latitude, gps.coordinate.longitude);
+ animate.to = QtPositioning.coordinate(gps.coordinate.latitude, gps.coordinate.longitude);
+ animate.initialized = true;
+ }
marker.position = animate.to;
animate.from = QtPositioning.coordinate(marker.position.latitude, marker.position.longitude);
- animate.to = QtPositioning.coordinate(gps.position.coordinate.latitude, gps.position.coordinate.longitude);
+ animate.to = QtPositioning.coordinate(gps.coordinate.latitude, gps.coordinate.longitude);
animate.start();
- marker.position = QtPositioning.coordinate(gps.position.coordinate.latitude, gps.position.coordinate.longitude);
+ marker.position = QtPositioning.coordinate(gps.coordinate.latitude, gps.coordinate.longitude);
}
}
}
@@ -81,6 +89,13 @@
marker.configureLayers();
marker.updateDirection();
marker.updateUncertainty();
+ marker.updateVisibility();
+ }
+
+ on_AnimatePositionChanged: {
+ if (!_animatePosition) {
+ animate.initialized = false;
+ }
}
onPositionShownChanged: {
@@ -106,7 +121,7 @@
map.setLayoutProperty(marker.layers.still, "visibility", "none");
map.setLayoutProperty(marker.layers.moving, "visibility", "visible");
marker.directionVisible = true;
- } else if (map.direction===undefined) {
+ } else {
map.setLayoutProperty(marker.layers.still, "visibility", "visible");
map.setLayoutProperty(marker.layers.moving, "visibility", "none");
marker.directionVisible = false;
@@ -125,7 +140,7 @@
}
function initLayers() {
- map.addSourcePoint(marker.source, gps.position.coordinate);
+ map.addSourcePoint(marker.source, gps.coordinate);
map.addLayer(marker.layers.layerUncertainty,
{"type": "circle", "source": marker.source},
map.firstLabelLayer);
@@ -148,10 +163,15 @@
}
function updateUncertainty() {
- if (gps.position.horizontalAccuracyValid)
+ if (gps.horizontalAccuracyValid)
map.setPaintProperty(marker.layers.layerUncertainty, "circle-radius",
- gps.position.horizontalAccuracy / map.metersPerPixel / map.pixelRatio);
+ gps.horizontalAccuracy / map.metersPerPixel / map.pixelRatio);
else
map.setPaintProperty(marker.layers.layerUncertainty, "circle-radius", 0);
}
+
+ function updateVisibility() {
+ map.setLayoutProperty(marker.layers.still, "icon-opacity", gps.ready ? 1.0 : 0.6);
+ map.setLayoutProperty(marker.layers.moving, "icon-opacity", gps.ready ? 1.0 : 0.6);
+ }
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/PositionSource.qml
^
|
| @@ -18,47 +18,57 @@
import QtQuick 2.0
import QtPositioning 5.4
-import "."
+import org.puremaps 1.0 as PM
import "js/util.js" as Util
-PositionSourceMapMatched {
+PM.PositionSource {
id: gps
// If application is no longer active, turn positioning off immediately
// if we already have a lock, otherwise keep trying for a couple minutes
// and give up if we still don't gain that lock.
- active: app.running || (!accurate && timePosition - timeActivate < 180000)
-
+ active: app.running || (!accurate && waitForLock)
+ hasMapMatching: app.hasMapMatching
mapMatchingMode: {
- if (app.mapMatchingMode == "none") return 0;
- else if (app.mapMatchingMode == "car") return 1;
- else if (app.mapMatchingMode == "bicycle") return 3;
- else if (app.mapMatchingMode == "foot") return 5;
- return 0;
+ if (app.mapMatchingMode == "none") return 0;
+ else if (app.mapMatchingMode == "car") return 1;
+ else if (app.mapMatchingMode == "bicycle") return 3;
+ else if (app.mapMatchingMode == "foot") return 5;
+ return 0;
+ }
+ stickyDirection: app.mode === modes.navigate ||
+ app.mode === modes.followMe ||
+ app.mode === modes.navigatePost
+ testingMode: app.conf.developmentCoordinateCenter
+
+ property var coordinate: coordinateMapMatchValid ? coordinateMapMatch : coordinateDevice
+ property bool coordinateValid: coordinateMapMatchValid || coordinateDeviceValid
+ property int direction: directionMapMatchValid ? directionMapMatch : directionDevice
+ property bool directionValid: directionMapMatchValid || directionDeviceValid
+ property bool waitForLock: false
+
+ // properties used for implementation details
+ property var _timer: Timer {
+ interval: 180000
+ repeat: false
+ running: gps.active && !gps.accurate
+ onTriggered: gps.waitForLock = false
+ onRunningChanged: {
+ if (running) gps.waitForLock = true;
+ else gps.waitForLock = false;
+ }
}
- testingCoordinate: app.conf.developmentCoordinateCenter ? map.center : undefined
-
- property bool accurate: ready &&
- position.horizontalAccuracyValid &&
- position.horizontalAccuracy > 0 &&
- position.horizontalAccuracy < 25
- property var ready: false
- property var timeActivate: Date.now()
- property var timePosition: Date.now()
-
- onActiveChanged: {
- // Keep track of when positioning was (re)activated.
- if (active) timeActivate = Date.now();
- else ready = false;
- }
+ Component.onCompleted: setTestingBinding()
+ onTestingModeChanged: setTestingBinding()
- onPositionChanged: {
- timePosition = Date.now();
- ready = position.latitudeValid &&
- position.longitudeValid &&
- position.coordinate.latitude &&
- position.coordinate.longitude;
+ function setTestingBinding() {
+ // avoid setting testing coordinate updates for most of the users
+ // and set it only if requested
+ if (testingMode)
+ testingCoordinate = Qt.binding(function() { return map.center; });
+ else
+ testingCoordinate = map.center; // break binding
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/PreferencesPage.qml
^
|
| @@ -55,95 +55,53 @@
}
}
- ComboBoxPL {
+ LanguageSelector {
description: app.tr("Preferred map language.")
- label: app.tr("Language")
- model: [
- app.tr("Local"),
- app.tr("Arabic"),
- app.tr("Basque"),
- app.tr("Catalan"),
- app.tr("Chinese (simplified)"),
- app.tr("Chinese (traditional)"),
- app.tr("Czech"),
- app.tr("Danish"),
- app.tr("Dutch"),
- app.tr("English"),
- app.tr("Finnish"),
- app.tr("French"),
- app.tr("German"),
- app.tr("Gaelic"),
- app.tr("Greek"),
- app.tr("Hebrew"),
- app.tr("Hindi"),
- app.tr("Indonesian"),
- app.tr("Italian"),
- app.tr("Japanese"),
- app.tr("Korean"),
- app.tr("Norwegian"),
- app.tr("Persian"),
- app.tr("Polish"),
- app.tr("Portuguese"),
- app.tr("Russian"),
- app.tr("Sinhalese"),
- app.tr("Spanish"),
- app.tr("Swedish"),
- app.tr("Thai"),
- app.tr("Turkish"),
- app.tr("Ukrainian"),
- app.tr("Urdu"),
- app.tr("Vietnamese"),
- app.tr("Welsh")
- ]
- property var values: [
- "local",
- "ar",
- "eu",
- "ca",
- "zh-simpl",
- "zh",
- "cs",
- "da",
- "nl",
- "en",
- "fi",
- "fr",
- "de",
- "ga",
- "el",
- "he",
- "hi",
- "id",
- "it",
- "ja",
- "ko",
- "no",
- "fa",
- "pl",
- "pt",
- "ru",
- "si",
- "es",
- "sv",
- "th",
- "tr",
- "uk",
- "ur",
- "vi",
- "cy"
+ key: app.conf.basemapLang
+ languages: [
+ { "key": "local", "name": app.tr("Local") },
+ { "key": "ar", "name": app.tr("Arabic") },
+ { "key": "eu", "name": app.tr("Basque") },
+ { "key": "ca", "name": app.tr("Catalan") },
+ { "key": "zh-simpl", "name": app.tr("Chinese (simplified)") },
+ { "key": "zh", "name": app.tr("Chinese (traditional)") },
+ { "key": "cs", "name": app.tr("Czech") },
+ { "key": "da", "name": app.tr("Danish") },
+ { "key": "nl", "name": app.tr("Dutch") },
+ { "key": "en", "name": app.tr("English") },
+ { "key": "fi", "name": app.tr("Finnish") },
+ { "key": "fr", "name": app.tr("French") },
+ { "key": "de", "name": app.tr("German") },
+ { "key": "ga", "name": app.tr("Gaelic") },
+ { "key": "el", "name": app.tr("Greek") },
+ { "key": "he", "name": app.tr("Hebrew") },
+ { "key": "hi", "name": app.tr("Hindi") },
+ { "key": "id", "name": app.tr("Indonesian") },
+ { "key": "it", "name": app.tr("Italian") },
+ { "key": "ja", "name": app.tr("Japanese") },
+ { "key": "ko", "name": app.tr("Korean") },
+ { "key": "no", "name": app.tr("Norwegian") },
+ { "key": "fa", "name": app.tr("Persian") },
+ { "key": "pl", "name": app.tr("Polish") },
+ { "key": "pt", "name": app.tr("Portuguese") },
+ { "key": "ru", "name": app.tr("Russian") },
+ { "key": "si", "name": app.tr("Sinhalese") },
+ { "key": "es", "name": app.tr("Spanish") },
+ { "key": "sv", "name": app.tr("Swedish") },
+ { "key": "th", "name": app.tr("Thai") },
+ { "key": "tr", "name": app.tr("Turkish") },
+ { "key": "uk", "name": app.tr("Ukrainian") },
+ { "key": "ur", "name": app.tr("Urdu") },
+ { "key": "vi", "name": app.tr("Vietnamese") },
+ { "key": "cy", "name": app.tr("Welsh") }
]
-
- Component.onCompleted: {
- var value = app.conf.basemapLang;
- currentIndex = values.indexOf(value);
- }
- onCurrentIndexChanged: {
- var index = currentIndex;
- app.conf.set("basemap_lang", values[index]);
+ onKeyChanged: {
+ app.conf.set("basemap_lang", key);
py.call_sync("poor.app.basemap.update", []);
}
}
+
ComboBoxPL {
description: app.tr("Switching between day/night modes of the map. " +
"Note that not all providers have all maps with day/night " +
@@ -795,37 +753,21 @@
FormLayoutPL {
spacing: styler.themePaddingMedium
- ComboBoxPL {
+ LanguageSelector {
id: languageComboBox
- currentIndex: 0
- label: app.tr("Language")
- model: [
- app.tr("English"),
- app.tr("Catalan"),
- app.tr("Czech"),
- app.tr("German"),
- app.tr("Spanish"),
- app.tr("French"),
- app.tr("Hindi"),
- app.tr("Italian"),
- app.tr("Russian"),
- app.tr("Slovak"),
- app.tr("Swedish")
- ]
- property var values: ["en", "ca", "cz", "de", "es", "fr", "hi", "it", "ru", "sl", "sv"]
- // from https://www.omniglot.com/language/phrases/hovercraft.htm
- property var phrases: [
- "My hovercraft is full of eels", // en
- "El meu aerolliscador està ple d'anguiles", // ca
- "Moje vznášedlo je plné úhořů", // cz
- "Mein Luftkissenfahrzeug ist voller Aale", // de
- "Mi aerodeslizador está lleno de anguilas", // es
- "Mon aéroglisseur est plein d'anguilles", // fr
- "मेरी मँडराने वाली नाव सर्पमीनों से भरी हैं", // hi
- "Il mio hovercraft è pieno di anguille", // it
- "Моё судно на воздушной подушке полно угрей", // ru
- "Moje vznášadlo je plné úhorov", // sl
- "Min svävare är full med ål" // sv
+ key: "en"
+ languages: [
+ { "key": "en", "name": app.tr("English"), "text": "My hovercraft is full of eels" },
+ { "key": "ca", "name": app.tr("Catalan"), "text": "El meu aerolliscador està ple d'anguiles" },
+ { "key": "cz", "name": app.tr("Czech"), "text": "Moje vznášedlo je plné úhořů" },
+ { "key": "de", "name": app.tr("German"), "text": "Mein Luftkissenfahrzeug ist voller Aale" },
+ { "key": "es", "name": app.tr("Spanish"), "text": "Mi aerodeslizador está lleno de anguilas" },
+ { "key": "fr", "name": app.tr("French"), "text": "Mon aéroglisseur est plein d'anguilles" },
+ { "key": "hi", "name": app.tr("Hindi"), "text": "मेरी मँडराने वाली नाव सर्पमीनों से भरी हैं" },
+ { "key": "it", "name": app.tr("Italian"), "text": "Il mio hovercraft è pieno di anguille" },
+ { "key": "ru", "name": app.tr("Russian"), "text": "Моё судно на воздушной подушке полно угрей" },
+ { "key": "sl", "name": app.tr("Slovak"), "text": "Moje vznášadlo je plné úhorov" },
+ { "key": "sv", "name": app.tr("Swedish"), "text": "Min svävare är full med ål" }
]
}
@@ -877,12 +819,12 @@
enabled: true
engine: "tester"
gender: genderComboBox.values[genderComboBox.currentIndex]
- language: languageComboBox.values[languageComboBox.currentIndex]
+ language: languageComboBox.key
}
function test() {
if (voice.active) {
- var txt = languageComboBox.phrases[languageComboBox.currentIndex];
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/RootPage.qml
^
|
| @@ -130,11 +130,14 @@
app.remorse = remorse;
// connect modal dialog properties
app.modalDialogBasemap = Qt.binding(function () { return basemapButton.openMenu; });
- // after all objects are initialized
- CmdLineParser.process()
}
onPageStatusActive: {
if (!app.infoActive) app.stateId = "";
+ // finish initialization after the root page is shown
+ if (!app.initialized) {
+ app.initialize();
+ if (app.mapboxKeyMissing) app.showMenu();
+ }
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/RoutePage.qml
^
|
| @@ -37,14 +37,12 @@
canNavigateForward: {
if (followMe)
return true;
- if (page.fromNeeded && (!page.from || (page.fromText === app.tr("Current position") && !gps.ready)) )
+ if (page.fromNeeded && (!page.from || (page.fromText === app.tr("Current position") && !gps.coordinateValid)) )
return false;
- if (page.toNeeded && (!page.to || (page.toText === app.tr("Current position") && !gps.ready)) )
+ if (page.toNeeded && (!page.to || (page.toText === app.tr("Current position") && !gps.coordinateValid)) )
+ return false;
+ if (waypointsEnabled && !waypointsReady)
return false;
- if (waypointsEnabled)
- for (var i=0; i < waypoints.count; ++i)
- if (!waypoints.get(i).set || (waypoints.get(i).text === app.tr("Current position") && !gps.ready))
- return false;
return true;
}
@@ -129,8 +127,9 @@
property bool toNeeded: true
property alias toQuery: toButton.query
property alias toText: toButton.text
- property alias waypointsEnabled: viaSwitch.checked
property var waypoints: ListModel {}
+ property alias waypointsEnabled: viaSwitch.checked
+ property bool waypointsReady: false
signal notify(string notification)
@@ -364,6 +363,7 @@
"y": coordinates[1]
});
index = -1;
+ checkIfWaypointsReady();
}
}
@@ -685,6 +685,7 @@
}
}
waypointsEnabled = (waypoints.count > 0);
+ checkIfWaypointsReady();
optimized = navigator.optimized;
// Fill "from" if origin is not set
@@ -716,6 +717,16 @@
columnRouter.addSettings();
}
+ function checkIfWaypointsReady() {
+ for (var i=0; i < waypoints.count; ++i)
+ if (!waypoints.get(i).set ||
+ (waypoints.get(i).text === app.tr("Current position") && !gps.coordinateValid)) {
+ waypointsReady = false;
+ return;
+ }
+ waypointsReady = true;
+ }
+
function getLocations() {
var routePoints = []
if (from && fromText)
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/RoutePoint.qml
^
|
| @@ -41,7 +41,7 @@
anchors.right: parent.right
anchors.rightMargin: styler.themeHorizontalPageMargin + (parent.width - page.width)
anchors.verticalCenter: parent.verticalCenter
- running: text === app.tr("Current position") && !gps.ready
+ running: text === app.tr("Current position") && !gps.coordinateValid
z: parent.z + 1
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/SpeedLimit.qml
^
|
| @@ -36,9 +36,9 @@
if (app.mapMatchingMode !== "car" || app.conf.showSpeedLimit==="never")
return false;
if (app.conf.showSpeedLimit==="exceeding") {
- if (!gps.position.speedValid || gps.streetSpeedLimit==null || gps.streetSpeedLimit < 0)
+ if (!gps.speedValid || gps.streetSpeedLimit==null || gps.streetSpeedLimit < 0)
return false;
- if (gps.position.speed <= gps.streetSpeedLimit)
+ if (gps.speed <= gps.streetSpeedLimit)
return false;
}
return limit.text.length > 0
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/icons/navigation/away-from-route-black.svg
^
|
| @@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="WORKING_ICONS"
+ data-name="WORKING ICONS"
+ width="20"
+ height="20"
+ viewBox="0 0 20 20"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="away-from-route.svg">
+ <metadata
+ id="metadata4194">
+ <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>direction</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs4192" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1855"
+ inkscape:window-height="1056"
+ id="namedview4190"
+ showgrid="false"
+ inkscape:zoom="11.4875"
+ inkscape:cx="5.2009608"
+ inkscape:cy="4.4807826"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="WORKING_ICONS" />
+ <title
+ id="title4186">direction</title>
+ <g
+ id="g5036">
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 9.9151249,3.7214363 11.307943,16.343852"
+ id="path5010"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path5012"
+ d="m 7.307943,14.080522 0,2.26333"
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 7.307943,8.9532101 0,3.4820459"
+ id="path5014"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path5016"
+ d="m 7.307943,4.0848745 0,3.4820462"
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path5034"
+ d="M 4.5266589,3.7214363 3.1338409,16.343852"
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ </g>
+ <g
+ id="g5048"
+ transform="matrix(0.52667815,0,0,0.57831327,29.863487,1.9919502)">
+ <path
+ sodipodi:nodetypes="scsss"
+ inkscape:connector-curvature="0"
+ id="path5043"
+ d="m -21.414581,10.424374 c 0,2.692313 -2.375768,5.247064 -4.874864,9.575626 -2.416291,-4.185138 -4.874864,-6.883313 -4.874864,-9.575626 0,-2.6923129 2.182551,-4.8748639 4.874864,-4.874864 2.692313,1e-7 4.874864,2.1825511 4.874864,4.874864 z"
+ style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <circle
+ r="2.5244832"
+ cy="10.424375"
+ cx="-26.289446"
+ id="path5046"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ </g>
+</svg>
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/icons/navigation/away-from-route-white.svg
^
|
| @@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="WORKING_ICONS"
+ data-name="WORKING ICONS"
+ width="20"
+ height="20"
+ viewBox="0 0 20 20"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="away-from-route.svg">
+ <metadata
+ id="metadata4194">
+ <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>direction</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs4192" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1855"
+ inkscape:window-height="1056"
+ id="namedview4190"
+ showgrid="false"
+ inkscape:zoom="11.4875"
+ inkscape:cx="5.2009608"
+ inkscape:cy="4.4807826"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="WORKING_ICONS" />
+ <title
+ id="title4186">direction</title>
+ <g
+ id="g5036">
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 9.9151249,3.7214363 11.307943,16.343852"
+ id="path5010"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path5012"
+ d="m 7.307943,14.080522 0,2.26333"
+ style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 7.307943,8.9532101 0,3.4820459"
+ id="path5014"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path5016"
+ d="m 7.307943,4.0848745 0,3.4820462"
+ style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path5034"
+ d="M 4.5266589,3.7214363 3.1338409,16.343852"
+ style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ </g>
+ <g
+ id="g5048"
+ transform="matrix(0.52667815,0,0,0.57831327,29.863487,1.9919502)">
+ <path
+ sodipodi:nodetypes="scsss"
+ inkscape:connector-curvature="0"
+ id="path5043"
+ d="m -21.414581,10.424374 c 0,2.692313 -2.375768,5.247064 -4.874864,9.575626 -2.416291,-4.185138 -4.874864,-6.883313 -4.874864,-9.575626 0,-2.6923129 2.182551,-4.8748639 4.874864,-4.874864 2.692313,1e-7 4.874864,2.1825511 4.874864,4.874864 z"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <circle
+ r="2.5244832"
+ cy="10.424375"
+ cx="-26.289446"
+ id="path5046"
+ style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ </g>
+</svg>
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/icons/navigation/navigation-start-black.svg
^
|
| @@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="WORKING_ICONS"
+ data-name="WORKING ICONS"
+ width="20"
+ height="20"
+ viewBox="0 0 20 20"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="navigation-start.svg">
+ <metadata
+ id="metadata4194">
+ <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>direction</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs4192" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1855"
+ inkscape:window-height="1056"
+ id="namedview4190"
+ showgrid="false"
+ inkscape:zoom="8.1228892"
+ inkscape:cx="-21.667443"
+ inkscape:cy="10.004149"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="WORKING_ICONS" />
+ <title
+ id="title4186">direction</title>
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 10.016574,15.641786 0,1.213682"
+ id="path5012"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path5014"
+ d="m 10.016574,12.892332 0,1.867202"
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 10.016574,10.28175 0,1.867202"
+ id="path5016"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 7.0541961,9.1858237 3.7779855,17.017851"
+ id="path5088"
+ inkscape:connector-curvature="0" />
+ <path
+ style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 10.183362,4.2324324 C 6.225391,6.5175687 6.2428172,6.5416407 4.5583691,7.5778237 l 0,-3.3453914 0,-3.22697 c 2.8984517,1.673422 1.0821513,0.604159 5.6249929,3.2269701 z"
+ id="rect5090"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path5093"
+ d="m 13.38048,9.1858237 3.276211,7.8320273"
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path5095"
+ d="M 13.507302,4.2324324 C 9.5493315,6.5175687 9.5667577,6.5416407 7.8823096,7.5778237 l 0,-3.3453914 0,-3.22697 c 2.8984514,1.673422 1.0821513,0.604159 5.6249924,3.2269701 z"
+ style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 16.892797,4.2324324 c -3.957971,2.2851363 -3.940544,2.3092083 -5.624992,3.3453913 l 0,-3.3453914 0,-3.22697 c 2.898451,1.673422 1.082151,0.604159 5.624992,3.2269701 z"
+ id="path5097"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+</svg>
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/icons/navigation/navigation-start-white.svg
^
|
| @@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="WORKING_ICONS"
+ data-name="WORKING ICONS"
+ width="20"
+ height="20"
+ viewBox="0 0 20 20"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="navigation-start.svg">
+ <metadata
+ id="metadata4194">
+ <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>direction</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs4192" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1855"
+ inkscape:window-height="1056"
+ id="namedview4190"
+ showgrid="false"
+ inkscape:zoom="8.1228892"
+ inkscape:cx="-21.667443"
+ inkscape:cy="10.004149"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="WORKING_ICONS" />
+ <title
+ id="title4186">direction</title>
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 10.016574,15.641786 0,1.213682"
+ id="path5012"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path5014"
+ d="m 10.016574,12.892332 0,1.867202"
+ style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 10.016574,10.28175 0,1.867202"
+ id="path5016"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 7.0541961,9.1858237 3.7779855,17.017851"
+ id="path5088"
+ inkscape:connector-curvature="0" />
+ <path
+ style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 10.183362,4.2324324 C 6.225391,6.5175687 6.2428172,6.5416407 4.5583691,7.5778237 l 0,-3.3453914 0,-3.22697 c 2.8984517,1.673422 1.0821513,0.604159 5.6249929,3.2269701 z"
+ id="rect5090"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path5093"
+ d="m 13.38048,9.1858237 3.276211,7.8320273"
+ style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path5095"
+ d="M 13.507302,4.2324324 C 9.5493315,6.5175687 9.5667577,6.5416407 7.8823096,7.5778237 l 0,-3.3453914 0,-3.22697 c 2.8984514,1.673422 1.0821513,0.604159 5.6249924,3.2269701 z"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 16.892797,4.2324324 c -3.957971,2.2851363 -3.940544,2.3092083 -5.624992,3.3453913 l 0,-3.3453914 0,-3.22697 c 2.898451,1.673422 1.082151,0.604159 5.624992,3.2269701 z"
+ id="path5097"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+</svg>
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/icons/navigation/position-unknown-low-signal-black.svg
^
|
| @@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="WORKING_ICONS"
+ data-name="WORKING ICONS"
+ width="20"
+ height="20"
+ viewBox="0 0 20 20"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="position-unknown-low-signal.svg">
+ <metadata
+ id="metadata4194">
+ <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>direction</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs4192" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1855"
+ inkscape:window-height="1056"
+ id="namedview4190"
+ showgrid="false"
+ inkscape:zoom="5.74375"
+ inkscape:cx="-6.8847819"
+ inkscape:cy="26.786702"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="WORKING_ICONS" />
+ <title
+ id="title4186">direction</title>
+ <path
+ style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ clip-path="none"
+ d="m 16.432522,10.154111 c -0.725731,0.08002 -1.581782,0.04283 -2.53714,-0.126979 C 12.661947,9.807889 11.363987,9.3897467 10.130365,8.8300526 8.8967429,8.2703588 7.727264,7.569024 6.7499568,6.7852536 6.0481127,6.2223942 5.4887201,5.6476768 5.0772753,5.0896419 4.733439,5.8889799 4.6499305,6.7694854 4.8230663,7.6495547 c 0.1784673,0.9071657 0.6232298,1.8127602 1.3144415,2.6198973 0.6912123,0.807137 1.5772617,1.454714 2.5559096,1.898727 0.9786484,0.444014 2.0494956,0.684277 3.1120946,0.672844 1.062596,-0.01139 2.036974,-0.273167 2.837155,-0.73632 0.800182,-0.463155 1.426265,-1.128483 1.79765,-1.947055 z"
+ id="path4196"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cssscssssscc" />
+ <path
+ sodipodi:nodetypes="cssscssssscc"
+ inkscape:connector-curvature="0"
+ id="path4209"
+ d="M 16.100731,6.9657094 C 15.594844,6.9573006 14.98826,6.87183 14.301702,6.7027646 13.415302,6.4844877 12.468494,6.147163 11.556465,5.7333754 10.644434,5.3195878 9.7670374,4.8292705 9.0190106,4.3060098 8.4818218,3.9302339 8.0442202,3.5583183 7.71222,3.2070635 c -0.1826485,0.4332474 -0.1756002,0.932602 0.012438,1.4509283 0.1938238,0.534285 0.5753559,1.0876132 1.1233413,1.6028636 0.5479859,0.51525 1.2214451,0.9534707 1.9449711,1.2817339 0.723525,0.3282627 1.49682,0.5464344 2.245447,0.6194564 0.748622,0.073021 1.416278,-0.00429 1.945978,-0.2103138 0.529701,-0.2060223 0.921465,-0.5411785 1.122104,-0.9834072 z"
+ clip-path="none"
+ style="opacity:0.46;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ style="opacity:0.44;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ clip-path="none"
+ d="M 15.436522,4.3335797 C 15.117045,4.3282693 14.733975,4.2742934 14.3004,4.167525 13.740622,4.0296787 13.142694,3.8166515 12.566729,3.5553365 11.990765,3.2940217 11.436671,2.9843764 10.964277,2.6539275 10.625033,2.4166177 10.348678,2.1817457 10.139013,1.9599214 c -0.115349,0.2736028 -0.110894,0.5889563 0.0079,0.9162897 0.122402,0.3374115 0.363348,0.6868488 0.709412,1.0122398 0.346064,0.3253904 0.771368,0.6021352 1.228288,0.8094399 0.45692,0.2073045 0.945271,0.345084 1.418042,0.3911986 0.47277,0.046114 0.894408,-0.00271 1.228924,-0.1328178 0.334517,-0.1301069 0.581923,-0.3417645 0.708632,-0.6210406 z"
+ id="path4211"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cssscssssscc" />
+ <path
+ style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 8.9777863,10.347779 c 3.2936787,3.561679 4.4609857,4.980372 6.4391617,7.536204 l -12.8783231,0 c 2.4290752,-3.161241 2.404749,-3.17352 6.4391614,-7.536204 z"
+ id="rect4213"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+</svg>
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/icons/navigation/position-unknown-low-signal-white.svg
^
|
| @@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="WORKING_ICONS"
+ data-name="WORKING ICONS"
+ width="20"
+ height="20"
+ viewBox="0 0 20 20"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="position-unknown-low-signal.svg">
+ <metadata
+ id="metadata4194">
+ <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>direction</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs4192" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1855"
+ inkscape:window-height="1056"
+ id="namedview4190"
+ showgrid="false"
+ inkscape:zoom="5.74375"
+ inkscape:cx="-6.8847819"
+ inkscape:cy="26.786702"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="WORKING_ICONS" />
+ <title
+ id="title4186">direction</title>
+ <path
+ style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ clip-path="none"
+ d="m 16.432522,10.154111 c -0.725731,0.08002 -1.581782,0.04283 -2.53714,-0.126979 C 12.661947,9.807889 11.363987,9.3897467 10.130365,8.8300526 8.8967429,8.2703588 7.727264,7.569024 6.7499568,6.7852536 6.0481127,6.2223942 5.4887201,5.6476768 5.0772753,5.0896419 4.733439,5.8889799 4.6499305,6.7694854 4.8230663,7.6495547 c 0.1784673,0.9071657 0.6232298,1.8127602 1.3144415,2.6198973 0.6912123,0.807137 1.5772617,1.454714 2.5559096,1.898727 0.9786484,0.444014 2.0494956,0.684277 3.1120946,0.672844 1.062596,-0.01139 2.036974,-0.273167 2.837155,-0.73632 0.800182,-0.463155 1.426265,-1.128483 1.79765,-1.947055 z"
+ id="path4196"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cssscssssscc" />
+ <path
+ sodipodi:nodetypes="cssscssssscc"
+ inkscape:connector-curvature="0"
+ id="path4209"
+ d="M 16.100731,6.9657094 C 15.594844,6.9573006 14.98826,6.87183 14.301702,6.7027646 13.415302,6.4844877 12.468494,6.147163 11.556465,5.7333754 10.644434,5.3195878 9.7670374,4.8292705 9.0190106,4.3060098 8.4818218,3.9302339 8.0442202,3.5583183 7.71222,3.2070635 c -0.1826485,0.4332474 -0.1756002,0.932602 0.012438,1.4509283 0.1938238,0.534285 0.5753559,1.0876132 1.1233413,1.6028636 0.5479859,0.51525 1.2214451,0.9534707 1.9449711,1.2817339 0.723525,0.3282627 1.49682,0.5464344 2.245447,0.6194564 0.748622,0.073021 1.416278,-0.00429 1.945978,-0.2103138 0.529701,-0.2060223 0.921465,-0.5411785 1.122104,-0.9834072 z"
+ clip-path="none"
+ style="opacity:0.46;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ style="opacity:0.44;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ clip-path="none"
+ d="M 15.436522,4.3335797 C 15.117045,4.3282693 14.733975,4.2742934 14.3004,4.167525 13.740622,4.0296787 13.142694,3.8166515 12.566729,3.5553365 11.990765,3.2940217 11.436671,2.9843764 10.964277,2.6539275 10.625033,2.4166177 10.348678,2.1817457 10.139013,1.9599214 c -0.115349,0.2736028 -0.110894,0.5889563 0.0079,0.9162897 0.122402,0.3374115 0.363348,0.6868488 0.709412,1.0122398 0.346064,0.3253904 0.771368,0.6021352 1.228288,0.8094399 0.45692,0.2073045 0.945271,0.345084 1.418042,0.3911986 0.47277,0.046114 0.894408,-0.00271 1.228924,-0.1328178 0.334517,-0.1301069 0.581923,-0.3417645 0.708632,-0.6210406 z"
+ id="path4211"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cssscssssscc" />
+ <path
+ style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 8.9777863,10.347779 c 3.2936787,3.561679 4.4609857,4.980372 6.4391617,7.536204 l -12.8783231,0 c 2.4290752,-3.161241 2.404749,-3.17352 6.4391614,-7.536204 z"
+ id="rect4213"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+</svg>
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/icons/navigation/position-unknown-no-signal-black.svg
^
|
| @@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="WORKING_ICONS"
+ data-name="WORKING ICONS"
+ width="20"
+ height="20"
+ viewBox="0 0 20 20"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="no-signal.svg">
+ <metadata
+ id="metadata4194">
+ <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>direction</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs4192" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1855"
+ inkscape:window-height="1056"
+ id="namedview4190"
+ showgrid="false"
+ inkscape:zoom="4.0614446"
+ inkscape:cx="1.5730986"
+ inkscape:cy="41.823059"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="WORKING_ICONS" />
+ <title
+ id="title4186">direction</title>
+ <g
+ id="g4218">
+ <path
+ sodipodi:nodetypes="cssscssssscc"
+ inkscape:connector-curvature="0"
+ id="path4196"
+ d="m 14.307032,10.08304 c -0.503561,0.05552 -1.097548,0.02972 -1.76044,-0.088107 C 11.690751,9.8428073 10.790138,9.5526717 9.9341666,9.1643179 9.0781959,8.7759642 8.2667318,8.2893304 7.5886096,7.7454972 7.1016224,7.354947 6.7134777,6.956169 6.4279893,6.5689664 6.1894123,7.1236015 6.1314684,7.7345561 6.2516018,8.3452081 c 0.1238328,0.6294533 0.4324393,1.2578164 0.912049,1.8178629 0.4796101,0.560047 1.0944115,1.00938 1.773464,1.317466 0.6790529,0.308087 1.4220792,0.474798 2.1593832,0.466865 0.737301,-0.0079 1.413391,-0.189542 1.968611,-0.510909 0.555221,-0.321368 0.98964,-0.783018 1.247332,-1.350999 z"
+ clip-path="none"
+ style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ clip-path="none"
+ d="M 14.076813,7.8707097 C 13.725794,7.8648751 13.304905,7.8055698 12.828524,7.6882607 12.21348,7.5368053 11.55652,7.3027465 10.923692,7.0156325 10.290863,6.7285185 9.6820654,6.388303 9.1630335,6.0252291 8.7902954,5.7644902 8.4866576,5.5064299 8.2562933,5.2627054 c -0.126734,0.3006165 -0.1218434,0.6471027 0.00863,1.0067528 0.1344882,0.3707233 0.3992211,0.75466 0.7794507,1.1121758 0.3802299,0.3575155 0.8475215,0.6615829 1.3495527,0.8893542 0.502031,0.227771 1.038596,0.3791534 1.558044,0.429821 0.519445,0.050667 0.98271,-0.00298 1.350252,-0.14593 0.367543,-0.1429523 0.639375,-0.3755065 0.778592,-0.6823548 z"
+ id="path4209"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cssscssssscc" />
+ <path
+ sodipodi:nodetypes="cssscssssscc"
+ inkscape:connector-curvature="0"
+ id="path4211"
+ d="M 13.61594,6.044359 C 13.394265,6.0406743 13.128465,6.0032221 12.827621,5.9291389 12.439209,5.8334918 12.024326,5.685679 11.624682,5.5043609 11.225039,5.3230429 10.840571,5.1081899 10.512792,4.878902 10.277401,4.7142403 10.085647,4.5512701 9.9401675,4.3973533 c -0.080037,0.1898443 -0.076946,0.408658 0.00545,0.6357842 0.084933,0.234119 0.2521156,0.4765824 0.4922386,0.7023608 0.240123,0.225778 0.535228,0.4178024 0.85227,0.5616445 0.317042,0.143842 0.655893,0.2394428 0.983934,0.2714402 0.32804,0.031997 0.620601,-0.00188 0.852711,-0.092158 0.232111,-0.090277 0.403778,-0.2371395 0.491697,-0.4309202 z"
+ clip-path="none"
+ style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="cccc"
+ inkscape:connector-curvature="0"
+ id="rect4213"
+ d="m 9.1344293,10.21742 c 2.2853787,2.471335 3.0953357,3.455721 4.4679287,5.229131 l -8.9358571,0 C 6.3519586,13.253067 6.3350794,13.244547 9.1344293,10.21742 Z"
+ style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ </g>
+ <g
+ id="g4230"
+ transform="matrix(0.56445776,0.82546195,-0.82546195,0.56445776,28.159674,32.297051)"
+ style="opacity:0.50000001">
+ <circle
+ r="8.4439611"
+ cy="2.4156694"
+ cx="-28.465725"
+ id="path4216"
+ style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4228"
+ d="m -37.214364,2.4156694 17.497279,0"
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+</svg>
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/icons/navigation/position-unknown-no-signal-white.svg
^
|
| @@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="WORKING_ICONS"
+ data-name="WORKING ICONS"
+ width="20"
+ height="20"
+ viewBox="0 0 20 20"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="no-signal.svg">
+ <metadata
+ id="metadata4194">
+ <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>direction</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs4192" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1855"
+ inkscape:window-height="1056"
+ id="namedview4190"
+ showgrid="false"
+ inkscape:zoom="4.0614446"
+ inkscape:cx="1.5730986"
+ inkscape:cy="41.823059"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="WORKING_ICONS" />
+ <title
+ id="title4186">direction</title>
+ <g
+ id="g4218">
+ <path
+ sodipodi:nodetypes="cssscssssscc"
+ inkscape:connector-curvature="0"
+ id="path4196"
+ d="m 14.307032,10.08304 c -0.503561,0.05552 -1.097548,0.02972 -1.76044,-0.088107 C 11.690751,9.8428073 10.790138,9.5526717 9.9341666,9.1643179 9.0781959,8.7759642 8.2667318,8.2893304 7.5886096,7.7454972 7.1016224,7.354947 6.7134777,6.956169 6.4279893,6.5689664 6.1894123,7.1236015 6.1314684,7.7345561 6.2516018,8.3452081 c 0.1238328,0.6294533 0.4324393,1.2578164 0.912049,1.8178629 0.4796101,0.560047 1.0944115,1.00938 1.773464,1.317466 0.6790529,0.308087 1.4220792,0.474798 2.1593832,0.466865 0.737301,-0.0079 1.413391,-0.189542 1.968611,-0.510909 0.555221,-0.321368 0.98964,-0.783018 1.247332,-1.350999 z"
+ clip-path="none"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ clip-path="none"
+ d="M 14.076813,7.8707097 C 13.725794,7.8648751 13.304905,7.8055698 12.828524,7.6882607 12.21348,7.5368053 11.55652,7.3027465 10.923692,7.0156325 10.290863,6.7285185 9.6820654,6.388303 9.1630335,6.0252291 8.7902954,5.7644902 8.4866576,5.5064299 8.2562933,5.2627054 c -0.126734,0.3006165 -0.1218434,0.6471027 0.00863,1.0067528 0.1344882,0.3707233 0.3992211,0.75466 0.7794507,1.1121758 0.3802299,0.3575155 0.8475215,0.6615829 1.3495527,0.8893542 0.502031,0.227771 1.038596,0.3791534 1.558044,0.429821 0.519445,0.050667 0.98271,-0.00298 1.350252,-0.14593 0.367543,-0.1429523 0.639375,-0.3755065 0.778592,-0.6823548 z"
+ id="path4209"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cssscssssscc" />
+ <path
+ sodipodi:nodetypes="cssscssssscc"
+ inkscape:connector-curvature="0"
+ id="path4211"
+ d="M 13.61594,6.044359 C 13.394265,6.0406743 13.128465,6.0032221 12.827621,5.9291389 12.439209,5.8334918 12.024326,5.685679 11.624682,5.5043609 11.225039,5.3230429 10.840571,5.1081899 10.512792,4.878902 10.277401,4.7142403 10.085647,4.5512701 9.9401675,4.3973533 c -0.080037,0.1898443 -0.076946,0.408658 0.00545,0.6357842 0.084933,0.234119 0.2521156,0.4765824 0.4922386,0.7023608 0.240123,0.225778 0.535228,0.4178024 0.85227,0.5616445 0.317042,0.143842 0.655893,0.2394428 0.983934,0.2714402 0.32804,0.031997 0.620601,-0.00188 0.852711,-0.092158 0.232111,-0.090277 0.403778,-0.2371395 0.491697,-0.4309202 z"
+ clip-path="none"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="cccc"
+ inkscape:connector-curvature="0"
+ id="rect4213"
+ d="m 9.1344293,10.21742 c 2.2853787,2.471335 3.0953357,3.455721 4.4679287,5.229131 l -8.9358571,0 C 6.3519586,13.253067 6.3350794,13.244547 9.1344293,10.21742 Z"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ </g>
+ <g
+ id="g4230"
+ transform="matrix(0.56445776,0.82546195,-0.82546195,0.56445776,28.159674,32.297051)"
+ style="opacity:0.50000001">
+ <circle
+ r="8.4439611"
+ cy="2.4156694"
+ cx="-28.465725"
+ id="path4216"
+ style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4228"
+ d="m -37.214364,2.4156694 17.497279,0"
+ style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+</svg>
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/icons/navigation/wrong-direction-black.svg
^
|
| @@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="WORKING_ICONS"
+ data-name="WORKING ICONS"
+ width="20"
+ height="20"
+ viewBox="0 0 20 20"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="wrong-direction.svg">
+ <metadata
+ id="metadata4194">
+ <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>direction</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs4192" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1855"
+ inkscape:window-height="1056"
+ id="namedview4190"
+ showgrid="false"
+ inkscape:zoom="11.4875"
+ inkscape:cx="5.2009608"
+ inkscape:cy="4.4807826"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="WORKING_ICONS" />
+ <title
+ id="title4186">direction</title>
+ <g
+ id="g4950"
+ transform="translate(31.077258,3.3949946)">
+ <circle
+ r="6.2241569"
+ cy="6.3329706"
+ cx="-21.022852"
+ id="path4944"
+ style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4946"
+ d="m -25.680087,6.3329706 9.314472,0"
+ style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+</svg>
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/icons/navigation/wrong-direction-white.svg
^
|
| @@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="WORKING_ICONS"
+ data-name="WORKING ICONS"
+ width="20"
+ height="20"
+ viewBox="0 0 20 20"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="wrong-direction.svg">
+ <metadata
+ id="metadata4194">
+ <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>direction</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs4192" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1855"
+ inkscape:window-height="1056"
+ id="namedview4190"
+ showgrid="false"
+ inkscape:zoom="11.4875"
+ inkscape:cx="5.2009608"
+ inkscape:cy="4.4807826"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="WORKING_ICONS" />
+ <title
+ id="title4186">direction</title>
+ <g
+ id="g4950"
+ transform="translate(31.077258,3.3949946)">
+ <circle
+ r="6.2241569"
+ cy="6.3329706"
+ cx="-21.022852"
+ id="path4944"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4946"
+ d="m -25.680087,6.3329706 9.314472,0"
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+</svg>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/qml/pure-maps.qml
^
|
| @@ -18,6 +18,7 @@
import QtQuick 2.0
import QtMultimedia 5.6
+import QtPositioning 5.4
import org.puremaps 1.0
import "."
import "platform"
@@ -49,6 +50,7 @@
// and the associated constant Theme.itemSizeSmall.
property real listItemVerticalMargin: (styler.themeItemSizeSmall - 1.125 * styler.themeFontSizeMedium) / 2
property var map: null
+ property bool mapboxKeyMissing: false
property string mapMatchingMode: {
if (!hasMapMatching) return "none";
else if (app.mode === modes.navigate || app.mode === modes.followMe || app.mode === modes.navigatePost)
@@ -197,7 +199,7 @@
function getPosition() {
// Return the coordinates of the current position.
- return [gps.position.coordinate.longitude, gps.position.coordinate.latitude];
+ return [gps.coordinate.longitude, gps.coordinate.latitude];
}
function hideMenu(menutext) {
@@ -220,6 +222,8 @@
else
app.hasMapMatching = mapMatchingAvailable;
initialized = true;
+ // after all objects and pages are initialized
+ CmdLineParser.process()
}
function openMapErrorMessage(error) {
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/routers/ValhallaSettings.qml
^
|
| @@ -18,6 +18,7 @@
import QtQuick 2.0
import "../qml/platform"
+import "../qml"
FormLayoutPL {
id: settingsBlock
@@ -51,25 +52,43 @@
}
}
- ComboBoxPL {
+ LanguageSelector {
id: langComboBox
- label: app.tr("Language")
- // XXX: We need something more complicated here in order to
- // have the languages in alphabetical order after translation.
- model: [ app.tr("Catalan"), app.tr("Czech"), app.tr("English"), app.tr("English Pirate"),
- app.tr("French"), app.tr("German"), app.tr("Hindi"), app.tr("Italian"), app.tr("Portuguese"),
- app.tr("Russian"), app.tr("Slovenian"), app.tr("Spanish"), app.tr("Swedish") ]
+ key: app.conf.get("routers." + settingsBlock.router + ".language")
+ // list generated using tools/generate-valhalla-lang.py
+ languages: [
+ { "key": "bg-BG", "name": app.tr("Bulgarian (Bulgaria)") },
+ { "key": "ca-ES", "name": app.tr("Catalan (Spain)") },
+ { "key": "cs-CZ", "name": app.tr("Czech (Czechia)") },
+ { "key": "da-DK", "name": app.tr("Danish (Denmark)") },
+ { "key": "de-DE", "name": app.tr("German (Germany)") },
+ { "key": "el-GR", "name": app.tr("Greek (Greece)") },
+ { "key": "en-GB", "name": app.tr("English (United Kingdom)") },
+ { "key": "en-US", "name": app.tr("English (United States)") },
+ { "key": "en-US-x-pirate", "name": app.tr("English Pirate") },
+ { "key": "es-ES", "name": app.tr("Spanish (Spain)") },
+ { "key": "et-EE", "name": app.tr("Estonian (Estonia)") },
+ { "key": "fi-FI", "name": app.tr("Finnish (Finland)") },
+ { "key": "fr-FR", "name": app.tr("French (France)") },
+ { "key": "hi-IN", "name": app.tr("Hindi (India)") },
+ { "key": "hu-HU", "name": app.tr("Hungarian (Hungary)") },
+ { "key": "it-IT", "name": app.tr("Italian (Italy)") },
+ { "key": "ja-JP", "name": app.tr("Japanese (Japan)") },
+ { "key": "nb-NO", "name": app.tr("Norwegian Bokmål (Norway)") },
+ { "key": "nl-NL", "name": app.tr("Dutch (Netherlands)") },
+ { "key": "pl-PL", "name": app.tr("Polish (Poland)") },
+ { "key": "pt-BR", "name": app.tr("Portuguese (Brazil)") },
+ { "key": "pt-PT", "name": app.tr("Portuguese (Portugal)") },
+ { "key": "ro-RO", "name": app.tr("Romanian (Romania)") },
+ { "key": "ru-RU", "name": app.tr("Russian (Russia)") },
+ { "key": "sk-SK", "name": app.tr("Slovak (Slovakia)") },
+ { "key": "sl-SI", "name": app.tr("Slovenian (Slovenia)") },
+ { "key": "sv-SE", "name": app.tr("Swedish (Sweden)") },
+ { "key": "tr-TR", "name": app.tr("Turkish (Turkey)") },
+ { "key": "uk-UA", "name": app.tr("Ukrainian (Ukraine)") }
+ ]
visible: full
- property var keys: ["ca", "cs", "en", "en-US-x-pirate", "fr", "de", "hi", "it", "pt", "ru", "sl", "es", "sv"]
- Component.onCompleted: {
- var key = app.conf.get("routers." + settingsBlock.router + ".language");
- var index = langComboBox.keys.indexOf(key);
- langComboBox.currentIndex = index > -1 ? index : 2;
- }
- onCurrentIndexChanged: {
- var key = langComboBox.keys[langComboBox.currentIndex]
- app.conf.set("routers." + settingsBlock.router + ".language", key);
- }
+ onKeyChanged: app.conf.set("routers." + settingsBlock.router + ".language", key)
}
SectionHeaderPL {
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/routers/gpx_osmscout.py
^
|
| @@ -164,5 +164,5 @@
locations=locations,
location_indexes=[0, len(x)-1],
mode=mode)
- route["language"] = result.trip.language
+ route["language"] = result.trip.language.replace('-','_')
return route
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/routers/gpx_osmscout_settings.qml
^
|
| @@ -18,6 +18,7 @@
import QtQuick 2.0
import "../qml/platform"
+import "../qml"
FormLayoutPL {
id: settingsBlock
@@ -25,6 +26,7 @@
property bool full: true // ignored for this router
property string selectedFile
+ property string router: "gpx_osmscout"
ValueButtonPL {
label: app.tr("File")
@@ -67,22 +69,43 @@
}
}
- ComboBoxPL {
+ LanguageSelector {
id: langComboBox
- label: app.tr("Language")
- model: [ app.tr("Catalan"), app.tr("Czech"), app.tr("English"), app.tr("English Pirate"),
- app.tr("French"), app.tr("German"), app.tr("Hindi"), app.tr("Italian"), app.tr("Portuguese"),
- app.tr("Russian"), app.tr("Slovenian"), app.tr("Spanish"), app.tr("Swedish") ]
- property var keys: ["ca", "cs", "en", "en-US-x-pirate", "fr", "de", "hi", "it", "pt", "ru", "sl", "es", "sv"]
- Component.onCompleted: {
- var key = app.conf.get("routers.gpx_osmscout.language");
- var index = langComboBox.keys.indexOf(key);
- langComboBox.currentIndex = index > -1 ? index : 2;
- }
- onCurrentIndexChanged: {
- var key = langComboBox.keys[langComboBox.currentIndex]
- app.conf.set("routers.gpx_osmscout.language", key);
- }
+ key: app.conf.get("routers." + settingsBlock.router + ".language")
+ // list generated using tools/generate-valhalla-lang.py
+ languages: [
+ { "key": "bg-BG", "name": app.tr("Bulgarian (Bulgaria)") },
+ { "key": "ca-ES", "name": app.tr("Catalan (Spain)") },
+ { "key": "cs-CZ", "name": app.tr("Czech (Czechia)") },
+ { "key": "da-DK", "name": app.tr("Danish (Denmark)") },
+ { "key": "de-DE", "name": app.tr("German (Germany)") },
+ { "key": "el-GR", "name": app.tr("Greek (Greece)") },
+ { "key": "en-GB", "name": app.tr("English (United Kingdom)") },
+ { "key": "en-US", "name": app.tr("English (United States)") },
+ { "key": "en-US-x-pirate", "name": app.tr("English Pirate") },
+ { "key": "es-ES", "name": app.tr("Spanish (Spain)") },
+ { "key": "et-EE", "name": app.tr("Estonian (Estonia)") },
+ { "key": "fi-FI", "name": app.tr("Finnish (Finland)") },
+ { "key": "fr-FR", "name": app.tr("French (France)") },
+ { "key": "hi-IN", "name": app.tr("Hindi (India)") },
+ { "key": "hu-HU", "name": app.tr("Hungarian (Hungary)") },
+ { "key": "it-IT", "name": app.tr("Italian (Italy)") },
+ { "key": "ja-JP", "name": app.tr("Japanese (Japan)") },
+ { "key": "nb-NO", "name": app.tr("Norwegian Bokmål (Norway)") },
+ { "key": "nl-NL", "name": app.tr("Dutch (Netherlands)") },
+ { "key": "pl-PL", "name": app.tr("Polish (Poland)") },
+ { "key": "pt-BR", "name": app.tr("Portuguese (Brazil)") },
+ { "key": "pt-PT", "name": app.tr("Portuguese (Portugal)") },
+ { "key": "ro-RO", "name": app.tr("Romanian (Romania)") },
+ { "key": "ru-RU", "name": app.tr("Russian (Russia)") },
+ { "key": "sk-SK", "name": app.tr("Slovak (Slovakia)") },
+ { "key": "sl-SI", "name": app.tr("Slovenian (Slovenia)") },
+ { "key": "sv-SE", "name": app.tr("Swedish (Sweden)") },
+ { "key": "tr-TR", "name": app.tr("Turkish (Turkey)") },
+ { "key": "uk-UA", "name": app.tr("Ukrainian (Ukraine)") }
+ ]
+ visible: full
+ onKeyChanged: app.conf.set("routers." + settingsBlock.router + ".language", key)
}
Component.onCompleted: selectedFile = app.conf.get("routers.gpx_osmscout.file")
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/routers/mapquest_open_settings.qml
^
|
| @@ -18,6 +18,7 @@
import QtQuick 2.0
import "../qml/platform"
+import "../qml"
FormLayoutPL {
property bool full: true
@@ -49,25 +50,19 @@
app.conf.remove("routers.mapquest_open.avoids", "Toll Road");
}
- ComboBoxPL {
+ LanguageSelector {
id: langComboBox
- label: app.tr("Language")
- // XXX: We need something more complicated here in order to
- // have the languages in alphabetical order after translation.
- model: [ app.tr("English (UK)"), app.tr("English (US)"), app.tr("French (Canada)"),
- app.tr("French (France)"), app.tr("German"), app.tr("Russian"), app.tr("Spanish (Mexico)"),
- app.tr("Spanish (Spain)") ]
- visible: full
- property var keys: ["en_GB", "en_US", "fr_CA", "fr_FR", "de_DE", "ru_RU", "es_MX", "es_ES"]
- Component.onCompleted: {
- var key = app.conf.get("routers.mapquest_open.language");
- var index = langComboBox.keys.indexOf(key);
- langComboBox.currentIndex = index > -1 ? index : 1;
- }
- onCurrentIndexChanged: {
- var key = langComboBox.keys[langComboBox.currentIndex];
- app.conf.set("routers.mapquest_open.language", key);
- }
+ key: app.conf.get("routers.mapquest_open.language")
+ languages: [
+ { "key": "de_DE", "name": app.tr("German (Germany)") },
+ { "key": "en_GB", "name": app.tr("English (United Kingdom)") },
+ { "key": "en_US", "name": app.tr("English (United States)") },
+ { "key": "es_ES", "name": app.tr("Spanish (Spain)") },
+ { "key": "es_MX", "name": app.tr("Spanish (Mexico)") },
+ { "key": "fr_CA", "name": app.tr("French (Canada)") },
+ { "key": "fr_FR", "name": app.tr("French (France)") },
+ { "key": "ru_RU", "name": app.tr("Russian (Russia)") }
+ ]
+ onKeyChanged: app.conf.set("routers.mapquest_open.language", key)
}
-
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/routers/osmscout.py
^
|
| @@ -239,7 +239,7 @@
locations=[locations[i.original_index] for i in result.trip.locations],
location_indexes=LocPointInd,
maneuvers=Man, mode=mode, optimized=optimized)
- route["language"] = result.trip.language
+ route["language"] = result.trip.language.replace('-','_')
if route and route["x"]:
cache[url] = copy.deepcopy(route)
return route
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/routers/stadiamaps.py
^
|
| @@ -199,7 +199,7 @@
locations=[locations[i.original_index] for i in result.trip.locations],
location_indexes=LocPointInd,
maneuvers=Man, mode=mode, optimized=optimized)
- route["language"] = result.trip.language
+ route["language"] = result.trip.language.replace('-','_')
if route and route["x"]:
cache[url] = copy.deepcopy(route)
return route
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/src/dbustracker.cpp
^
|
| @@ -0,0 +1,63 @@
+/*
+ * This file is part of OSM Scout Server.
+ *
+ * SPDX-FileCopyrightText: 2021 Rinigus https://github.com/rinigus
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+#include "dbustracker.h"
+
+#include <QDBusConnection>
+
+#include <QDebug>
+
+DBusTracker* DBusTracker::s_instance = nullptr;
+
+DBusTracker::DBusTracker(QObject *parent) : QObject(parent)
+{
+ QDBusConnection dbusconnection = QDBusConnection::sessionBus();
+ dbusconnection.connect(QString(),
+ "/org/freedesktop/DBus", "org.freedesktop.DBus", "NameOwnerChanged",
+ this, SLOT(onNameOwnerChanged(QString,QString,QString)));
+}
+
+DBusTracker* DBusTracker::instance()
+{
+ if (!s_instance) s_instance = new DBusTracker();
+ return s_instance;
+}
+
+int DBusTracker::numberOfServices()
+{
+ QMutexLocker lk(&m_mutex);
+ return m_tracked.size();
+}
+
+void DBusTracker::track(const QString &service)
+{
+ QMutexLocker lk(&m_mutex);
+ m_tracked.insert(service);
+ qDebug() << "Tracking " << service;
+}
+
+void DBusTracker::stop(const QString &service)
+{
+ m_tracked.remove(service);
+}
+
+void DBusTracker::onNameOwnerChanged(QString name, QString /*old_owner*/, QString new_owner)
+{
+ QMutexLocker lk(&m_mutex);
+ if (!m_tracked.contains(name)) return;
+
+ if (new_owner.length() < 1)
+ {
+ qDebug() << "Service disappeared " << name;
+ emit serviceDisappeared(name);
+ }
+ else
+ {
+ qDebug() << "Service appeared " << name;
+ emit serviceAppeared(name);
+ }
+}
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/src/dbustracker.h
^
|
| @@ -0,0 +1,46 @@
+/*
+ * This file is part of OSM Scout Server.
+ *
+ * SPDX-FileCopyrightText: 2021 Rinigus https://github.com/rinigus
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+#ifndef DBUSTRACKER_H
+#define DBUSTRACKER_H
+
+#include <QMutex>
+#include <QObject>
+#include <QSet>
+#include <QString>
+
+/// Registers client services and tracks them
+class DBusTracker : public QObject
+{
+ Q_OBJECT
+
+protected:
+ explicit DBusTracker(QObject *parent = nullptr);
+
+public:
+ static DBusTracker* instance();
+
+ int numberOfServices();
+ void track(const QString &service);
+ void stop(const QString &service);
+
+signals:
+ void serviceAppeared(QString service);
+ void serviceDisappeared(QString service);
+
+public slots:
+ // used to track lost clients
+ void onNameOwnerChanged(QString name, QString old_owner, QString new_owner);
+
+private:
+ QSet<QString> m_tracked;
+ QMutex m_mutex;
+
+ static DBusTracker* s_instance;
+};
+
+#endif // DBUSTRACKER_H
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/src/main.cpp
^
|
| @@ -45,6 +45,7 @@
#include "dbusservice.h"
#include "navigator.h"
#include "navigatordbusadapter.h"
+#include "positionsource.h"
int main(int argc, char *argv[])
@@ -177,6 +178,7 @@
#endif
qmlRegisterType<Navigator>("org.puremaps", 1, 0, "NavigatorBase");
qmlRegisterType<ManeuverModel>("org.puremaps", 1, 0, "ManeuverList");
+ qmlRegisterType<PositionSource>("org.puremaps", 1, 0, "PositionSource");
qmlRegisterSingletonType<CmdLineParser>("org.puremaps", 1, 0, "CmdLineParser", [](QQmlEngine *, QJSEngine *) -> QObject * {
return static_cast<QObject *>(CmdLineParser::instance());
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/src/navigator.cpp
^
|
| @@ -48,7 +48,7 @@
void Navigator::setupTranslator()
{
QString lang = m_language;
- if (lang == QLatin1Literal("en-US-x-pirate")) lang = QLatin1String("en-US");
+ if (lang == QLatin1Literal("en_US_x_pirate")) lang = QLatin1String("en_US");
m_locale = QLocale(lang);
if (m_translator.load(m_locale, APP_NAME, QLatin1String("-"),
QStringLiteral(DEFAULT_DATA_PREFIX "translations")))
@@ -148,13 +148,13 @@
else if (!valid)
{
- SET(icon, QLatin1String("flag"));
+ SET(icon, QLatin1String("position-unknown-no-signal"));
SET(narrative, trans("Position unknown"));
}
else
{
- SET(icon, QLatin1String("flag"));
+ SET(icon, QLatin1String("position-unknown-low-signal"));
SET(narrative, trans("Position imprecise: accuracy %1").arg(distanceToStr(horizontalAccuracy)));
}
@@ -422,7 +422,7 @@
}
else if (!on_route)
{
- SET(icon, QLatin1String("flag"));
+ SET(icon, QLatin1String("navigation-start"));
SET(manDist, QLatin1String("-"));
SET(manTime, QLatin1String());
SET(narrative, trans("Preparing to start navigation"));
@@ -466,7 +466,7 @@
{
m_distance_to_route_m = 0; // within the accuracy
- SET(icon, QLatin1String("uturn")); // turn around
+ SET(icon, QLatin1String("wrong-direction")); // turn around
SET(narrative, trans("Moving in a wrong direction"));
SET(manDist, QLatin1String("-"));
}
@@ -476,7 +476,7 @@
query.mutable_options()->set_max_results(1);
m_distance_to_route_m = S2Earth::RadiansToMeters(query.GetDistance(&target).radians());
- SET(icon, QLatin1String("flag")); // away from route icon
+ SET(icon, QLatin1String("away-from-route")); // away from route icon
SET(narrative, trans("Away from route"));
SET(manDist,
m_distance_to_route_m > 1 ?
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/src/osmscout_mapmatching.cpp
^
|
| @@ -0,0 +1,26 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp -c OSMScoutMapMatch -p src/osmscout_mapmatching src/osmscout_mapmatching.xml
+ *
+ * qdbusxml2cpp is Copyright (C) 2020 The Qt Company Ltd.
+ *
+ * This is an auto-generated file.
+ * This file may have been hand-edited. Look for HAND-EDIT comments
+ * before re-generating it.
+ */
+
+#include "osmscout_mapmatching.h"
+
+/*
+ * Implementation of interface class OSMScoutMapMatch
+ */
+
+OSMScoutMapMatch::OSMScoutMapMatch(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
+ : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
+{
+}
+
+OSMScoutMapMatch::~OSMScoutMapMatch()
+{
+}
+
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/src/osmscout_mapmatching.h
^
|
| @@ -0,0 +1,83 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp -c OSMScoutMapMatch -p src/osmscout_mapmatching src/osmscout_mapmatching.xml
+ *
+ * qdbusxml2cpp is Copyright (C) 2020 The Qt Company Ltd.
+ *
+ * This is an auto-generated file.
+ * Do not edit! All changes made to it will be lost.
+ */
+
+#ifndef OSMSCOUT_MAPMATCHING_H
+#define OSMSCOUT_MAPMATCHING_H
+
+#include <QtCore/QObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+#include <QtDBus/QtDBus>
+
+/*
+ * Proxy class for interface io.github.rinigus.OSMScoutServer.mapmatching
+ */
+class OSMScoutMapMatch: public QDBusAbstractInterface
+{
+ Q_OBJECT
+public:
+ static inline const char *staticInterfaceName()
+ { return "io.github.rinigus.OSMScoutServer.mapmatching"; }
+
+public:
+ OSMScoutMapMatch(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
+
+ ~OSMScoutMapMatch();
+
+ Q_PROPERTY(bool Active READ active)
+ inline bool active() const
+ { return qvariant_cast< bool >(property("Active")); }
+
+public Q_SLOTS: // METHODS
+ inline QDBusPendingReply<bool> Reset(int mode)
+ {
+ QList<QVariant> argumentList;
+ argumentList << QVariant::fromValue(mode);
+ return asyncCallWithArgumentList(QStringLiteral("Reset"), argumentList);
+ }
+
+ inline QDBusPendingReply<bool> Stop()
+ {
+ QList<QVariant> argumentList;
+ return asyncCallWithArgumentList(QStringLiteral("Stop"), argumentList);
+ }
+
+ inline QDBusPendingReply<bool> Stop(int mode)
+ {
+ QList<QVariant> argumentList;
+ argumentList << QVariant::fromValue(mode);
+ return asyncCallWithArgumentList(QStringLiteral("Stop"), argumentList);
+ }
+
+ inline QDBusPendingReply<QString> Update(int mode, double lat, double lon, double accuracy)
+ {
+ QList<QVariant> argumentList;
+ argumentList << QVariant::fromValue(mode) << QVariant::fromValue(lat) << QVariant::fromValue(lon) << QVariant::fromValue(accuracy);
+ return asyncCallWithArgumentList(QStringLiteral("Update"), argumentList);
+ }
+
+Q_SIGNALS: // SIGNALS
+ void ActiveChanged(bool active);
+};
+
+namespace io {
+ namespace github {
+ namespace rinigus {
+ namespace OSMScoutServer {
+ typedef ::OSMScoutMapMatch mapmatching;
+ }
+ }
+ }
+}
+#endif
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/src/osmscout_mapmatching.xml
^
|
| @@ -0,0 +1,28 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+ <interface name="io.github.rinigus.OSMScoutServer.mapmatching">
+ <property name="Active" type="b" access="read"/>
+ <signal name="ActiveChanged">
+ <arg name="active" type="b" direction="out"/>
+ </signal>
+ <method name="Update">
+ <arg type="s" direction="out"/>
+ <arg name="mode" type="i" direction="in"/>
+ <arg name="lat" type="d" direction="in"/>
+ <arg name="lon" type="d" direction="in"/>
+ <arg name="accuracy" type="d" direction="in"/>
+ </method>
+ <method name="Reset">
+ <arg type="b" direction="out"/>
+ <arg name="mode" type="i" direction="in"/>
+ </method>
+ <method name="Stop">
+ <arg type="b" direction="out"/>
+ <arg name="mode" type="i" direction="in"/>
+ </method>
+ <method name="Stop">
+ <arg type="b" direction="out"/>
+ </method>
+ </interface>
+</node>
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/src/positionsource.cpp
^
|
| @@ -0,0 +1,428 @@
+#include "positionsource.h"
+
+#include <QDebug>
+#include <QDBusMessage>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QVariantMap>
+
+#include <algorithm>
+#include <math.h>
+
+#include "dbustracker.h"
+
+// use var without m_ prefix
+#define SET(var, value) { auto t=(value); if (m_##var != t) { m_##var=t; /*qDebug() << "Emit " #var;*/ emit var##Changed(); } }
+
+// use var without m_ prefix
+#define SETWITHVALID(var, value, valid) { \
+ if (valid) { SET(var, (value)); SET(var##Valid, valid); } \
+ else { SET(var##Valid, valid); SET(var, (value)); } }
+
+#define SETWITHNANCHECK(var, value) SETWITHVALID(var, value, !qIsNaN(value))
+
+
+#define MAPMATCHING_SERVICE "io.github.rinigus.OSMScoutServer"
+#define MAPMATCHING_PATH "/io/github/rinigus/OSMScoutServer/mapmatching"
+
+PositionSource::PositionSource(QObject *parent) : QObject(parent)
+{
+ m_source = QGeoPositionInfoSource::createDefaultSource(this);
+ if (!m_source)
+ {
+ qWarning() << "Failed to acquire QGeoPositionInfoSource";
+ return;
+ }
+
+ qInfo() << "Acquired QGeoPositionInfoSource:" << m_source->sourceName();
+ if (m_source->sourceName() == "geoclue2")
+ {
+ m_directionCalculate = true;
+ qInfo() << "Calculate direction using a sequence of coordinates";
+ }
+
+ m_source->setPreferredPositioningMethods(QGeoPositionInfoSource::SatellitePositioningMethods);
+
+ connect(m_source, &QGeoPositionInfoSource::positionUpdated,
+ this, &PositionSource::onPositionUpdated);
+ connect(m_source, SIGNAL(error(QGeoPositionInfoSource::Error)),
+ this, SLOT(onError(QGeoPositionInfoSource::Error)));
+ connect(m_source, &QGeoPositionInfoSource::updateTimeout,
+ this, &PositionSource::onUpdateTimeout);
+
+ // network
+ connect(&m_networkManager, &QNetworkAccessManager::finished, this, &PositionSource::onNetworkFinished);
+
+ // track map matching service
+ DBusTracker::instance()->track(MAPMATCHING_SERVICE);
+ connect(DBusTracker::instance(), &DBusTracker::serviceAppeared,
+ this, &PositionSource::onMapMatchingServiceChanged);
+ connect(DBusTracker::instance(), &DBusTracker::serviceDisappeared,
+ this, &PositionSource::onMapMatchingServiceChanged);
+
+ // timers
+ m_timer.setInterval(1000);
+ connect(&m_timer, &QTimer::timeout, this, &PositionSource::onTestingTimer);
+
+ m_mapMatchingActivateTimer.setInterval(5000);
+ m_mapMatchingActivateTimer.setSingleShot(false);
+ connect(&m_mapMatchingActivateTimer, &QTimer::timeout, this, &PositionSource::onMapMatchingActivateTimer);
+}
+
+void PositionSource::setActive(bool active)
+{
+ if (!m_source || active==m_active) return;
+
+ if (active) m_source->startUpdates();
+ else
+ {
+ m_source->stopUpdates();
+ stopMapMatching();
+ checkMapMatchAvailable();
+ }
+
+ m_active = active;
+ emit activeChanged();
+}
+
+void PositionSource::setPosition(const QGeoPositionInfo &info)
+{
+ SETWITHVALID(coordinateDevice, info.coordinate(),
+ info.isValid() &&
+ !qIsNaN(info.coordinate().latitude()) &&
+ !qIsNaN(info.coordinate().longitude()));
+
+ SETWITHNANCHECK(horizontalAccuracy, info.attribute(QGeoPositionInfo::HorizontalAccuracy));
+ SETWITHNANCHECK(speed, info.attribute(QGeoPositionInfo::GroundSpeed));
+ SET(timestamp, info.timestamp());
+
+ // update and calculate direction if needed
+ if (m_directionCalculate)
+ {
+ if (m_horizontalAccuracyValid && m_coordinateDeviceValid && m_horizontalAccuracy < 100)
+ {
+ float threshold = m_horizontalAccuracy;
+ if (m_history.empty()) m_history.push_back(m_coordinateDevice);
+ QGeoCoordinate &last = m_history.back();
+ if (last.distanceTo(m_coordinateDevice) > threshold)
+ {
+ m_history.push_back(m_coordinateDevice);
+ if (m_history.size() > 3) m_history.removeFirst();
+ double scos = 0;
+ double ssin = 0;
+ for (int i=0; i < m_history.size()-1; ++i)
+ {
+ double az = m_history[i].azimuthTo(m_history[i+1]);
+ double s, c;
+ sincos(az / 180 * M_PI, &s, &c);
+ scos += c;
+ ssin += s;
+ }
+ int dir = int(round(atan2(ssin, scos) / M_PI * 180));
+ while (dir < 0) dir += 360;
+
+ SET(directionDevice, dir);
+ SET(directionDeviceValid, true);
+ m_directionTimestamp = QTime::currentTime();
+ }
+ }
+
+ // reset direction if it has not been updated for a while (60s)
+ if (!m_stickyDirection && m_directionDeviceValid && m_directionTimestamp.elapsed() > 60000)
+ {
+ m_history.clear();
+ SET(directionDeviceValid, false);
+ }
+ }
+ else
+ {
+ // use direction as provided by the device
+ float dir = info.attribute(QGeoPositionInfo::Direction);
+ if (!qIsNaN(dir) || !m_stickyDirection ||
+ (m_coordinateDeviceValid && m_directionLastPositionValid.distanceTo(m_coordinateDevice) > 10 /*meters*/))
+ {
+ SETWITHNANCHECK(directionDevice, dir);
+ if (m_directionDeviceValid && m_coordinateDeviceValid)
+ m_directionLastPositionValid = m_coordinateDevice;
+ }
+ }
+
+ // call map matching update
+ if (m_mapMatchingAvailable && m_coordinateDeviceValid && m_horizontalAccuracyValid)
+ {
+ // if call is in progress already, reset all map matching
+ // vars and try to update again. It indicates that the map
+ // matching is either not working or too slow
+ if (m_mapMatchingCallInProgress)
+ {
+ qWarning() << "Position was updated faster than map matching found the location";
+ resetMapMatchingValues();
+ }
+
+ m_mapMatchingCallInProgress = true;
+ m_mapMatchingActive = true;
+ auto reply = m_mapmatch->Update(m_mapMatchingMode,
+ m_coordinateDevice.latitude(), m_coordinateDevice.longitude(),
+ m_horizontalAccuracy);
+ QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this);
+ connect(watcher, &QDBusPendingCallWatcher::finished,
+ this, &PositionSource::onMapMatchingUpdateFinished);
+ }
+ else
+ stopMapMatching();
+
+ // set overall state vars
+ setReady(m_coordinateDeviceValid);
+ SET(accurate,
+ m_ready && m_coordinateDeviceValid && m_horizontalAccuracyValid &&
+ m_horizontalAccuracy < 25);
+
+ SET(updateInterval, std::max(m_source->updateInterval(), m_source->minimumUpdateInterval()));
+
+ emit positionUpdated();
+}
+
+void PositionSource::setReady(bool ready)
+{
+ SET(ready,ready);
+ if (!ready) SET(accurate, false);
+}
+
+void PositionSource::setStickyDirection(bool stickyDirection)
+{
+ SET(stickyDirection, stickyDirection);
+}
+
+void PositionSource::setTestingCoordinate(QGeoCoordinate testingCoordinate)
+{
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/src/positionsource.h
^
|
| @@ -0,0 +1,178 @@
+#ifndef POSITIONSOURCE_H
+#define POSITIONSOURCE_H
+
+#include <QObject>
+
+#include <QDateTime>
+#include <QDBusPendingCallWatcher>
+#include <QGeoCoordinate>
+#include <QGeoPositionInfoSource>
+#include <QList>
+#include <QNetworkAccessManager>
+#include <QTimer>
+
+#include "osmscout_mapmatching.h"
+
+class PositionSource: public QObject
+{
+ Q_OBJECT
+
+ Q_PROPERTY(bool accurate READ accurate NOTIFY accurateChanged)
+ Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
+ Q_PROPERTY(QGeoCoordinate coordinateDevice READ coordinateDevice NOTIFY coordinateDeviceChanged)
+ Q_PROPERTY(bool coordinateDeviceValid READ coordinateDeviceValid NOTIFY coordinateDeviceValidChanged)
+ Q_PROPERTY(QGeoCoordinate coordinateMapMatch READ coordinateMapMatch NOTIFY coordinateMapMatchChanged)
+ Q_PROPERTY(bool coordinateMapMatchValid READ coordinateMapMatchValid NOTIFY coordinateMapMatchValidChanged)
+ Q_PROPERTY(int directionDevice READ directionDevice NOTIFY directionDeviceChanged)
+ Q_PROPERTY(bool directionDeviceValid READ directionDeviceValid NOTIFY directionDeviceValidChanged)
+ Q_PROPERTY(int directionMapMatch READ directionMapMatch NOTIFY directionMapMatchChanged)
+ Q_PROPERTY(bool directionMapMatchValid READ directionMapMatchValid NOTIFY directionMapMatchValidChanged)
+ Q_PROPERTY(bool hasMapMatching READ hasMapMatching WRITE setHasMapMatching NOTIFY hasMapMatchingChanged)
+ Q_PROPERTY(float horizontalAccuracy READ horizontalAccuracy NOTIFY horizontalAccuracyChanged)
+ Q_PROPERTY(bool horizontalAccuracyValid READ horizontalAccuracyValid NOTIFY horizontalAccuracyValidChanged)
+ Q_PROPERTY(int mapMatchingMode READ mapMatchingMode WRITE setMapMatchingMode NOTIFY mapMatchingModeChanged)
+ Q_PROPERTY(bool ready READ ready NOTIFY readyChanged)
+ Q_PROPERTY(float speed READ speed NOTIFY speedChanged)
+ Q_PROPERTY(bool speedValid READ speedValid NOTIFY speedValidChanged)
+ Q_PROPERTY(bool stickyDirection READ stickyDirection WRITE setStickyDirection NOTIFY stickyDirectionChanged)
+ Q_PROPERTY(QString streetName READ streetName NOTIFY streetNameChanged)
+ Q_PROPERTY(float streetSpeedLimit READ streetSpeedLimit NOTIFY streetSpeedLimitChanged) // in m/s
+ Q_PROPERTY(QGeoCoordinate testingCoordinate READ testingCoordinate WRITE setTestingCoordinate NOTIFY testingCoordinateChanged)
+ Q_PROPERTY(bool testingMode READ testingMode WRITE setTestingMode NOTIFY testingModeChanged)
+ Q_PROPERTY(QDateTime timestamp READ timestamp NOTIFY timestampChanged)
+ Q_PROPERTY(int updateInterval READ updateInterval NOTIFY updateIntervalChanged)
+
+public:
+ explicit PositionSource(QObject *parent = nullptr);
+
+ // read property values
+ bool accurate() const { return m_accurate; }
+ bool active() const{ return m_active; }
+ QGeoCoordinate coordinateDevice() const { return m_coordinateDevice; }
+ bool coordinateDeviceValid() const { return m_coordinateDeviceValid; }
+ QGeoCoordinate coordinateMapMatch() const { return m_coordinateMapMatch; }
+ bool coordinateMapMatchValid() const { return m_coordinateMapMatchValid; }
+ int directionDevice() const { return m_directionDevice; }
+ bool directionDeviceValid() const { return m_directionDeviceValid; }
+ int directionMapMatch() const { return m_directionMapMatch; }
+ bool directionMapMatchValid() const { return m_directionMapMatchValid; }
+ bool hasMapMatching() const { return m_hasMapMatching; }
+ float horizontalAccuracy() const { return m_horizontalAccuracy; }
+ bool horizontalAccuracyValid() const { return m_horizontalAccuracyValid; }
+ int mapMatchingMode() const { return m_mapMatchingMode; }
+ bool ready() const { return m_ready; }
+ float speed() const { return m_speed; }
+ bool speedValid() const { return m_speedValid; }
+ bool stickyDirection() const { return m_stickyDirection; }
+ QString streetName() const { return m_streetName; }
+ float streetSpeedLimit() const { return m_streetSpeedLimit; }
+ QGeoCoordinate testingCoordinate() const { return m_testingCoordinate; }
+ bool testingMode() const { return m_testingMode; }
+ QDateTime timestamp() const { return m_timestamp; }
+ int updateInterval() const { return m_updateInterval; }
+
+ // setters
+ void setActive(bool active);
+ void setHasMapMatching(bool hasMapMatching);
+ void setMapMatchingMode(int mapMatchingMode);
+ void setStickyDirection(bool stickyDirection);
+ void setTestingCoordinate(QGeoCoordinate testingCoordinate);
+ void setTestingMode(bool testingMode);
+
+signals:
+ // properties
+ void accurateChanged();
+ void activeChanged();
+ void coordinateDeviceChanged();
+ void coordinateDeviceValidChanged();
+ void coordinateMapMatchChanged();
+ void coordinateMapMatchValidChanged();
+ void directionDeviceChanged();
+ void directionDeviceValidChanged();
+ void directionMapMatchChanged();
+ void directionMapMatchValidChanged();
+ void hasMapMatchingChanged();
+ void horizontalAccuracyChanged();
+ void horizontalAccuracyValidChanged();
+ void mapMatchingModeChanged();
+ void readyChanged();
+ void speedChanged();
+ void speedValidChanged();
+ void stickyDirectionChanged();
+ void streetNameChanged();
+ void streetSpeedLimitChanged();
+ void testingCoordinateChanged();
+ void testingModeChanged();
+ void timestampChanged();
+ void updateIntervalChanged();
+
+ // other signals
+ void positionUpdated();
+
+public slots:
+ void onError(QGeoPositionInfoSource::Error positioningError);
+
+private:
+ void checkMapMatchAvailable();
+
+ void onMapMatchingActive(bool active);
+ void onMapMatchingActiveFinished(QDBusPendingCallWatcher*);
+ void onMapMatchingActivateTimer();
+ void onMapMatchingServiceChanged(QString name);
+ void onMapMatchingUpdateFinished(QDBusPendingCallWatcher*);
+ void onNetworkFinished(QNetworkReply *reply);
+ void onPositionUpdated(const QGeoPositionInfo &info);
+ void onTestingTimer();
+ void onUpdateTimeout();
+
+ void resetMapMatchingValues();
+ void setPosition(const QGeoPositionInfo &info);
+ void setReady(bool ready);
+ void stopMapMatching();
+
+private:
+ // properties
+ bool m_accurate{false};
+ bool m_active{false};
+ QGeoCoordinate m_coordinateDevice;
+ bool m_coordinateDeviceValid{false};
+ QGeoCoordinate m_coordinateMapMatch;
+ bool m_coordinateMapMatchValid{false};
+ int m_directionDevice{0};
+ bool m_directionDeviceValid{false};
+ int m_directionMapMatch{0};
+ bool m_directionMapMatchValid{false};
+ bool m_hasMapMatching{false};
+ float m_horizontalAccuracy{0};
+ bool m_horizontalAccuracyValid{false};
+ int m_mapMatchingMode{0};
+ bool m_ready{false};
+ float m_speed{0};
+ bool m_speedValid{false};
+ bool m_stickyDirection{false};
+ QString m_streetName;
+ float m_streetSpeedLimit{-1};
+ QGeoCoordinate m_testingCoordinate;
+ bool m_testingMode{false};
+ QDateTime m_timestamp;
+ int m_updateInterval{0};
+
+ // internal
+ QGeoPositionInfoSource *m_source{nullptr};
+ bool m_directionCalculate{false};
+ QGeoCoordinate m_directionLastPositionValid;
+ QList<QGeoCoordinate> m_history;
+
+ QNetworkAccessManager m_networkManager;
+
+ QTime m_directionTimestamp;
+ QTimer m_timer;
+
+ OSMScoutMapMatch *m_mapmatch{nullptr};
+ bool m_mapMatchingActive{false};
+ bool m_mapMatchingAvailable{false};
+ QTimer m_mapMatchingActivateTimer;
+ bool m_mapMatchingCallInProgress{false};
+};
+
+#endif // POSITIONSOURCEEXTENDED_H
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-pure-maps-2.8.0.tar.xz/tools/generate-valhalla-lang.py
^
|
| @@ -0,0 +1,62 @@
+#!/usr/bin/env python3
+
+# To run this code:
+#
+# 1. install langcodes: pip install --user langcodes 'langcodes[data]'
+#
+# 2. run this script from main directory with Valhalla source dir as argument,
+# i.e. tools/generate-valhalla-lang.py ../osmscout/valhalla/valhalla
+
+import string
+import langcodes
+import os, glob
+import sys
+import polib
+
+VDIR=sys.argv[1]
+
+###########################
+def check_translations(lcode, name):
+ for pofile in glob.glob("po/*.po"):
+ tgt = pofile.split('/')[1].split('.')[0]
+ po = polib.pofile(pofile)
+ for entry in po.untranslated_entries():
+ if entry.msgid == name:
+ entry.msgstr = lcode.display_name(tgt)
+ print(entry.msgid, entry.msgstr)
+ po.save(pofile)
+
+# get list of all libpostal supported languages
+Langs = []
+for lng in os.listdir(os.path.join(VDIR, "locales")):
+ if lng.find(".json") > 0:
+ Langs.append(lng.split(".")[0])
+
+#Langs = ["en_GB", "en_US", "fr_CA", "fr_FR", "de_DE", "ru_RU", "es_MX", "es_ES"]
+Langs.sort()
+
+ltxt = '[\n'
+for lng in Langs:
+ if lng == 'en-US-x-pirate':
+ ui = 'app.tr("English Pirate")'
+ else:
+ lcode = langcodes.get(lng)
+ autonym = lcode.autonym()
+ name = lcode.display_name()
+ #ui = '"%1 / {auto}".arg(app.tr("{name}"))'.format(name=name, auto=autonym)
+ ui = 'app.tr("{name}")'.format(name=name, auto=autonym)
+
+ # fill all translations
+ check_translations(lcode, name)
+
+ if autonym == lng:
+ print("Skipping since we don't know much about it: " + lng)
+ continue
+
+ ltxt += ' { "key": "%s", "name": %s },\n' % (lng, ui)
+ print(lng, '/', autonym, '/', name)
+
+ltxt = ltxt[:-2] + "\n]"
+
+print()
+print(ltxt)
|
