Changes - SailfishOS Open Build Service

Changes of Revision 8

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

[-] [+]	Changed	_service:tar_git:harbour-pure-maps.changes
@@ -1,3 +1,6 @@ +* Thu Jan 26 2023 Rinigus <rinigus.git@gmail.com> - 3.2.0 +- [kirigami] Revert PageListPL to ScrollablePage + * Sun Aug 21 2022 Rinigus <rinigus.git@gmail.com> - 3.1.1 - [kirigami] Adjust search field alignment - [kirigami] Switch to regular page as ScrollablePage has broken ListView support
[-] [+]	Changed	_service:tar_git:harbour-pure-maps.spec ^
@@ -18,7 +18,7 @@ Name: pure-maps %endif -Version: 3.1.1 +Version: 3.2.0 Release: 1 Summary: Maps and navigation
[-] [+]	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">3.1.1</param> + <param name="revision">3.2.0</param> <param name="debian">N</param> <param name="dumb">N</param> </service>
[-] [+]	Deleted	_service:tar_git:harbour-pure-maps-3.1.1.tar.xz/guides/test/test_nominatim.py ^
@@ -1,33 +0,0 @@ -# -- coding: utf-8 -- - -# Copyright (C) 2015 Osmo Salomaa -# -# 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 poor.test - - -class TestModule(poor.test.TestCase): - - def setup_method(self, method): - self.guide = poor.Guide("nominatim") - - def test_geocode(self): - results = self.guide.nearby("restaurant", "", "olari, espoo", 1000) - results = list(map(poor.AttrDict, results)) - assert results - for result in results: - assert result.title - assert result.x - assert result.y
[-] [+]	Deleted	_service:tar_git:harbour-pure-maps-3.1.1.tar.xz/maps/mapbox_4_navigation_traffic_day.json ^
@@ -1,21 +0,0 @@ -{ - "attribution": { - "© Mapbox": "https://www.mapbox.com/about/maps", - "© OpenStreetMap": "https://www.openstreetmap.org/copyright", - "Improve this map": "https://www.mapbox.com/map-feedback" - }, - "fingerprint": { "id": "navigation-preview-day-v4" }, - "first_label_layer": "waterway-label", - "first_route_layer": "traffic-link-tunnel", - "format": "mapbox-gl", - "lang": { "local": "{name}", "en": "{name_en}", "es": "{name_es}", "fr": "{name_fr}", "de": "{name_de}", "ru": "{name_ru}", "zh": "{name_zh}", "zh-simpl": "{name_zh-Hans}", "pt": "{name_pt}", "ar": "{name_ar}", "ja": "{name_ja}", "ko": "{name_ko}" }, - "lang_key": "{name_en}", - "light": "day", - "logo": "mapbox", - "name": "Mapbox Navigation Preview Day", - "profiles": ["mixed", "online"], - "provider": "Mapbox", - "style_url": "mapbox://styles/mapbox/navigation-preview-day-v4", - "type": "traffic", - "vehicle": "car" -}
[-] [+]	Deleted	_service:tar_git:harbour-pure-maps-3.1.1.tar.xz/maps/mapbox_4_navigation_traffic_night.json ^
@@ -1,31 +0,0 @@ -{ - "attribution": { - "© Mapbox": "https://www.mapbox.com/about/maps", - "© OpenStreetMap": "https://www.openstreetmap.org/copyright", - "Improve this map": "https://www.mapbox.com/map-feedback" - }, - "fingerprint": { "id": "navigation-preview-night-v4" }, - "first_label_layer": "waterway-label", - "first_route_layer": "traffic-link-tunnel", - "format": "mapbox-gl", - "lang": { "local": "{name}", "en": "{name_en}", "es": "{name_es}", "fr": "{name_fr}", "de": "{name_de}", "ru": "{name_ru}", "zh": "{name_zh}", "zh-simpl": "{name_zh-Hans}", "pt": "{name_pt}", "ar": "{name_ar}", "ja": "{name_ja}", "ko": "{name_ko}" }, - "lang_key": "{name_en}", - "light": "night", - "logo": "mapbox", - "name": "Mapbox Navigation Preview Night", - "profiles": ["mixed", "online"], - "provider": "Mapbox", - "style_url": "mapbox://styles/mapbox/navigation-preview-night-v4", - "style_gui": { - "fg": "white", - "iconVariant": "white", - "maneuver": "#050505", - "position": "white", - "route": "#ffffff", - "routeOpacity": 0.5, - "itemFg": "white", - "itemBg": "black" - }, - "type": "traffic", - "vehicle": "car" -}
[-] [+]	Deleted	_service:tar_git:harbour-pure-maps-3.1.1.tar.xz/maps/mapbox_5_navigation_guidance_day.json ^
@@ -1,20 +0,0 @@ -{ - "attribution": { - "© Mapbox": "https://www.mapbox.com/about/maps", - "© OpenStreetMap": "https://www.openstreetmap.org/copyright", - "Improve this map": "https://www.mapbox.com/map-feedback" - }, - "fingerprint": { "id": "navigation-guidance-day-v4" }, - "first_label_layer": "poi-scalerank3", - "format": "mapbox-gl", - "lang": { "local": "{name}", "en": "{name_en}", "es": "{name_es}", "fr": "{name_fr}", "de": "{name_de}", "ru": "{name_ru}", "zh": "{name_zh}", "zh-simpl": "{name_zh-Hans}", "pt": "{name_pt}", "ar": "{name_ar}", "ja": "{name_ja}", "ko": "{name_ko}" }, - "lang_key": "{name_en}", - "light": "day", - "logo": "mapbox", - "name": "Mapbox Navigation Guidance Day", - "profiles": ["mixed", "online"], - "provider": "Mapbox", - "style_url": "mapbox://styles/mapbox/navigation-guidance-day-v4", - "type": "guidance", - "vehicle": "car" -}
[-] [+]	Deleted	_service:tar_git:harbour-pure-maps-3.1.1.tar.xz/maps/mapbox_5_navigation_guidance_night.json ^
@@ -1,30 +0,0 @@ -{ - "attribution": { - "© Mapbox": "https://www.mapbox.com/about/maps", - "© OpenStreetMap": "https://www.openstreetmap.org/copyright", - "Improve this map": "https://www.mapbox.com/map-feedback" - }, - "fingerprint": { "id": "navigation-guidance-night-v4" }, - "first_label_layer": "poi-scalerank3", - "format": "mapbox-gl", - "lang": { "local": "{name}", "en": "{name_en}", "es": "{name_es}", "fr": "{name_fr}", "de": "{name_de}", "ru": "{name_ru}", "zh": "{name_zh}", "zh-simpl": "{name_zh-Hans}", "pt": "{name_pt}", "ar": "{name_ar}", "ja": "{name_ja}", "ko": "{name_ko}" }, - "lang_key": "{name_en}", - "light": "night", - "logo": "mapbox", - "name": "Mapbox Navigation Guidance Night", - "profiles": ["mixed", "online"], - "provider": "Mapbox", - "style_url": "mapbox://styles/mapbox/navigation-guidance-night-v4", - "style_gui": { - "fg": "white", - "iconVariant": "white", - "maneuver": "#050505", - "position": "white", - "route": "#ffffff", - "routeOpacity": 0.5, - "itemFg": "white", - "itemBg": "black" - }, - "type": "guidance", - "vehicle": "car" -}
[-] [+]	Deleted	_service:tar_git:harbour-pure-maps-3.1.1.tar.xz/maps/osmscout_0_day_english.json ^
@@ -1,15 +0,0 @@ -{ - "attribution": { - "OSM Scout Server": "https://github.com/rinigus/osmscout-server", - "© OpenStreetMap": "https://www.openstreetmap.org/copyright" - }, - "first_label_layer": "waterway-name", - "format": "mapbox-gl", - "lang": "en", - "light": "day", - "name": "OSM Scout Day English", - "profiles": ["mixed", "offline"], - "provider": "OSM Scout", - "style_url": "http://localhost:8553/v1/mbgl/style?style=osmbright-en", - "type": "default" -}
[-] [+]	Deleted	_service:tar_git:harbour-pure-maps-3.1.1.tar.xz/maps/osmscout_0_night_english.json ^
@@ -1,25 +0,0 @@ -{ - "attribution": { - "OSM Scout Server": "https://github.com/rinigus/osmscout-server", - "© OpenStreetMap": "https://www.openstreetmap.org/copyright" - }, - "first_label_layer": "waterway-name", - "format": "mapbox-gl", - "lang": "en", - "light": "night", - "name": "OSM Scout Night English", - "profiles": ["mixed", "offline"], - "provider": "OSM Scout", - "style_url": "http://localhost:8553/v1/mbgl/style?style=mc-en", - "style_gui": { - "fg": "white", - "iconVariant": "white", - "maneuver": "black", - "position": "yellow", - "route": "#ffff00", - "routeOpacity": 0.5, - "itemFg": "white", - "itemBg": "black" - }, - "type": "default" -}
[-] [+]	Deleted	_service:tar_git:harbour-pure-maps-3.1.1.tar.xz/maps/osmscout_4_car_day_english.json ^
@@ -1,16 +0,0 @@ -{ - "attribution": { - "OSM Scout Server": "https://github.com/rinigus/osmscout-server", - "© OpenStreetMap": "https://www.openstreetmap.org/copyright" - }, - "first_label_layer": "waterway-name", - "format": "mapbox-gl", - "lang": "en", - "light": "day", - "name": "OSM Scout Car Day English", - "profiles": ["mixed", "offline"], - "provider": "OSM Scout", - "style_url": "http://localhost:8553/v1/mbgl/style?style=osmbright-car-en", - "type": "preview", - "vehicle": "car" -}
[-] [+]	Deleted	_service:tar_git:harbour-pure-maps-3.1.1.tar.xz/maps/osmscout_4_car_night_english.json ^
@@ -1,26 +0,0 @@ -{ - "attribution": { - "OSM Scout Server": "https://github.com/rinigus/osmscout-server", - "© OpenStreetMap": "https://www.openstreetmap.org/copyright" - }, - "first_label_layer": "waterway-name", - "format": "mapbox-gl", - "lang": "en", - "light": "night", - "name": "OSM Scout Car Night English", - "profiles": ["mixed", "offline"], - "provider": "OSM Scout", - "style_url": "http://localhost:8553/v1/mbgl/style?style=mc-car-en", - "style_gui": { - "fg": "white", - "iconVariant": "white", - "maneuver": "black", - "position": "yellow", - "route": "#ffff00", - "routeOpacity": 0.5, - "itemFg": "white", - "itemBg": "black" - }, - "type": "preview", - "vehicle": "car" -}
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/.gitignore ^
@@ -12,4 +12,4 @@ /build/ /qml/platform /.clickable/ -/clickable.json +/clickable.yaml
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/CMakeLists.txt ^
@@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.5.1) # Latest version as supported by Ubuntu Touch project(pure-maps - VERSION 3.1.1 + VERSION 3.2.0 DESCRIPTION "Maps and navigation") # options @@ -24,7 +24,7 @@ set(DEFAULT_GEOCODER "photon" CACHE STRING "Default geocoder for online profile") set(DEFAULT_GUIDE "foursquare" CACHE STRING "Default guide for online profile") set(DEFAULT_ROUTER "stadiamaps" CACHE STRING "Default router for online profile") -set(DEFAULT_FONTPROVIDER "maptiler" CACHE STRING "Default font provider. Supported: mapbox, maptiler, osmscout") +set(DEFAULT_FONTPROVIDER "openmaptiles" CACHE STRING "Default font provider. Supported: openmaptiles, mapbox, maptiler, osmscout") # set project version used in About message if(NOT PM_VERSION) @@ -55,6 +55,7 @@ set(VALID_FONTPROVIDERS "mapbox" "maptiler" + "openmaptiles" "osmscout") if(NOT DEFAULT_FONTPROVIDER IN_LIST VALID_FONTPROVIDERS)
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/NEWS.md ^
@@ -1,3 +1,17 @@ +2023-01-26: Pure Maps 3.2.0 +=========================== + +* Provide map zoom as search positioning bias info +* Add positioning bias to search using OSM Scout Server +* Improve localization support of vector tile maps +* Set OpenMapTiles as a default fonts provider +* Fix map route update +* Update translations +* Update documentation [JacekJagosz] +* [ubuntu touch] Update packaging scripts [jonnius] +* [ubuntu touch] Package click for Ubuntu Touch 20.04 [jonnius] +* [sfos] Allow access to Downloads [mschilli87] + 2022-05-01: Pure Maps 3.1.0 ===========================
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/README.md ^
@@ -172,7 +172,7 @@ * 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 +* For Kirigami platform: Nemo DBus https://github.com/sailfishos/nemo-qml-plugin-dbus When developing with Kirigami using flatpak builder, dependencies will be pulled and installed in flatpak. See instructions regarding
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/attic/guides/nominatim.json ^
(renamed from guides/nominatim.json)
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/attic/guides/nominatim.py ^
(renamed from guides/nominatim.py)
[-] [+]	Added	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/attic/guides/test/test_nominatim.py ^
@@ -0,0 +1,33 @@ +# -- coding: utf-8 -- + +# Copyright (C) 2015 Osmo Salomaa +# +# 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 poor.test + + +class TestModule(poor.test.TestCase): + + def setup_method(self, method): + self.guide = poor.Guide("nominatim") + + def test_geocode(self): + results = self.guide.nearby("restaurant", "", (24.7381,60.1738), 1000) + results = list(map(poor.AttrDict, results)) + assert results + for result in results: + assert result.title + assert result.x + assert result.y
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/data/harbour-pure-maps-jolla-store.desktop ^
@@ -9,6 +9,6 @@ BackupPathList=.config/io.github.rinigus/PureMaps [X-Sailjail] -Permissions=Internet;Location;Audio +Permissions=Internet;Location;Audio;Downloads OrganizationName=io.github.rinigus ApplicationName=PureMaps
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/geocoders/default.py ^
@@ -26,13 +26,13 @@ providers = ["photon", "opencage"] -def geocode(query, x, y, params): +def geocode(query, x, y, zoom, params): """Return a list of dictionaries of places matching `query`.""" for i, provider in enumerate(providers): geocoder = poor.Geocoder(provider) # 'geocode' returns an empty list or a dict(error=True) # in case of no results or an error. - results = geocoder.geocode(query, x, y, params) + results = geocoder.geocode(query, x, y, zoom, params) if results and isinstance(results, list): if i > 0: providers.insert(0, providers.pop(i)) return results
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/geocoders/digitransit.py ^
@@ -31,7 +31,7 @@ cache = {} -def autocomplete(query, x=0, y=0, params={}): +def autocomplete(query, x=0, y=0, zoom=16, params={}): """Return a list of autocomplete dictionaries matching `query`.""" if len(query) < 3: return [] query = urllib.parse.quote_plus(query) @@ -52,7 +52,7 @@ cache[key] = copy.deepcopy(results) return results -def geocode(query, x=0, y=0, params={}): +def geocode(query, x=0, y=0, zoom=16, params={}): """Return a list of dictionaries of places matching `query`.""" query = urllib.parse.quote_plus(query) limit = params.get("limit", 10)
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/geocoders/here.py ^
@@ -44,7 +44,7 @@ "&language={lang}") cache = {} -def autocomplete(query, x=0, y=0, params={}): +def autocomplete(query, x=0, y=0, zoom=16, params={}): """Return a list of autocomplete dictionaries matching `query`.""" query = query.strip() if len(query) < 3: return [] @@ -65,7 +65,7 @@ cache[url] = copy.deepcopy(results) return results -def geocode(query, x=0, y=0, params={}): +def geocode(query, x=0, y=0, zoom=16, params={}): """Return a list of dictionaries of places matching `query`.""" if isinstance(query, str): query = urllib.parse.quote_plus(query)
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/geocoders/opencage.py ^
@@ -42,7 +42,7 @@ cache = {} -def geocode(query, x=0, y=0, params={}): +def geocode(query, x=0, y=0, zoom=16, params={}): """Return a list of dictionaries of places matching `query`.""" query = urllib.parse.quote_plus(query) limit = params.get("limit", 10)
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/geocoders/osmscout.py ^
@@ -29,17 +29,22 @@ URL_REVERSE = "http://localhost:8553/v1/guide?radius={radius}&limit={limit}&lng={lng}&lat={lat}&poitype=any" cache = {} -def autocomplete(query, x=0, y=0, params={}): +def autocomplete(query, x=0, y=0, zoom=16, params={}): """Return a list of autocomplete dictionaries matching `query`.""" if len(query) < 3: return [] - results = geocode(query=query, x=x, y=y, params=params) + results = geocode(query=query, x=x, y=y, zoom=zoom, params=params) return results -def geocode(query, x=0, y=0, params={}): +def geocode(query, x=0, y=0, zoom=16, params={}): """Return a list of dictionaries of places matching `query`.""" query = urllib.parse.quote_plus(query) limit = params.get("limit", 25) url = URL.format(**locals()) + if x and y: + url += "&lng={:.3f}".format(x) + url += "&lat={:.3f}".format(y) + if zoom: + url += "&zoom={zoom}".format(zoom=int(zoom)) with poor.util.silent(KeyError): return copy.deepcopy(cache[url]) results = poor.http.get_json(url)
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/geocoders/photon.py ^
@@ -29,13 +29,13 @@ URL_REVERSE = "https://photon.komoot.io/reverse?lon={lon}&lat={lat}&limit={limit}&lang={lang}&distance_sort=true" cache = {} -def autocomplete(query, x=0, y=0, params={}): +def autocomplete(query, x=0, y=0, zoom=16, params={}): """Return a list of autocomplete dictionaries matching `query`.""" if len(query) < 3: return [] - results = geocode(query=query, x=x, y=y, params=params) + results = geocode(query=query, x=x, y=y, zoom=zoom, params=params) return results -def geocode(query, x=0, y=0, params={}): +def geocode(query, x=0, y=0, zoom=16, params={}): """Return a list of dictionaries of places matching `query`.""" query = urllib.parse.quote_plus(query) limit = params.get("limit", 10) @@ -45,6 +45,8 @@ if x and y: url += "&lon={:.3f}".format(x) url += "&lat={:.3f}".format(y) + if zoom: + url += "&zoom={zoom}".format(zoom=int(zoom)) with poor.util.silent(KeyError): return copy.deepcopy(cache[url]) results = poor.http.get_json(url)["features"]
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/guides/test/test_foursquare.py ^
@@ -31,7 +31,7 @@ assert result.label def test_nearby(self): - results = self.guide.nearby("restaurant", "", "tapiola, espoo", 1000) + results = self.guide.nearby("restaurant", "", (24.8099,60.1828), 1000) results = list(map(poor.AttrDict, results)) assert results for result in results:
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/maps/mapbox_0_streets.json ^
@@ -4,16 +4,16 @@ "© OpenStreetMap": "https://www.openstreetmap.org/copyright", "Improve this map": "https://www.mapbox.com/map-feedback" }, - "fingerprint": { "id": "streets-v10" }, - "first_label_layer": "waterway-label", + "fingerprint": { "id": "streets-v12" }, + "first_label_layer": "building-number-label", "format": "mapbox-gl", - "lang": { "local": "{name}", "en": "{name_en}", "es": "{name_es}", "fr": "{name_fr}", "de": "{name_de}", "ru": "{name_ru}", "zh": "{name_zh}", "zh-simpl": "{name_zh-Hans}", "pt": "{name_pt}", "ar": "{name_ar}", "ja": "{name_ja}", "ko": "{name_ko}" }, - "lang_key": "{name_en}", + "lang": { "local": "name", "int": "name_en", "ar": "name_ar", "de": "name_de", "en": "name_en", "es": "name_es", "fr": "name_fr", "it": "name_it", "ja": "name_ja", "ko": "name_ko", "pt": "name_pt", "ru": "name_ru", "zh": "name_zh", "zh-simpl": "name_zh-Hans" }, + "lang_key": "name_en", "light": "day", "logo": "mapbox", "name": "Mapbox Streets", "profiles": ["mixed", "online"], "provider": "Mapbox", - "style_url": "mapbox://styles/mapbox/streets-v10", + "style_url": "mapbox://styles/mapbox/streets-v12", "type": "default" }
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/maps/mapbox_1_outdoors.json ^
@@ -4,16 +4,16 @@ "© OpenStreetMap": "https://www.openstreetmap.org/copyright", "Improve this map": "https://www.mapbox.com/map-feedback" }, - "fingerprint": { "id": "outdoors-v10" }, - "first_label_layer": "waterway-label", + "fingerprint": { "id": "outdoors-v12" }, + "first_label_layer": "building-number-label", "format": "mapbox-gl", - "lang": { "local": "{name}", "en": "{name_en}", "es": "{name_es}", "fr": "{name_fr}", "de": "{name_de}", "ru": "{name_ru}", "zh": "{name_zh}", "zh-simpl": "{name_zh-Hans}", "pt": "{name_pt}", "ar": "{name_ar}", "ja": "{name_ja}", "ko": "{name_ko}" }, - "lang_key": "{name_en}", + "lang": { "local": "name", "int": "name_en", "ar": "name_ar", "de": "name_de", "en": "name_en", "es": "name_es", "fr": "name_fr", "it": "name_it", "ja": "name_ja", "ko": "name_ko", "pt": "name_pt", "ru": "name_ru", "zh": "name_zh", "zh-simpl": "name_zh-Hans" }, + "lang_key": "name_en", "light": "day", "logo": "mapbox", "name": "Mapbox Outdoors", "profiles": ["mixed", "online"], "provider": "Mapbox", - "style_url": "mapbox://styles/mapbox/outdoors-v10", + "style_url": "mapbox://styles/mapbox/outdoors-v12", "type": "terrain" }
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/maps/mapbox_3_satellite_streets.json ^
@@ -4,16 +4,16 @@ "© OpenStreetMap": "https://www.openstreetmap.org/copyright", "Improve this map": "https://www.mapbox.com/map-feedback" }, - "fingerprint": { "id": "satellite-streets-v10" }, - "first_label_layer": "waterway-label", + "fingerprint": { "id": "satellite-streets-v12" }, + "first_label_layer": "road-label", "format": "mapbox-gl", - "lang": { "local": "{name}", "en": "{name_en}", "es": "{name_es}", "fr": "{name_fr}", "de": "{name_de}", "ru": "{name_ru}", "zh": "{name_zh}", "zh-simpl": "{name_zh-Hans}", "pt": "{name_pt}", "ar": "{name_ar}", "ja": "{name_ja}", "ko": "{name_ko}" }, - "lang_key": "{name_en}", + "lang": { "local": "name", "int": "name_en", "ar": "name_ar", "de": "name_de", "en": "name_en", "es": "name_es", "fr": "name_fr", "it": "name_it", "ja": "name_ja", "ko": "name_ko", "pt": "name_pt", "ru": "name_ru", "zh": "name_zh", "zh-simpl": "name_zh-Hans" }, + "lang_key": "name_en", "light": "day", "logo": "mapbox", "name": "Mapbox Satellite Streets", "profiles": ["mixed", "online"], "provider": "Mapbox", - "style_url": "mapbox://styles/mapbox/satellite-streets-v10", + "style_url": "mapbox://styles/mapbox/satellite-streets-v12", "type": "hybrid" }
[-] [+]	Added	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/maps/mapbox_4_navigation_day.json ^
@@ -0,0 +1,21 @@ +{ + "attribution": { + "© Mapbox": "https://www.mapbox.com/about/maps", + "© OpenStreetMap": "https://www.openstreetmap.org/copyright", + "Improve this map": "https://www.mapbox.com/map-feedback" + }, + "fingerprint": { "id": "navigation-day-v1" }, + "first_label_layer": "road-label-navigation", + "first_route_layer": "bridge-rail-tracks", + "format": "mapbox-gl", + "lang": { "local": "name", "int": "name_en", "ar": "name_ar", "de": "name_de", "en": "name_en", "es": "name_es", "fr": "name_fr", "it": "name_it", "ja": "name_ja", "ko": "name_ko", "pt": "name_pt", "ru": "name_ru", "zh": "name_zh", "zh-simpl": "name_zh-Hans" }, + "lang_key": "name_en", + "light": "day", + "logo": "mapbox", + "name": "Mapbox Navigation Preview Day", + "profiles": ["mixed", "online"], + "provider": "Mapbox", + "style_url": "mapbox://styles/mapbox/navigation-day-v1", + "type": "traffic", + "vehicle": "car" +}
[-] [+]	Added	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/maps/mapbox_4_navigation_night.json ^
@@ -0,0 +1,31 @@ +{ + "attribution": { + "© Mapbox": "https://www.mapbox.com/about/maps", + "© OpenStreetMap": "https://www.openstreetmap.org/copyright", + "Improve this map": "https://www.mapbox.com/map-feedback" + }, + "fingerprint": { "id": "navigation-night-v1" }, + "first_label_layer": "road-label-navigation", + "first_route_layer": "bridge-rail-tracks", + "format": "mapbox-gl", + "lang": { "local": "name", "int": "name_en", "ar": "name_ar", "de": "name_de", "en": "name_en", "es": "name_es", "fr": "name_fr", "it": "name_it", "ja": "name_ja", "ko": "name_ko", "pt": "name_pt", "ru": "name_ru", "zh": "name_zh", "zh-simpl": "name_zh-Hans" }, + "lang_key": "name_en", + "light": "night", + "logo": "mapbox", + "name": "Mapbox Navigation Preview Night", + "profiles": ["mixed", "online"], + "provider": "Mapbox", + "style_url": "mapbox://styles/mapbox/navigation-night-v1", + "style_gui": { + "fg": "white", + "iconVariant": "white", + "maneuver": "#050505", + "position": "white", + "route": "#ffffff", + "routeOpacity": 0.5, + "itemFg": "white", + "itemBg": "black" + }, + "type": "traffic", + "vehicle": "car" +}
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/maps/maptiler_0_streets.json ^
@@ -8,6 +8,8 @@ "first_label_layer": "water_name_line", "format": "mapbox-gl", "keys": ["MAPTILER_KEY"], + "lang": {"local": "name", "int": "name_int", "ar": "name:ar", "ca": "name:ca", "cs": "name:cs", "cy": "name:cy", "da": "name:da", "de": "name:de", "el": "name:el", "en": "name:en", "es": "name:es", "eu": "name:eu", "fi": "name:fi", "fr": "name:fr", "ga": "name:ga", "he": "name:he", "hi": "name:hi", "id": "name:id", "it": "name:it", "ja": "name:ja", "ko": "name:ko", "nl": "name:nl", "no": "name:no", "pl": "name:pl", "pt": "name:pt", "ru": "name:ru", "sv": "name:sv", "th": "name:th", "tr": "name:tr", "uk": "name:uk", "zh": "name:zh"}, + "lang_key": "name:latin", "light": "day", "logo": "maptiler", "name": "MapTiler Streets",
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/maps/maptiler_1_outdoors.json ^
@@ -8,6 +8,7 @@ "first_label_layer": "outdoor_poi_parking", "format": "mapbox-gl", "keys": ["MAPTILER_KEY"], + "lang": {"local": "name", "int": "name_int", "ar": "name:ar", "ca": "name:ca", "cs": "name:cs", "cy": "name:cy", "da": "name:da", "de": "name:de", "el": "name:el", "en": "name:en", "es": "name:es", "eu": "name:eu", "fi": "name:fi", "fr": "name:fr", "ga": "name:ga", "he": "name:he", "hi": "name:hi", "id": "name:id", "it": "name:it", "ja": "name:ja", "ko": "name:ko", "nl": "name:nl", "no": "name:no", "pl": "name:pl", "pt": "name:pt", "ru": "name:ru", "sv": "name:sv", "th": "name:th", "tr": "name:tr", "uk": "name:uk", "zh": "name:zh"}, "light": "day", "logo": "maptiler", "name": "MapTiler Outdoor",
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/maps/maptiler_3_satellite_hybrid.json ^
@@ -8,6 +8,8 @@ "first_label_layer": "road_label", "format": "mapbox-gl", "keys": ["MAPTILER_KEY"], + "lang": {"local": "name", "int": "name_int", "ar": "name:ar", "ca": "name:ca", "cs": "name:cs", "cy": "name:cy", "da": "name:da", "de": "name:de", "el": "name:el", "en": "name:en", "es": "name:es", "eu": "name:eu", "fi": "name:fi", "fr": "name:fr", "ga": "name:ga", "he": "name:he", "hi": "name:hi", "id": "name:id", "it": "name:it", "ja": "name:ja", "ko": "name:ko", "nl": "name:nl", "no": "name:no", "pl": "name:pl", "pt": "name:pt", "ru": "name:ru", "sv": "name:sv", "th": "name:th", "tr": "name:tr", "uk": "name:uk", "zh": "name:zh"}, + "lang_key": "name", "light": "day", "logo": "maptiler", "name": "MapTiler Satellite Hybrid",
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/maps/osmscout_0_day.json ^
@@ -5,7 +5,8 @@ }, "first_label_layer": "waterway-name", "format": "mapbox-gl", - "lang": "local", + "lang": {"local": "name", "int": "name_int", "ar": "name:ar", "ca": "name:ca", "cs": "name:cs", "cy": "name:cy", "da": "name:da", "de": "name:de", "el": "name:el", "en": "name:en", "es": "name:es", "eu": "name:eu", "fi": "name:fi", "fr": "name:fr", "ga": "name:ga", "he": "name:he", "hi": "name:hi", "id": "name:id", "it": "name:it", "ja": "name:ja", "ko": "name:ko", "nl": "name:nl", "no": "name:no", "pl": "name:pl", "pt": "name:pt", "ru": "name:ru", "sv": "name:sv", "th": "name:th", "tr": "name:tr", "uk": "name:uk", "zh": "name:zh"}, + "lang_key": "name", "light": "day", "name": "OSM Scout Day", "profiles": ["mixed", "offline"],
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/maps/osmscout_0_night.json ^
@@ -5,7 +5,8 @@ }, "first_label_layer": "waterway-name", "format": "mapbox-gl", - "lang": "local", + "lang": {"local": "name", "int": "name_int", "ar": "name:ar", "ca": "name:ca", "cs": "name:cs", "cy": "name:cy", "da": "name:da", "de": "name:de", "el": "name:el", "en": "name:en", "es": "name:es", "eu": "name:eu", "fi": "name:fi", "fr": "name:fr", "ga": "name:ga", "he": "name:he", "hi": "name:hi", "id": "name:id", "it": "name:it", "ja": "name:ja", "ko": "name:ko", "nl": "name:nl", "no": "name:no", "pl": "name:pl", "pt": "name:pt", "ru": "name:ru", "sv": "name:sv", "th": "name:th", "tr": "name:tr", "uk": "name:uk", "zh": "name:zh"}, + "lang_key": "name", "light": "night", "name": "OSM Scout Night", "profiles": ["mixed", "offline"],
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/maps/osmscout_4_car_day.json ^
@@ -5,7 +5,8 @@ }, "first_label_layer": "waterway-name", "format": "mapbox-gl", - "lang": "local", + "lang": {"local": "name", "int": "name_int", "ar": "name:ar", "ca": "name:ca", "cs": "name:cs", "cy": "name:cy", "da": "name:da", "de": "name:de", "el": "name:el", "en": "name:en", "es": "name:es", "eu": "name:eu", "fi": "name:fi", "fr": "name:fr", "ga": "name:ga", "he": "name:he", "hi": "name:hi", "id": "name:id", "it": "name:it", "ja": "name:ja", "ko": "name:ko", "nl": "name:nl", "no": "name:no", "pl": "name:pl", "pt": "name:pt", "ru": "name:ru", "sv": "name:sv", "th": "name:th", "tr": "name:tr", "uk": "name:uk", "zh": "name:zh"}, + "lang_key": "name", "light": "day", "name": "OSM Scout Car Day", "profiles": ["mixed", "offline"],
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/maps/osmscout_4_car_night.json ^
@@ -5,7 +5,8 @@ }, "first_label_layer": "waterway-name", "format": "mapbox-gl", - "lang": "local", + "lang": {"local": "name", "int": "name_int", "ar": "name:ar", "ca": "name:ca", "cs": "name:cs", "cy": "name:cy", "da": "name:da", "de": "name:de", "el": "name:el", "en": "name:en", "es": "name:es", "eu": "name:eu", "fi": "name:fi", "fr": "name:fr", "ga": "name:ga", "he": "name:he", "hi": "name:hi", "id": "name:id", "it": "name:it", "ja": "name:ja", "ko": "name:ko", "nl": "name:nl", "no": "name:no", "pl": "name:pl", "pt": "name:pt", "ru": "name:ru", "sv": "name:sv", "th": "name:th", "tr": "name:tr", "uk": "name:uk", "zh": "name:zh"}, + "lang_key": "name", "light": "night", "name": "OSM Scout Car Night", "profiles": ["mixed", "offline"],
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/packaging/click/full-build.yaml ^
@@ -1,8 +1,9 @@ -clickable_minimum_required: 7.0.1 +clickable_minimum_required: 7.8.0 scripts: prepare-deps: git submodule update --recursive --init && ENABLE_MIMIC=1 ${ROOT}/packaging/click/prepare-deps.sh +framework: ubuntu-sdk-20.04 kill: pure-maps builder: cmake @@ -17,15 +18,11 @@ - sed -i 's/@APP_TITLE@/Pure Maps/g' ${INSTALL_DIR}/manifest.json - sed -i 's/@APP_NAME@/pure-maps/g' ${INSTALL_DIR}/manifest.json - mv ${INSTALL_DIR}/bin/pure-maps.jonnius ${CLICK_PATH}/pure-maps -dependencies_ppa: -- ppa:janisozaur/cmake-update -dependencies_host: -- cmake install_qml: - ${MAPBOX_GL_QML_LIB_INSTALL_DIR}/usr/lib/${ARCH_TRIPLET}/qt5/qml/MapboxMap install_lib: -- ${MAPLIBRE_GL_NATIVE_LIB_INSTALL_DIR}/lib/libQMapboxGL.so* +- ${MAPLIBRE_GL_NATIVE_LIB_INSTALL_DIR}/lib/libQMapLibreGL.so* - ${S2GEOMETRY_LIB_INSTALL_DIR}/lib/.so install_bin: - ${MIMIC_LIB_INSTALL_DIR}/bin/mimic @@ -48,34 +45,11 @@ - -DMBGL_QT_LIBRARY_ONLY=ON - -DMBGL_QT_STATIC=OFF - image_setup: - run: - - ln -s android-23 /usr/include/android - - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key \| apt-key add - - - apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-12 main" - - apt-get update - - apt-get install -y clang-12 lld-12 - - update-alternatives --install /usr/bin/cc cc /usr/bin/clang-12 60 - - update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-12 60 - - mkdir /opt/cmake - - wget https://github.com/Kitware/CMake/releases/download/v3.22.3/cmake-3.22.3-linux-x86_64.sh -O cmake-installer.sh - - sh cmake-installer.sh --skip-license --prefix=/opt/cmake - - rm cmake-installer.sh - env: - CC: clang-12 - CXX: clang++-12 - PATH: /opt/cmake/bin:$PATH - mapbox-gl-qml: builder: cmake build_args: - -DCMAKE_CXX_STANDARD=14 - dependencies_ppa: - - ppa:janisozaur/cmake-update - dependencies_host: - - cmake - s2geometry: builder: cmake build_args: @@ -83,10 +57,6 @@ - -DBUILD_TESTING=OFF - -DBUILD_SHARED_LIBS=ON - -DBUILD_EXAMPLES=OFF - dependencies_ppa: - - ppa:janisozaur/cmake-update - dependencies_host: - - cmake dependencies_target: - swig - libpython3-dev
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/packaging/click/manifest.json ^
@@ -9,7 +9,7 @@ "desktop": "pure-maps.desktop" } }, - "version": "3.1.1", + "version": "3.2.0", "maintainer": "Rinigus <rinigus.git@gmail.org>", "framework" : "@CLICK_FRAMEWORK@" }
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/packaging/click/patches/maplibre-gl-native/disable-armhf-version-check.patch ^
@@ -4,11 +4,11 @@ +++ b/platform/qt/qt.cmake @@ -226,7 +226,8 @@ configure_package_config_file( - write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/QMapboxGLConfigVersion.cmake - VERSION ${MBGL_QT_VERSION} -- COMPATIBILITY AnyNewerVersion) -+ COMPATIBILITY AnyNewerVersion -+ ARCH_INDEPENDENT) + write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/QMapLibreGLConfigVersion.cmake + VERSION ${MBGL_QT_VERSION} +- COMPATIBILITY AnyNewerVersion) ++ COMPATIBILITY AnyNewerVersion ++ ARCH_INDEPENDENT) - install(EXPORT QMapboxGLTargets - DESTINATION ${CMAKECONFIG_INSTALL_DIR} + install(EXPORT QMapLibreGLTargets + DESTINATION ${CMAKECONFIG_INSTALL_DIR}
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/packaging/click/patches/maplibre-gl-native/fix-compilation-with-clickable.patch ^
@@ -11,10 +11,10 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_VISIBILITY_PRESET hidden) set(CMAKE_C_EXTENSIONS OFF) -diff --git a/platform/qt/src/http_file_source.cpp b/platform/qt/src/http_file_source.cpp +diff --git a/platform/qt/src/mbgl/http_file_source.cpp b/platform/qt/src/mbgl/http_file_source.cpp index a2a13c5e1..a4ac0c58e 100644 ---- a/platform/qt/src/http_file_source.cpp -+++ b/platform/qt/src/http_file_source.cpp +--- a/platform/qt/src/mbgl/http_file_source.cpp ++++ b/platform/qt/src/mbgl/http_file_source.cpp @@ -45,7 +45,8 @@ void HTTPFileSource::Impl::request(HTTPRequest* req) #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) connect(data.first, &QNetworkReply::errorOccurred, this, &HTTPFileSource::Impl::onReplyFinished);
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/packaging/click/prepare-deps.sh ^
@@ -19,8 +19,8 @@ rm -rf $MAPLIBRE_GL_NATIVE_SRC_DIR $MAPBOX_GL_QML_SRC_DIR $QMLRUNNER_SRC_DIR $MIMIC_SRC_DIR $PICOTTS_SRC_DIR $S2GEOMETRY_SRC_DIR # Download sources -git clone -b main ${CLONE_ARGS} https://github.com/maplibre/maplibre-gl-native.git $MAPLIBRE_GL_NATIVE_SRC_DIR -git clone -b 2.0.1 ${CLONE_ARGS} https://github.com/rinigus/mapbox-gl-qml.git $MAPBOX_GL_QML_SRC_DIR +git clone -b qt-v2.0.1 ${CLONE_ARGS} https://github.com/maplibre/maplibre-gl-native.git $MAPLIBRE_GL_NATIVE_SRC_DIR +git clone -b 2.1.1 ${CLONE_ARGS} https://github.com/rinigus/mapbox-gl-qml.git $MAPBOX_GL_QML_SRC_DIR git clone -b 1.0.2 ${CLONE_ARGS} https://github.com/rinigus/qmlrunner.git $QMLRUNNER_SRC_DIR git clone -b 0.9.0+git2 ${CLONE_ARGS} https://github.com/rinigus/s2geometry.git $S2GEOMETRY_SRC_DIR
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/packaging/click/pure-maps.apparmor ^
@@ -6,5 +6,5 @@ "content_exchange", "networking" ], - "policy_version": 16.04 + "policy_version": 20.04 }
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/packaging/click/pure-maps.desktop ^
@@ -4,5 +4,5 @@ Icon=pure-maps.svg Type=Application MimeType=x-scheme-handler/geo -X-Ubuntu-Touch=true +X-Lomiri-Touch=true
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/packaging/click/slim-build.yaml ^
@@ -1,8 +1,9 @@ -clickable_minimum_required: 7.0.1 +clickable_minimum_required: 7.8.0 scripts: prepare-deps: git submodule update --recursive --init && ENABLE_MIMIC=0 ${ROOT}/packaging/click/prepare-deps.sh +framework: ubuntu-sdk-20.04 kill: pure-maps builder: cmake @@ -17,15 +18,11 @@ - sed -i 's/@APP_TITLE@/Pure Maps Slim/g' ${INSTALL_DIR}/manifest.json - sed -i 's/@APP_NAME@/pure-maps-slim/g' ${INSTALL_DIR}/manifest.json - mv ${INSTALL_DIR}/bin/pure-maps-slim.jonnius ${CLICK_PATH}/pure-maps -dependencies_ppa: -- ppa:janisozaur/cmake-update -dependencies_host: -- cmake install_qml: - ${MAPBOX_GL_QML_LIB_INSTALL_DIR}/usr/lib/${ARCH_TRIPLET}/qt5/qml/MapboxMap install_lib: -- ${MAPLIBRE_GL_NATIVE_LIB_INSTALL_DIR}/lib/libQMapboxGL.so* +- ${MAPLIBRE_GL_NATIVE_LIB_INSTALL_DIR}/lib/libQMapLibreGL.so* - ${S2GEOMETRY_LIB_INSTALL_DIR}/lib/.so install_bin: - ${PICOTTS_LIB_INSTALL_DIR}/usr/bin/pico2wave @@ -47,34 +44,11 @@ - -DMBGL_QT_LIBRARY_ONLY=ON - -DMBGL_QT_STATIC=OFF - image_setup: - run: - - ln -s android-23 /usr/include/android - - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key \| apt-key add - - - apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-12 main" - - apt-get update - - apt-get install -y clang-12 lld-12 - - update-alternatives --install /usr/bin/cc cc /usr/bin/clang-12 60 - - update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-12 60 - - mkdir /opt/cmake - - wget https://github.com/Kitware/CMake/releases/download/v3.22.3/cmake-3.22.3-linux-x86_64.sh -O cmake-installer.sh - - sh cmake-installer.sh --skip-license --prefix=/opt/cmake - - rm cmake-installer.sh - env: - CC: clang-12 - CXX: clang++-12 - PATH: /opt/cmake/bin:$PATH - mapbox-gl-qml: builder: cmake build_args: - -DCMAKE_CXX_STANDARD=14 - dependencies_ppa: - - ppa:janisozaur/cmake-update - dependencies_host: - - cmake - s2geometry: builder: cmake build_args: @@ -82,10 +56,6 @@ - -DBUILD_TESTING=OFF - -DBUILD_SHARED_LIBS=ON - -DBUILD_EXAMPLES=OFF - dependencies_ppa: - - ppa:janisozaur/cmake-update - dependencies_host: - - cmake dependencies_target: - swig - libpython3-dev
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/packaging/pure-maps.appdata.xml ^
@@ -38,6 +38,24 @@ </screenshots> <metadata_license>CC-BY-SA-3.0</metadata_license> <releases> + <release version="3.2.0" date="2023-01-26"> + <description> + <ul> + <li>Provide map zoom as search positioning bias info</li> + <li>Add positioning bias to search using OSM Scout Server</li> + <li>Improve localization support of vector tile maps</li> + <li>Set OpenMapTiles as a default fonts provider</li> + <li>Fix map route update</li> + <li>Update documentation [JacekJagosz]</li> + <li>[ubuntu touch] Update packaging scripts [jonnius]</li> + <li>[ubuntu touch] Package click for Ubuntu Touch 20.04 [jonnius]</li> + <li></li> + <li></li> + <li></li> + <li>Update translations</li> + </ul> + </description> + </release> <release version="3.1.1" date="2022-08-21"> <description> <ul>
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/po/de_DE.po ^
@@ -21,7 +21,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-08-21 11:41+0300\n" +"POT-Creation-Date: 2023-01-24 22:19+0200\n" "PO-Revision-Date: 2018-08-22 13:49+0000\n" "Last-Translator: Uli M <popanz@online.de>, 2022\n" "Language-Team: German (Germany) (https://www.transifex.com/rinigus/teams/89597/de_DE/)\n" @@ -173,6 +173,7 @@ msgstr "HERE API Schlüssel" #: poor/keystore.py:94 +#, python-brace-format msgid "" "<p>Your Pure Maps installation has enabled support for HERE " "services.</p><br><p>Please consult <a href=\"https://legal.here.com/en-" @@ -181,37 +182,17 @@ " use policy</a>, and <a href=\"https://legal.here.com/en-gb/privacy\">HERE " "Privacy policies</a>. In context of use of HERE and privacy policy, Pure " "Maps communicates with HERE using REST API.<p></br><p>For <a " -"href=\"https://knowledge.here.com/csm_kb?id=public_kb_csm_details&number=KB0016412\">legal" -" reasons</a>, Pure Maps enables HERE search and routing in a dedicated " -"\"HERE Online\" profile only. While not active anymore, see acceptable use " -"policy of 2018 for details regarding use of HERE together with other " -"providers under <a href=\"https://legal.here.com/en-gb/terms/acceptable-use-" -"policy-2018\">Layering and Modifications</a> section of the " -"document.</p><br><p>Please either accept the terms and the policy or decline" -" them. If declined, HERE support will be inactive and can be enabled later " -"by accepting the terms in Preferences under Licenses.</p>" -msgstr "" -"<p>Deine Pure Maps-Installation hat die Unterstützung für HERE-Dienste " -"aktiviert.</p><br><p>Bitte lies die<a href=\"https://legal.here.com/en-" -"gb/terms/here-end-user-terms\">End-Benutzer Bedingungen</a>, <a " -"href=\"https://legal.here.com/en-gb/terms/acceptable-use-" -"policy\">Nutzungsbedingungen</a>, und <a href=\"https://legal.here.com/en-" -"gb/privacy\">HERE Datenschutzrichtlinie</a>. Im Zusammenhang mit der Nutzung" -" von HERE und den Datenschutzrichtlinien kommuniziert Pure Maps mit HERE " -"über die REST API. Aus <a " -"href=\"https://knowledge.here.com/csm_kb?id=public_kb_csm_details&number=KB0016412\">rechtlichen" -" Gründen</a>, Pure Maps ermöglicht HERE-Suche und -Routing nur in einem " -"speziellen \"HERE Online\"-Profil. Obwohl diese nicht mehr aktuell sind, " -"beachte die Nutzungsbedingungen von 2018 für Details zur Nutzung von HERE " -"zusammen mit anderen Anbietern unter Abschnitt<a " -"href=\"https://legal.here.com/en-gb/terms/acceptable-use-" -"policy-2018\">Layering and Modifications</a> des Dokuments</p><br><p>Bitte " -"akzeptiere entweder die Bedingungen und Richtlinien oder lehne sie ab. Wenn " -"Du sie ablehnst, wird der HERE-Support deaktiviert und kann später durch " -"Akzeptieren der Bedingungen in den Einstellungen unter Lizenzen aktiviert " -"werden.</p>" +"href=\"{lruri}\">legal reasons</a>, Pure Maps enables HERE search and " +"routing in a dedicated \"HERE Online\" profile only. While not active " +"anymore, see acceptable use policy of 2018 for details regarding use of HERE" +" together with other providers under <a href=\"https://legal.here.com/en-" +"gb/terms/acceptable-use-policy-2018\">Layering and Modifications</a> section" +" of the document.</p><br><p>Please either accept the terms and the policy or" +" decline them. If declined, HERE support will be inactive and can be enabled" +" later by accepting the terms in Preferences under Licenses.</p>" +msgstr "" -#: poor/keystore.py:108 +#: poor/keystore.py:109 msgid "HERE End-User Terms" msgstr "HERE Endbenutzer-Bedingungen" @@ -580,7 +561,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:135 qml/PreferencesPage.qml:826 +#: qml/PoiPage.qml:135 qml/PreferencesPage.qml:828 msgid "Search" msgstr "Suchen" @@ -589,7 +570,7 @@ msgstr "Veranstaltungs-Orte" #: qml/AttributionPage.qml:119 qml/MenuPage.qml:60 qml/NavigationPage.qml:27 -#: qml/PreferencesPage.qml:481 qml/RoutePage.qml:25 +#: qml/PreferencesPage.qml:483 qml/RoutePage.qml:25 msgid "Navigation" msgstr "Navigation" @@ -644,14 +625,14 @@ msgid "Transport" msgstr "Verkehrsmittel" -#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:461 qml/RoutePage.qml:644 +#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:463 qml/RoutePage.qml:644 #: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53 #: routers/here_settings.qml:37 routers/mapquest_open_settings.qml:29 #: routers/ValhallaSettings.qml:38 msgid "Bicycle" msgstr "Fahrrad" -#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:461 qml/RoutePage.qml:644 +#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:463 qml/RoutePage.qml:644 #: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53 #: routers/here_settings.qml:37 routers/mapquest_open_settings.qml:29 #: routers/ValhallaSettings.qml:38 @@ -809,17 +790,6 @@ msgid "Language" msgstr "Sprache" -#: qml/LanguageSelector.qml:43 qml/PreferencesPage.qml:71 -#: qml/PreferencesPage.qml:943 -msgid "English" -msgstr "Englisch" - -#: qml/LanguageSelector.qml:44 routers/gpx_osmscout_settings.qml:84 -#: routers/here_settings.qml:83 routers/mapquest_open_settings.qml:59 -#: routers/ValhallaSettings.qml:67 -msgid "English (United States)" -msgstr "Englisch (Vereinigte Staaten)" - #: qml/LicensePage.qml:25 msgid "Accept" msgstr "Annehmen" @@ -898,20 +868,20 @@ msgid "Stop navigation to select POI" msgstr "Stoppe Navigation um POI auszuwählen" -#: qml/Map.qml:647 qml/NavigationPage.qml:207 qml/PoiBlock.qml:254 +#: qml/Map.qml:650 qml/NavigationPage.qml:207 qml/PoiBlock.qml:254 #: qml/RoutePage.qml:173 msgid "Origin" msgstr "Start" -#: qml/Map.qml:649 qml/NavigationPage.qml:210 qml/PoiBlock.qml:274 +#: qml/Map.qml:652 qml/NavigationPage.qml:210 qml/PoiBlock.qml:274 msgid "Final destination" msgstr "Endgültiges Ziel" -#: qml/Map.qml:651 +#: qml/Map.qml:654 msgid "✓" msgstr "✓" -#: qml/Map.qml:654 +#: qml/Map.qml:657 msgid "#%1" msgstr "#%1" @@ -1006,7 +976,7 @@ msgid "Pause" msgstr "Pause" -#: qml/NavigationPage.qml:46 qml/PreferencesPage.qml:835 qml/RoutePage.qml:67 +#: qml/NavigationPage.qml:46 qml/PreferencesPage.qml:837 qml/RoutePage.qml:67 msgid "Navigate" msgstr "Navigiere" @@ -1426,143 +1396,155 @@ msgstr "Bevorzugte Karten-Sprache." #: qml/PreferencesPage.qml:62 +msgid "Map default" +msgstr "" + +#: qml/PreferencesPage.qml:63 msgid "Local" msgstr "Örtliche" -#: qml/PreferencesPage.qml:63 +#: qml/PreferencesPage.qml:64 +msgid "International" +msgstr "" + +#: qml/PreferencesPage.qml:65 msgid "Arabic" msgstr "Arabisch" -#: qml/PreferencesPage.qml:64 routers/here_settings.qml:66 +#: qml/PreferencesPage.qml:66 routers/here_settings.qml:66 msgid "Basque" msgstr "Baskisch" -#: qml/PreferencesPage.qml:65 qml/PreferencesPage.qml:944 +#: qml/PreferencesPage.qml:67 qml/PreferencesPage.qml:946 #: routers/here_settings.qml:72 msgid "Catalan" msgstr "Katalanisch" -#: qml/PreferencesPage.qml:66 +#: qml/PreferencesPage.qml:68 msgid "Chinese (simplified)" msgstr "Chinesisch (vereinfacht)" -#: qml/PreferencesPage.qml:67 +#: qml/PreferencesPage.qml:69 msgid "Chinese (traditional)" msgstr "Chinesisch (traditionell)" -#: qml/PreferencesPage.qml:68 qml/PreferencesPage.qml:945 +#: qml/PreferencesPage.qml:70 qml/PreferencesPage.qml:947 msgid "Czech" msgstr "Tchechisch" -#: qml/PreferencesPage.qml:69 +#: qml/PreferencesPage.qml:71
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/po/es.po ^
@@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-08-21 11:41+0300\n" +"POT-Creation-Date: 2023-01-24 22:19+0200\n" "PO-Revision-Date: 2018-08-22 13:49+0000\n" "Last-Translator: Carmen Fernández B., 2022\n" "Language-Team: Spanish (https://www.transifex.com/rinigus/teams/89597/es/)\n" @@ -161,6 +161,7 @@ msgstr "Clave API de HERE" #: poor/keystore.py:94 +#, python-brace-format msgid "" "<p>Your Pure Maps installation has enabled support for HERE " "services.</p><br><p>Please consult <a href=\"https://legal.here.com/en-" @@ -169,36 +170,17 @@ " use policy</a>, and <a href=\"https://legal.here.com/en-gb/privacy\">HERE " "Privacy policies</a>. In context of use of HERE and privacy policy, Pure " "Maps communicates with HERE using REST API.<p></br><p>For <a " -"href=\"https://knowledge.here.com/csm_kb?id=public_kb_csm_details&number=KB0016412\">legal" -" reasons</a>, Pure Maps enables HERE search and routing in a dedicated " -"\"HERE Online\" profile only. While not active anymore, see acceptable use " -"policy of 2018 for details regarding use of HERE together with other " -"providers under <a href=\"https://legal.here.com/en-gb/terms/acceptable-use-" -"policy-2018\">Layering and Modifications</a> section of the " -"document.</p><br><p>Please either accept the terms and the policy or decline" -" them. If declined, HERE support will be inactive and can be enabled later " -"by accepting the terms in Preferences under Licenses.</p>" -msgstr "" -"<p>Tu instalación de Pure Maps ha habilitado el soporte de servicios de " -"HERE.</p><br><p>Consulta los <a href=\"https://legal.here.com/en-" -"gb/terms/here-end-user-terms\">términos de usuario final</a>, las <a " -"href=\"https://legal.here.com/en-gb/terms/acceptable-use-policy\">políticas " -"de uso aceptable</a>, y las <a href=\"https://legal.here.com/en-" -"gb/privacy\">políticas de privacidad de HERE</a>. En el contexto de uso de " -"HERE y la política de privacidad, Pure Maps se comunica con HERE usando las " -"REST API.<p></br><p>Por <a " -"href=\"https://knowledge.here.com/csm_kb?id=public_kb_csm_details&number=KB0016412\">razones" -" legales</a>, Pure Maps habilita la búsqueda y el cálculo de rutas de HERE " -"únicamente con un perfil dedicado de \"HERE Online\". Si bien ya no está " -"activo, consulta la política de uso aceptable de 2018 para obtener los " -"detalles sobre el uso de HERE junto con otros proveedores en la sección <a " -"href=\"https://legal.here.com/en-gb/terms/acceptable-use-policy-2018\">Capas" -" y modificaciones</a> del documento.</p><br><p>Acepta los términos y la " -"política o recházalos. Si los rechazas, el soporte de HERE estará inactivo y" -" se podrá habilitar más tarde aceptando los términos en Licencias dentro de " -"Preferencias.</p>" +"href=\"{lruri}\">legal reasons</a>, Pure Maps enables HERE search and " +"routing in a dedicated \"HERE Online\" profile only. While not active " +"anymore, see acceptable use policy of 2018 for details regarding use of HERE" +" together with other providers under <a href=\"https://legal.here.com/en-" +"gb/terms/acceptable-use-policy-2018\">Layering and Modifications</a> section" +" of the document.</p><br><p>Please either accept the terms and the policy or" +" decline them. If declined, HERE support will be inactive and can be enabled" +" later by accepting the terms in Preferences under Licenses.</p>" +msgstr "" -#: poor/keystore.py:108 +#: poor/keystore.py:109 msgid "HERE End-User Terms" msgstr "Términos de usuario final de HERE" @@ -570,7 +552,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:135 qml/PreferencesPage.qml:826 +#: qml/PoiPage.qml:135 qml/PreferencesPage.qml:828 msgid "Search" msgstr "Buscar" @@ -579,7 +561,7 @@ msgstr "Lugares" #: qml/AttributionPage.qml:119 qml/MenuPage.qml:60 qml/NavigationPage.qml:27 -#: qml/PreferencesPage.qml:481 qml/RoutePage.qml:25 +#: qml/PreferencesPage.qml:483 qml/RoutePage.qml:25 msgid "Navigation" msgstr "Navegación" @@ -634,14 +616,14 @@ msgid "Transport" msgstr "Transporte" -#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:461 qml/RoutePage.qml:644 +#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:463 qml/RoutePage.qml:644 #: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53 #: routers/here_settings.qml:37 routers/mapquest_open_settings.qml:29 #: routers/ValhallaSettings.qml:38 msgid "Bicycle" msgstr "Bicicleta" -#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:461 qml/RoutePage.qml:644 +#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:463 qml/RoutePage.qml:644 #: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53 #: routers/here_settings.qml:37 routers/mapquest_open_settings.qml:29 #: routers/ValhallaSettings.qml:38 @@ -801,17 +783,6 @@ msgid "Language" msgstr "Idioma" -#: qml/LanguageSelector.qml:43 qml/PreferencesPage.qml:71 -#: qml/PreferencesPage.qml:943 -msgid "English" -msgstr "Inglés" - -#: qml/LanguageSelector.qml:44 routers/gpx_osmscout_settings.qml:84 -#: routers/here_settings.qml:83 routers/mapquest_open_settings.qml:59 -#: routers/ValhallaSettings.qml:67 -msgid "English (United States)" -msgstr "inglés (Estados Unidos)" - #: qml/LicensePage.qml:25 msgid "Accept" msgstr "Aceptar" @@ -896,20 +867,20 @@ msgid "Stop navigation to select POI" msgstr "Detener navegación para seleccionar POI" -#: qml/Map.qml:647 qml/NavigationPage.qml:207 qml/PoiBlock.qml:254 +#: qml/Map.qml:650 qml/NavigationPage.qml:207 qml/PoiBlock.qml:254 #: qml/RoutePage.qml:173 msgid "Origin" msgstr "Origen" -#: qml/Map.qml:649 qml/NavigationPage.qml:210 qml/PoiBlock.qml:274 +#: qml/Map.qml:652 qml/NavigationPage.qml:210 qml/PoiBlock.qml:274 msgid "Final destination" msgstr "Destino final" -#: qml/Map.qml:651 +#: qml/Map.qml:654 msgid "✓" msgstr "✓" -#: qml/Map.qml:654 +#: qml/Map.qml:657 msgid "#%1" msgstr "#%1" @@ -1004,7 +975,7 @@ msgid "Pause" msgstr "Detener" -#: qml/NavigationPage.qml:46 qml/PreferencesPage.qml:835 qml/RoutePage.qml:67 +#: qml/NavigationPage.qml:46 qml/PreferencesPage.qml:837 qml/RoutePage.qml:67 msgid "Navigate" msgstr "Navegar" @@ -1425,143 +1396,155 @@ msgstr "Idioma preferido del mapa." #: qml/PreferencesPage.qml:62 +msgid "Map default" +msgstr "" + +#: qml/PreferencesPage.qml:63 msgid "Local" msgstr "Local" -#: qml/PreferencesPage.qml:63 +#: qml/PreferencesPage.qml:64 +msgid "International" +msgstr "" + +#: qml/PreferencesPage.qml:65 msgid "Arabic" msgstr "Árabe" -#: qml/PreferencesPage.qml:64 routers/here_settings.qml:66 +#: qml/PreferencesPage.qml:66 routers/here_settings.qml:66 msgid "Basque" msgstr "Vasco" -#: qml/PreferencesPage.qml:65 qml/PreferencesPage.qml:944 +#: qml/PreferencesPage.qml:67 qml/PreferencesPage.qml:946 #: routers/here_settings.qml:72 msgid "Catalan" msgstr "Catalán" -#: qml/PreferencesPage.qml:66 +#: qml/PreferencesPage.qml:68 msgid "Chinese (simplified)" msgstr "Chino (simplificado)" -#: qml/PreferencesPage.qml:67 +#: qml/PreferencesPage.qml:69 msgid "Chinese (traditional)" msgstr "Chino (tradicional)" -#: qml/PreferencesPage.qml:68 qml/PreferencesPage.qml:945 +#: qml/PreferencesPage.qml:70 qml/PreferencesPage.qml:947 msgid "Czech" msgstr "Checo" -#: qml/PreferencesPage.qml:69 +#: qml/PreferencesPage.qml:71 msgid "Danish"
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/po/et.po ^
@@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-08-21 11:41+0300\n" +"POT-Creation-Date: 2023-01-24 22:19+0200\n" "PO-Revision-Date: 2018-08-22 13:49+0000\n" "Last-Translator: Priit Jõerüüt <transifex@joeruut.com>, 2022\n" "Language-Team: Estonian (https://www.transifex.com/rinigus/teams/89597/et/)\n" @@ -162,6 +162,7 @@ msgstr "HERE API võti" #: poor/keystore.py:94 +#, python-brace-format msgid "" "<p>Your Pure Maps installation has enabled support for HERE " "services.</p><br><p>Please consult <a href=\"https://legal.here.com/en-" @@ -170,35 +171,17 @@ " use policy</a>, and <a href=\"https://legal.here.com/en-gb/privacy\">HERE " "Privacy policies</a>. In context of use of HERE and privacy policy, Pure " "Maps communicates with HERE using REST API.<p></br><p>For <a " -"href=\"https://knowledge.here.com/csm_kb?id=public_kb_csm_details&number=KB0016412\">legal" -" reasons</a>, Pure Maps enables HERE search and routing in a dedicated " -"\"HERE Online\" profile only. While not active anymore, see acceptable use " -"policy of 2018 for details regarding use of HERE together with other " -"providers under <a href=\"https://legal.here.com/en-gb/terms/acceptable-use-" -"policy-2018\">Layering and Modifications</a> section of the " -"document.</p><br><p>Please either accept the terms and the policy or decline" -" them. If declined, HERE support will be inactive and can be enabled later " -"by accepting the terms in Preferences under Licenses.</p>" -msgstr "" -"<p>Selles Pure Maps rakenduses on HERE tugi kasutusel</p><br><p>Palun tutvu " -"<a href=\"https://legal.here.com/en-gb/terms/here-end-user-" -"terms\">kasutustingimustega lõppkasutajale</a>, <a " -"href=\"https://legal.here.com/en-gb/terms/acceptable-use-policy\">mõistliku " -"kasutuse põhimõtetega</a> ja <a href=\"https://legal.here.com/en-" -"gb/privacy\">HERE privaatsustingimustega</a>. Kui HERE on kasutusel, siis " -"Pure Maps teeb REST API abil päringuid HERE teenustele.<p></br><p><a " -"href=\"https://knowledge.here.com/csm_kb?id=public_kb_csm_details&number=KB0016412\">Juriidilistel" -" põhjustel</a>Pure Maps saab kasutada HERE otsingu- ja teekonna koostamise " -"teenuseid vaid võrguteenustena. Kuigi 2018. aasta mõistliku kasutuse " -"põhimõtted pole enam jõus, siis sa leiad teavet HERE kasutamise kohta " -"teistes rakendustes <a href=\"https://legal.here.com/en-gb/terms/acceptable-" -"use-policy-2018\">Layering and Modifications</a> lõikust sellest samast " -"dokumendist.</p><br><p>Palun otsusta, kas sa nõustud HERE " -"kasutustingimustega või mitte. Viimasel juhul ei ole HERE tugi kasutusel " -"ning soovi korral saad hiljem selle Eelistused - Litsentsid vaatest uuesti " -"kasutusele võtta.</p>" +"href=\"{lruri}\">legal reasons</a>, Pure Maps enables HERE search and " +"routing in a dedicated \"HERE Online\" profile only. While not active " +"anymore, see acceptable use policy of 2018 for details regarding use of HERE" +" together with other providers under <a href=\"https://legal.here.com/en-" +"gb/terms/acceptable-use-policy-2018\">Layering and Modifications</a> section" +" of the document.</p><br><p>Please either accept the terms and the policy or" +" decline them. If declined, HERE support will be inactive and can be enabled" +" later by accepting the terms in Preferences under Licenses.</p>" +msgstr "" -#: poor/keystore.py:108 +#: poor/keystore.py:109 msgid "HERE End-User Terms" msgstr "HERE kasutustingimused lõppkasutajale" @@ -302,7 +285,7 @@ #: poor/util.py:383 msgid "API key missing" -msgstr "" +msgstr "API võti on puudu" #: poor/util.py:385 msgid "Available" @@ -569,7 +552,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:135 qml/PreferencesPage.qml:826 +#: qml/PoiPage.qml:135 qml/PreferencesPage.qml:828 msgid "Search" msgstr "Otsi" @@ -578,7 +561,7 @@ msgstr "Kohad ja paigad" #: qml/AttributionPage.qml:119 qml/MenuPage.qml:60 qml/NavigationPage.qml:27 -#: qml/PreferencesPage.qml:481 qml/RoutePage.qml:25 +#: qml/PreferencesPage.qml:483 qml/RoutePage.qml:25 msgid "Navigation" msgstr "Sinu teekond" @@ -633,14 +616,14 @@ msgid "Transport" msgstr "Transpordikaart" -#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:461 qml/RoutePage.qml:644 +#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:463 qml/RoutePage.qml:644 #: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53 #: routers/here_settings.qml:37 routers/mapquest_open_settings.qml:29 #: routers/ValhallaSettings.qml:38 msgid "Bicycle" msgstr "Jalgratas" -#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:461 qml/RoutePage.qml:644 +#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:463 qml/RoutePage.qml:644 #: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53 #: routers/here_settings.qml:37 routers/mapquest_open_settings.qml:29 #: routers/ValhallaSettings.qml:38 @@ -797,17 +780,6 @@ msgid "Language" msgstr "Keel" -#: qml/LanguageSelector.qml:43 qml/PreferencesPage.qml:71 -#: qml/PreferencesPage.qml:943 -msgid "English" -msgstr "inglise" - -#: qml/LanguageSelector.qml:44 routers/gpx_osmscout_settings.qml:84 -#: routers/here_settings.qml:83 routers/mapquest_open_settings.qml:59 -#: routers/ValhallaSettings.qml:67 -msgid "English (United States)" -msgstr "inglise (Ameerika Ühendriigid)" - #: qml/LicensePage.qml:25 msgid "Accept" msgstr "Nõustu" @@ -886,20 +858,20 @@ msgid "Stop navigation to select POI" msgstr "Huvipunkti valimiseks peata tee näitamine" -#: qml/Map.qml:647 qml/NavigationPage.qml:207 qml/PoiBlock.qml:254 +#: qml/Map.qml:650 qml/NavigationPage.qml:207 qml/PoiBlock.qml:254 #: qml/RoutePage.qml:173 msgid "Origin" msgstr "Lähtepunkt" -#: qml/Map.qml:649 qml/NavigationPage.qml:210 qml/PoiBlock.qml:274 +#: qml/Map.qml:652 qml/NavigationPage.qml:210 qml/PoiBlock.qml:274 msgid "Final destination" msgstr "Lõppsihtkoht" -#: qml/Map.qml:651 +#: qml/Map.qml:654 msgid "✓" msgstr "✓" -#: qml/Map.qml:654 +#: qml/Map.qml:657 msgid "#%1" msgstr "#%1" @@ -994,7 +966,7 @@ msgid "Pause" msgstr "Peata" -#: qml/NavigationPage.qml:46 qml/PreferencesPage.qml:835 qml/RoutePage.qml:67 +#: qml/NavigationPage.qml:46 qml/PreferencesPage.qml:837 qml/RoutePage.qml:67 msgid "Navigate" msgstr "Asu teele" @@ -1416,143 +1388,155 @@ msgstr "Kaardil kasutatava keele eelistus." #: qml/PreferencesPage.qml:62 +msgid "Map default" +msgstr "" + +#: qml/PreferencesPage.qml:63 msgid "Local" msgstr "Kohalik" -#: qml/PreferencesPage.qml:63 +#: qml/PreferencesPage.qml:64 +msgid "International" +msgstr "" + +#: qml/PreferencesPage.qml:65 msgid "Arabic" msgstr "araabia" -#: qml/PreferencesPage.qml:64 routers/here_settings.qml:66 +#: qml/PreferencesPage.qml:66 routers/here_settings.qml:66 msgid "Basque" msgstr "baski" -#: qml/PreferencesPage.qml:65 qml/PreferencesPage.qml:944 +#: qml/PreferencesPage.qml:67 qml/PreferencesPage.qml:946 #: routers/here_settings.qml:72 msgid "Catalan" msgstr "katalaani" -#: qml/PreferencesPage.qml:66 +#: qml/PreferencesPage.qml:68 msgid "Chinese (simplified)" msgstr "hiina (lihtsustatud)" -#: qml/PreferencesPage.qml:67 +#: qml/PreferencesPage.qml:69 msgid "Chinese (traditional)" msgstr "hiina (traditsiooniline)"
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/po/fr.po ^
@@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-08-21 11:41+0300\n" +"POT-Creation-Date: 2023-01-24 22:19+0200\n" "PO-Revision-Date: 2018-08-22 13:49+0000\n" "Last-Translator: Anne017, 2021\n" "Language-Team: French (https://www.transifex.com/rinigus/teams/89597/fr/)\n" @@ -168,6 +168,7 @@ msgstr "Clé API de HERE" #: poor/keystore.py:94 +#, python-brace-format msgid "" "<p>Your Pure Maps installation has enabled support for HERE " "services.</p><br><p>Please consult <a href=\"https://legal.here.com/en-" @@ -176,38 +177,17 @@ " use policy</a>, and <a href=\"https://legal.here.com/en-gb/privacy\">HERE " "Privacy policies</a>. In context of use of HERE and privacy policy, Pure " "Maps communicates with HERE using REST API.<p></br><p>For <a " -"href=\"https://knowledge.here.com/csm_kb?id=public_kb_csm_details&number=KB0016412\">legal" -" reasons</a>, Pure Maps enables HERE search and routing in a dedicated " -"\"HERE Online\" profile only. While not active anymore, see acceptable use " -"policy of 2018 for details regarding use of HERE together with other " -"providers under <a href=\"https://legal.here.com/en-gb/terms/acceptable-use-" -"policy-2018\">Layering and Modifications</a> section of the " -"document.</p><br><p>Please either accept the terms and the policy or decline" -" them. If declined, HERE support will be inactive and can be enabled later " -"by accepting the terms in Preferences under Licenses.</p>" -msgstr "" -"<p>Votre installation de Pure Maps a activé la prise en charge des services " -"de HERE.</p><br><p>Veuillez consulter les <a " -"href=\"https://legal.here.com/en-gb/terms/here-end-user-terms\">conditions " -"d'utilisation</a>, la <a href=\"https://legal.here.com/en-" -"gb/terms/acceptable-use-policy\">politique d'utilisation acceptable</a> et " -"la <a href=\"https://legal.here.com/en-gb/privacy\">politique de " -"confidentialité de HERE</a>. Dans le cadre de l'utilisation de HERE et de sa" -" politique de confidentialité, Pure Maps communique avec HERE en utilisant " -"l'API REST.<p></br><p>Pour des <a " -"href=\"https://knowledge.here.com/csm_kb?id=public_kb_csm_details&number=KB0016412\">raisons" -" légales</a>, Pure Maps active la recherche et le routage de HERE uniquement" -" dans un profil dédié « HERE en ligne ». Bien que non active, voir la " -"politique d'utilisation acceptable de 2018 pour les détails concernant " -"l'utilisation de HERE avec d'autres fournisseurs dans la section <a " -"href=\"https://legal.here.com/en-gb/terms/acceptable-use-" -"policy-2018\">Couches et modifications</a> de ce " -"document.</p><br><p>Veuillez soit accepter les conditions et la politique, " -"soit les refuser. En cas de refus, le support de HERE sera inactif et pourra" -" être activé ultérieurement en acceptant les conditions dans la section " -"Préférences sous licences.</p>" +"href=\"{lruri}\">legal reasons</a>, Pure Maps enables HERE search and " +"routing in a dedicated \"HERE Online\" profile only. While not active " +"anymore, see acceptable use policy of 2018 for details regarding use of HERE" +" together with other providers under <a href=\"https://legal.here.com/en-" +"gb/terms/acceptable-use-policy-2018\">Layering and Modifications</a> section" +" of the document.</p><br><p>Please either accept the terms and the policy or" +" decline them. If declined, HERE support will be inactive and can be enabled" +" later by accepting the terms in Preferences under Licenses.</p>" +msgstr "" -#: poor/keystore.py:108 +#: poor/keystore.py:109 msgid "HERE End-User Terms" msgstr "Conditions d'utilisation de HERE" @@ -577,7 +557,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:135 qml/PreferencesPage.qml:826 +#: qml/PoiPage.qml:135 qml/PreferencesPage.qml:828 msgid "Search" msgstr "Rechercher" @@ -586,7 +566,7 @@ msgstr "Lieux" #: qml/AttributionPage.qml:119 qml/MenuPage.qml:60 qml/NavigationPage.qml:27 -#: qml/PreferencesPage.qml:481 qml/RoutePage.qml:25 +#: qml/PreferencesPage.qml:483 qml/RoutePage.qml:25 msgid "Navigation" msgstr "Navigation" @@ -641,14 +621,14 @@ msgid "Transport" msgstr "Transport" -#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:461 qml/RoutePage.qml:644 +#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:463 qml/RoutePage.qml:644 #: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53 #: routers/here_settings.qml:37 routers/mapquest_open_settings.qml:29 #: routers/ValhallaSettings.qml:38 msgid "Bicycle" msgstr "Vélo" -#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:461 qml/RoutePage.qml:644 +#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:463 qml/RoutePage.qml:644 #: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53 #: routers/here_settings.qml:37 routers/mapquest_open_settings.qml:29 #: routers/ValhallaSettings.qml:38 @@ -806,17 +786,6 @@ msgid "Language" msgstr "Langue" -#: qml/LanguageSelector.qml:43 qml/PreferencesPage.qml:71 -#: qml/PreferencesPage.qml:943 -msgid "English" -msgstr "Anglais" - -#: qml/LanguageSelector.qml:44 routers/gpx_osmscout_settings.qml:84 -#: routers/here_settings.qml:83 routers/mapquest_open_settings.qml:59 -#: routers/ValhallaSettings.qml:67 -msgid "English (United States)" -msgstr "anglais (États-Unis)" - #: qml/LicensePage.qml:25 msgid "Accept" msgstr "Accepter" @@ -895,20 +864,20 @@ msgid "Stop navigation to select POI" msgstr "Arrêter la navigation vers le point d'intérêt sélectionné" -#: qml/Map.qml:647 qml/NavigationPage.qml:207 qml/PoiBlock.qml:254 +#: qml/Map.qml:650 qml/NavigationPage.qml:207 qml/PoiBlock.qml:254 #: qml/RoutePage.qml:173 msgid "Origin" msgstr "Départ" -#: qml/Map.qml:649 qml/NavigationPage.qml:210 qml/PoiBlock.qml:274 +#: qml/Map.qml:652 qml/NavigationPage.qml:210 qml/PoiBlock.qml:274 msgid "Final destination" msgstr "Destination" -#: qml/Map.qml:651 +#: qml/Map.qml:654 msgid "✓" msgstr "✓" -#: qml/Map.qml:654 +#: qml/Map.qml:657 msgid "#%1" msgstr "#%1" @@ -1003,7 +972,7 @@ msgid "Pause" msgstr "Pause" -#: qml/NavigationPage.qml:46 qml/PreferencesPage.qml:835 qml/RoutePage.qml:67 +#: qml/NavigationPage.qml:46 qml/PreferencesPage.qml:837 qml/RoutePage.qml:67 msgid "Navigate" msgstr "Naviguer" @@ -1424,143 +1393,155 @@ msgstr "Langue préférée pour la carte." #: qml/PreferencesPage.qml:62 +msgid "Map default" +msgstr "" + +#: qml/PreferencesPage.qml:63 msgid "Local" msgstr "locale" -#: qml/PreferencesPage.qml:63 +#: qml/PreferencesPage.qml:64 +msgid "International" +msgstr "" + +#: qml/PreferencesPage.qml:65 msgid "Arabic" msgstr "Arabe" -#: qml/PreferencesPage.qml:64 routers/here_settings.qml:66 +#: qml/PreferencesPage.qml:66 routers/here_settings.qml:66 msgid "Basque" msgstr "Basque" -#: qml/PreferencesPage.qml:65 qml/PreferencesPage.qml:944 +#: qml/PreferencesPage.qml:67 qml/PreferencesPage.qml:946 #: routers/here_settings.qml:72 msgid "Catalan" msgstr "Catalan" -#: qml/PreferencesPage.qml:66 +#: qml/PreferencesPage.qml:68 msgid "Chinese (simplified)" msgstr "Chinois (simplifié)" -#: qml/PreferencesPage.qml:67 +#: qml/PreferencesPage.qml:69 msgid "Chinese (traditional)" msgstr "Chinois (traditionnel)" -#: qml/PreferencesPage.qml:68 qml/PreferencesPage.qml:945 +#: qml/PreferencesPage.qml:70 qml/PreferencesPage.qml:947 msgid "Czech" msgstr "Tchèque" -#: qml/PreferencesPage.qml:69
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/po/it.po ^
@@ -8,33 +8,34 @@ # albanobattistella <albano_battistella@hotmail.com>, 2019 # Michele Claus <claus.miki@hotmail.it>, 2020 # rinigus github, 2021 +# liberi liberi <trfex.mtqx8@slmail.me>, 2022 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-20 17:14+0200\n" +"POT-Creation-Date: 2023-01-24 22:19+0200\n" "PO-Revision-Date: 2018-08-22 13:49+0000\n" -"Last-Translator: rinigus github, 2021\n" +"Last-Translator: liberi liberi <trfex.mtqx8@slmail.me>, 2022\n" "Language-Team: Italian (https://www.transifex.com/rinigus/teams/89597/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: it\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n" #: geocoders/here.py:141 msgid "Search suggestion" -msgstr "" +msgstr "Suggerimento di ricerca" #: geocoders/here.py:149 msgid "Food types: {}" -msgstr "" +msgstr "Tipi di cibo: {}" #: geocoders/here.py:156 msgid "Opening hours: {}" -msgstr "" +msgstr "Orari di apertura: {}" #: guides/foursquare.py:198 msgid "Opening hours:" @@ -42,7 +43,7 @@ #: poor/geocoder.py:112 msgid "Point from geo link" -msgstr "Punto da geo link" +msgstr "Punto da GeoLink" #: poor/geocoder.py:124 msgid "Point from coordinates" @@ -50,7 +51,7 @@ #: poor/geocoder.py:136 msgid "Point from Plus code" -msgstr "Punto dal codice Plus" +msgstr "Punto da Plus Codes" #: poor/geocoder.py:145 poor/geocoder.py:182 poor/guide.py:123 #: poor/router.py:136 @@ -58,7 +59,7 @@ msgstr "Connessione scaduta" #: poor/history.py:33 qml/GeocodeItem.qml:210 qml/GeocodeItem.qml:544 -#: qml/MenuPage.qml:87 qml/Navigator.qml:192 qml/NearbyPage.qml:30 +#: qml/MenuPage.qml:87 qml/Navigator.qml:214 qml/NearbyPage.qml:30 #: 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 @@ -66,85 +67,104 @@ msgid "Current position" msgstr "Posizione attuale" -#: poor/keystore.py:55 +#: poor/keystore.py:57 msgid "" "Register at <a " "href=\"https://developer.foursquare.com\">https://developer.foursquare.com</a>" " and create your own Client ID and Client Secret keys" msgstr "" +"Iscriversi a <a " +"href=\"https://developer.foursquare.com\">https://developer.foursquare.com</a>" +" e creare le proprie chiavi ID cliente e Segreto cliente." -#: poor/keystore.py:56 +#: poor/keystore.py:58 msgid "" "Register at <a href=\"https://www.mapbox.com\">https://www.mapbox.com</a> " "and create your own API key" msgstr "" +"Iscriversi a <a href=\"https://www.mapbox.com\">https://www.mapbox.com</a> e" +" creare la propria chiave API" -#: poor/keystore.py:57 +#: poor/keystore.py:59 msgid "" "Register at <a href=\"https://maptiler.com\">https://maptiler.com</a> and " "create your own API key" msgstr "" +"Iscriversi a <a href=\"https://maptiler.com\">https://maptiler.com</a> e " +"creare la propria chiave API" -#: poor/keystore.py:58 +#: poor/keystore.py:60 msgid "" "Register at <a " "href=\"https://developer.mapquest.com\">https://developer.mapquest.com</a> " "and create your own API key" msgstr "" +"Iscriversi a <a " +"href=\"https://developer.mapquest.com\">https://developer.mapquest.com</a> e" +" creare la propria chiave API" -#: poor/keystore.py:59 +#: poor/keystore.py:61 msgid "" "Register at <a " "href=\"https://opencagedata.com\">https://opencagedata.com</a> and create " "your own API key" msgstr "" +"Iscriversi a <a " +"href=\"https://opencagedata.com\">https://opencagedata.com</a> e creare la " +"propria chiave API" -#: poor/keystore.py:60 +#: poor/keystore.py:62 msgid "" "Register at <a href=\"https://stadiamaps.com\">https://stadiamaps.com</a> " "and create your own API key" msgstr "" +"Iscriversi a <a href=\"https://stadiamaps.com\">https://stadiamaps.com</a> e" +" creare la propria chiave API" -#: poor/keystore.py:61 +#: poor/keystore.py:63 msgid "" "Register at <a " "href=\"https://developer.here.com\">https://developer.here.com</a> and " "create your own App API Key" msgstr "" +"Iscriversi a <a " +"href=\"https://developer.here.com\">https://developer.here.com</a> e creare " +"la propria chiave API" -#: poor/keystore.py:65 +#: poor/keystore.py:67 msgid "Foursquare Client ID" msgstr "ID cliente Foursquare" -#: poor/keystore.py:66 +#: poor/keystore.py:68 msgid "Foursquare Client Secret" -msgstr "Foursquare client Segreto" +msgstr "Segreto cliente Foursquare" -#: poor/keystore.py:69 +#: poor/keystore.py:71 msgid "Mapbox API key" msgstr "Chiave API Mapbox" -#: poor/keystore.py:72 +#: poor/keystore.py:74 msgid "MapTiler API key" -msgstr "" +msgstr "Chiave API MapTiler" -#: poor/keystore.py:75 +#: poor/keystore.py:77 msgid "MapQuest API key" msgstr "Chiave API MapQuest" -#: poor/keystore.py:78 +#: poor/keystore.py:80 msgid "OpenCage API key" msgstr "Chiave API OpenCage" -#: poor/keystore.py:81 +#: poor/keystore.py:83 msgid "Stadia Maps API key" msgstr "Chiave API Stadia Maps" -#: poor/keystore.py:84 +#: poor/keystore.py:86 msgid "HERE API Key" -msgstr "" +msgstr "Chiave API HERE" -#: poor/keystore.py:92 +#: poor/keystore.py:94 +#, python-brace-format msgid "" "<p>Your Pure Maps installation has enabled support for HERE " "services.</p><br><p>Please consult <a href=\"https://legal.here.com/en-" @@ -153,64 +173,63 @@ " use policy</a>, and <a href=\"https://legal.here.com/en-gb/privacy\">HERE " "Privacy policies</a>. In context of use of HERE and privacy policy, Pure " "Maps communicates with HERE using REST API.<p></br><p>For <a " -"href=\"https://knowledge.here.com/csm_kb?id=public_kb_csm_details&number=KB0016412\">legal" -" reasons</a>, Pure Maps enables HERE search and routing in a dedicated " -"\"HERE Online\" profile only. While not active anymore, see acceptable use " -"policy of 2018 for details regarding use of HERE together with other "
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.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: 2022-08-21 11:41+0300\n" +"POT-Creation-Date: 2023-01-24 22:19+0200\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" @@ -134,26 +134,26 @@ msgstr "" #: poor/keystore.py:94 +#, python-brace-format msgid "" "<p>Your Pure Maps installation has enabled support for HERE services.</" "p><br><p>Please consult <a href=\"https://legal.here.com/en-gb/terms/here-" "end-user-terms\">end-user terms</a>, <a href=\"https://legal.here.com/en-gb/" -"terms/acceptable-use-policy\">acceptable use policy</a>, and <a href=" -"\"https://legal.here.com/en-gb/privacy\">HERE Privacy policies</a>. In " +"terms/acceptable-use-policy\">acceptable use policy</a>, and <a " +"href=\"https://legal.here.com/en-gb/privacy\">HERE Privacy policies</a>. In " "context of use of HERE and privacy policy, Pure Maps communicates with HERE " -"using REST API.<p></br><p>For <a href=\"https://knowledge.here.com/csm_kb?" -"id=public_kb_csm_details&number=KB0016412\">legal reasons</a>, Pure Maps " -"enables HERE search and routing in a dedicated \"HERE Online\" profile only. " -"While not active anymore, see acceptable use policy of 2018 for details " -"regarding use of HERE together with other providers under <a href=\"https://" -"legal.here.com/en-gb/terms/acceptable-use-policy-2018\">Layering and " -"Modifications</a> section of the document.</p><br><p>Please either accept " -"the terms and the policy or decline them. If declined, HERE support will be " -"inactive and can be enabled later by accepting the terms in Preferences " -"under Licenses.</p>" +"using REST API.<p></br><p>For <a href=\"{lruri}\">legal reasons</a>, Pure " +"Maps enables HERE search and routing in a dedicated \"HERE Online\" profile " +"only. While not active anymore, see acceptable use policy of 2018 for " +"details regarding use of HERE together with other providers under <a " +"href=\"https://legal.here.com/en-gb/terms/acceptable-use-" +"policy-2018\">Layering and Modifications</a> section of the document.</" +"p><br><p>Please either accept the terms and the policy or decline them. If " +"declined, HERE support will be inactive and can be enabled later by " +"accepting the terms in Preferences under Licenses.</p>" msgstr "" -#: poor/keystore.py:108 +#: poor/keystore.py:109 msgid "HERE End-User Terms" msgstr "" @@ -493,8 +493,8 @@ #: qml/AboutPage.qml:150 msgid "" -"Translations at <a href=\"https://www.transifex.com/rinigus/pure-maps" -"\">Transifex page</a>" +"Translations at <a href=\"https://www.transifex.com/rinigus/pure-" +"maps\">Transifex page</a>" msgstr "" #: qml/AttributionPage.qml:24 @@ -508,7 +508,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:135 qml/PreferencesPage.qml:826 +#: qml/PoiPage.qml:135 qml/PreferencesPage.qml:828 msgid "Search" msgstr "" @@ -517,7 +517,7 @@ msgstr "" #: qml/AttributionPage.qml:119 qml/MenuPage.qml:60 qml/NavigationPage.qml:27 -#: qml/PreferencesPage.qml:481 qml/RoutePage.qml:25 +#: qml/PreferencesPage.qml:483 qml/RoutePage.qml:25 msgid "Navigation" msgstr "" @@ -572,14 +572,14 @@ msgid "Transport" msgstr "" -#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:461 qml/RoutePage.qml:644 +#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:463 qml/RoutePage.qml:644 #: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53 #: routers/here_settings.qml:37 routers/mapquest_open_settings.qml:29 #: routers/ValhallaSettings.qml:38 msgid "Bicycle" msgstr "" -#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:461 qml/RoutePage.qml:644 +#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:463 qml/RoutePage.qml:644 #: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53 #: routers/here_settings.qml:37 routers/mapquest_open_settings.qml:29 #: routers/ValhallaSettings.qml:38 @@ -738,17 +738,6 @@ msgid "Language" msgstr "" -#: qml/LanguageSelector.qml:43 qml/PreferencesPage.qml:71 -#: qml/PreferencesPage.qml:943 -msgid "English" -msgstr "" - -#: qml/LanguageSelector.qml:44 routers/gpx_osmscout_settings.qml:84 -#: routers/here_settings.qml:83 routers/mapquest_open_settings.qml:59 -#: routers/ValhallaSettings.qml:67 -msgid "English (United States)" -msgstr "" - #: qml/LicensePage.qml:25 msgid "Accept" msgstr "" @@ -824,20 +813,20 @@ msgid "Stop navigation to select POI" msgstr "" -#: qml/Map.qml:647 qml/NavigationPage.qml:207 qml/PoiBlock.qml:254 +#: qml/Map.qml:650 qml/NavigationPage.qml:207 qml/PoiBlock.qml:254 #: qml/RoutePage.qml:173 msgid "Origin" msgstr "" -#: qml/Map.qml:649 qml/NavigationPage.qml:210 qml/PoiBlock.qml:274 +#: qml/Map.qml:652 qml/NavigationPage.qml:210 qml/PoiBlock.qml:274 msgid "Final destination" msgstr "" -#: qml/Map.qml:651 +#: qml/Map.qml:654 msgid "✓" msgstr "" -#: qml/Map.qml:654 +#: qml/Map.qml:657 msgid "#%1" msgstr "" @@ -932,7 +921,7 @@ msgid "Pause" msgstr "" -#: qml/NavigationPage.qml:46 qml/PreferencesPage.qml:835 qml/RoutePage.qml:67 +#: qml/NavigationPage.qml:46 qml/PreferencesPage.qml:837 qml/RoutePage.qml:67 msgid "Navigate" msgstr "" @@ -1347,183 +1336,195 @@ msgstr "" #: qml/PreferencesPage.qml:62 -msgid "Local" +msgid "Map default" msgstr "" #: qml/PreferencesPage.qml:63 +msgid "Local" +msgstr "" + +#: qml/PreferencesPage.qml:64 +msgid "International" +msgstr "" + +#: qml/PreferencesPage.qml:65 msgid "Arabic" msgstr "" -#: qml/PreferencesPage.qml:64 routers/here_settings.qml:66 +#: qml/PreferencesPage.qml:66 routers/here_settings.qml:66 msgid "Basque" msgstr "" -#: qml/PreferencesPage.qml:65 qml/PreferencesPage.qml:944 +#: qml/PreferencesPage.qml:67 qml/PreferencesPage.qml:946 #: routers/here_settings.qml:72 msgid "Catalan" msgstr "" -#: qml/PreferencesPage.qml:66 +#: qml/PreferencesPage.qml:68 msgid "Chinese (simplified)" msgstr "" -#: qml/PreferencesPage.qml:67 +#: qml/PreferencesPage.qml:69 msgid "Chinese (traditional)" msgstr "" -#: qml/PreferencesPage.qml:68 qml/PreferencesPage.qml:945 +#: qml/PreferencesPage.qml:70 qml/PreferencesPage.qml:947 msgid "Czech" msgstr "" -#: qml/PreferencesPage.qml:69 +#: qml/PreferencesPage.qml:71 msgid "Danish" msgstr "" -#: qml/PreferencesPage.qml:70 +#: qml/PreferencesPage.qml:72
[-] [+]	Added	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/po/ro.po ^
@@ -0,0 +1,3092 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +# Translators: +# liberi liberi <trfex.mtqx8@slmail.me>, 2022 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-01-24 22:19+0200\n" +"PO-Revision-Date: 2018-08-22 13:49+0000\n" +"Last-Translator: liberi liberi <trfex.mtqx8@slmail.me>, 2022\n" +"Language-Team: Romanian (https://www.transifex.com/rinigus/teams/89597/ro/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ro\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)\|\|((n%100==0)&&(n!=0)))?2:1));\n" + +#: geocoders/here.py:141 +msgid "Search suggestion" +msgstr "Sugestie de căutare" + +#: geocoders/here.py:149 +msgid "Food types: {}" +msgstr "Tipuri de mâncare: {}" + +#: geocoders/here.py:156 +msgid "Opening hours: {}" +msgstr "Orar: {}" + +#: guides/foursquare.py:198 +msgid "Opening hours:" +msgstr "Orar:" + +#: poor/geocoder.py:112 +msgid "Point from geo link" +msgstr "Punct de la GeoLink" + +#: poor/geocoder.py:124 +msgid "Point from coordinates" +msgstr "Punct din coordonate" + +#: poor/geocoder.py:136 +msgid "Point from Plus code" +msgstr "Punct de la Plus Codes" + +#: poor/geocoder.py:145 poor/geocoder.py:182 poor/guide.py:123 +#: poor/router.py:136 +msgid "Connection timed out" +msgstr "Conexiunea a expirat" + +#: poor/history.py:33 qml/GeocodeItem.qml:210 qml/GeocodeItem.qml:544 +#: qml/MenuPage.qml:87 qml/Navigator.qml:214 qml/NearbyPage.qml:30 +#: 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 "Poziția actuală" + +#: poor/keystore.py:57 +msgid "" +"Register at <a " +"href=\"https://developer.foursquare.com\">https://developer.foursquare.com</a>" +" and create your own Client ID and Client Secret keys" +msgstr "" +"Înscrie-te la <a " +"href=\"https://developer.foursquare.com\">https://developer.foursquare.com</a>și" +" creează-ți ID-ul și secretul de Client" + +#: poor/keystore.py:58 +msgid "" +"Register at <a href=\"https://www.mapbox.com\">https://www.mapbox.com</a> " +"and create your own API key" +msgstr "" +"Înscrie-te la <a href=\"https://www.mapbox.com\">https://www.mapbox.com</a> " +"și creează-ți propriul cod API" + +#: poor/keystore.py:59 +msgid "" +"Register at <a href=\"https://maptiler.com\">https://maptiler.com</a> and " +"create your own API key" +msgstr "" +"Înscrie-te la <a href=\"https://maptiler.com\">https://maptiler.com</a> și " +"creează-ți propriul cod API" + +#: poor/keystore.py:60 +msgid "" +"Register at <a " +"href=\"https://developer.mapquest.com\">https://developer.mapquest.com</a> " +"and create your own API key" +msgstr "" +"Înscrie-te la <a " +"href=\"https://developer.mapquest.com\">https://developer.mapquest.com</a> " +"și creează-ți propriul cod API" + +#: poor/keystore.py:61 +msgid "" +"Register at <a " +"href=\"https://opencagedata.com\">https://opencagedata.com</a> and create " +"your own API key" +msgstr "" +"Înscrie-te la <a " +"href=\"https://opencagedata.com\">https://opencagedata.com</a> și creează-ți" +" propriul cod API" + +#: poor/keystore.py:62 +msgid "" +"Register at <a href=\"https://stadiamaps.com\">https://stadiamaps.com</a> " +"and create your own API key" +msgstr "" +"Înscrie-te la <a href=\"https://stadiamaps.com\">https://stadiamaps.com</a> " +"și creează-ți propriul cod API" + +#: poor/keystore.py:63 +msgid "" +"Register at <a " +"href=\"https://developer.here.com\">https://developer.here.com</a> and " +"create your own App API Key" +msgstr "" +"Înscrie-te la <a " +"href=\"https://developer.here.com\">https://developer.here.com</a> și " +"creează-ți propriul cod API" + +#: poor/keystore.py:67 +msgid "Foursquare Client ID" +msgstr "ID de client Foursquare" + +#: poor/keystore.py:68 +msgid "Foursquare Client Secret" +msgstr "Secret de client Foursquare" + +#: poor/keystore.py:71 +msgid "Mapbox API key" +msgstr "Cod API Mapbox" + +#: poor/keystore.py:74 +msgid "MapTiler API key" +msgstr "Cod API MapTiler" + +#: poor/keystore.py:77 +msgid "MapQuest API key" +msgstr "Cod API MapQuest" + +#: poor/keystore.py:80 +msgid "OpenCage API key" +msgstr "Cod API OpenCage" + +#: poor/keystore.py:83 +msgid "Stadia Maps API key" +msgstr "Cod API Stadia Maps" + +#: poor/keystore.py:86 +msgid "HERE API Key" +msgstr "Cod API HERE" + +#: poor/keystore.py:94 +#, python-brace-format +msgid "" +"<p>Your Pure Maps installation has enabled support for HERE " +"services.</p><br><p>Please consult <a href=\"https://legal.here.com/en-" +"gb/terms/here-end-user-terms\">end-user terms</a>, <a " +"href=\"https://legal.here.com/en-gb/terms/acceptable-use-policy\">acceptable" +" use policy</a>, and <a href=\"https://legal.here.com/en-gb/privacy\">HERE " +"Privacy policies</a>. In context of use of HERE and privacy policy, Pure " +"Maps communicates with HERE using REST API.<p></br><p>For <a " +"href=\"{lruri}\">legal reasons</a>, Pure Maps enables HERE search and " +"routing in a dedicated \"HERE Online\" profile only. While not active " +"anymore, see acceptable use policy of 2018 for details regarding use of HERE" +" together with other providers under <a href=\"https://legal.here.com/en-" +"gb/terms/acceptable-use-policy-2018\">Layering and Modifications</a> section" +" of the document.</p><br><p>Please either accept the terms and the policy or" +" decline them. If declined, HERE support will be inactive and can be enabled" +" later by accepting the terms in Preferences under Licenses.</p>" +msgstr "" + +#: poor/keystore.py:109 +msgid "HERE End-User Terms" +msgstr "Condiții pentru utilizarea HERE" + +#: poor/router.py:104 poor/router.py:106 +msgid "Exit: " +msgstr "Ieșire: " + +#: poor/util.py:227 poor/util.py:238 src/navigator.cpp:1002 +#: src/navigator.cpp:1014 +msgid "mi" +msgstr "mi" + +#: poor/util.py:227 poor/util.py:238 src/navigator.cpp:1002 +#: src/navigator.cpp:1014 +msgid "miles" +msgstr "mile" +
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/po/ru.po ^
@@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-08-21 11:41+0300\n" +"POT-Creation-Date: 2023-01-24 22:19+0200\n" "PO-Revision-Date: 2018-08-22 13:49+0000\n" "Last-Translator: Alex UBports, 2022\n" "Language-Team: Russian (https://www.transifex.com/rinigus/teams/89597/ru/)\n" @@ -166,6 +166,7 @@ msgstr "Ключ API HERE" #: poor/keystore.py:94 +#, python-brace-format msgid "" "<p>Your Pure Maps installation has enabled support for HERE " "services.</p><br><p>Please consult <a href=\"https://legal.here.com/en-" @@ -174,38 +175,17 @@ " use policy</a>, and <a href=\"https://legal.here.com/en-gb/privacy\">HERE " "Privacy policies</a>. In context of use of HERE and privacy policy, Pure " "Maps communicates with HERE using REST API.<p></br><p>For <a " -"href=\"https://knowledge.here.com/csm_kb?id=public_kb_csm_details&number=KB0016412\">legal" -" reasons</a>, Pure Maps enables HERE search and routing in a dedicated " -"\"HERE Online\" profile only. While not active anymore, see acceptable use " -"policy of 2018 for details regarding use of HERE together with other " -"providers under <a href=\"https://legal.here.com/en-gb/terms/acceptable-use-" -"policy-2018\">Layering and Modifications</a> section of the " -"document.</p><br><p>Please either accept the terms and the policy or decline" -" them. If declined, HERE support will be inactive and can be enabled later " -"by accepting the terms in Preferences under Licenses.</p>" -msgstr "" -"<p>Установленная версия Pure Maps имеет поддержку сервисов " -"HERE.</p><br><p>Ознакомьтесь, пожалуйста, <a " -"href=\"https://legal.here.com/en-gb/terms/here-end-user-terms\">с клиентским" -" договором</a>, <a href=\"https://legal.here.com/en-gb/terms/acceptable-use-" -"policy\">политикой допустимого использования</a>, и <a " -"href=\"https://legal.here.com/en-gb/privacy\">политикой конфиденциальности " -"HERE</a>. В рамках использования сервиса HERE приложение Pure Maps соблюдает" -" политику конфиденциальности и обменивается данными с HERE применяя REST " -"API.<p></br><p>По <a " -"href=\"https://knowledge.here.com/csm_kb?id=public_kb_csm_details&number=KB0016412\">юридическим" -" причинам</a> Pure Maps включает поиск и прокладку маршрутов с помощью HERE " -"только в специальном профиле настройки \"HERE Online\". Подробности " -"использования HERE совместно с другими поставщиками данных можно узнать из " -"политики допустимого использования от 2018 в разделе <a " -"href=\"https://legal.here.com/en-gb/terms/acceptable-use-" -"policy-2018\">Layering and Modifications</a>, несмотря на того, что эта " -"версия документа уже не применяется.</p><br><p>Вы должны принять условия и " -"политику или отклонить их. В случае отказа поддержка HERE будет отключена. " -"Включить ее позже можно приняв условия в разделе Лицензии меню " -"Настройка.</p>" +"href=\"{lruri}\">legal reasons</a>, Pure Maps enables HERE search and " +"routing in a dedicated \"HERE Online\" profile only. While not active " +"anymore, see acceptable use policy of 2018 for details regarding use of HERE" +" together with other providers under <a href=\"https://legal.here.com/en-" +"gb/terms/acceptable-use-policy-2018\">Layering and Modifications</a> section" +" of the document.</p><br><p>Please either accept the terms and the policy or" +" decline them. If declined, HERE support will be inactive and can be enabled" +" later by accepting the terms in Preferences under Licenses.</p>" +msgstr "" -#: poor/keystore.py:108 +#: poor/keystore.py:109 msgid "HERE End-User Terms" msgstr "Условия клиентского договора HERE" @@ -575,7 +555,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:135 qml/PreferencesPage.qml:826 +#: qml/PoiPage.qml:135 qml/PreferencesPage.qml:828 msgid "Search" msgstr "Поиск" @@ -584,7 +564,7 @@ msgstr "Заведения" #: qml/AttributionPage.qml:119 qml/MenuPage.qml:60 qml/NavigationPage.qml:27 -#: qml/PreferencesPage.qml:481 qml/RoutePage.qml:25 +#: qml/PreferencesPage.qml:483 qml/RoutePage.qml:25 msgid "Navigation" msgstr "Навигация" @@ -639,14 +619,14 @@ msgid "Transport" msgstr "Транспорт" -#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:461 qml/RoutePage.qml:644 +#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:463 qml/RoutePage.qml:644 #: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53 #: routers/here_settings.qml:37 routers/mapquest_open_settings.qml:29 #: routers/ValhallaSettings.qml:38 msgid "Bicycle" msgstr "Велосипед" -#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:461 qml/RoutePage.qml:644 +#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:463 qml/RoutePage.qml:644 #: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53 #: routers/here_settings.qml:37 routers/mapquest_open_settings.qml:29 #: routers/ValhallaSettings.qml:38 @@ -810,17 +790,6 @@ msgid "Language" msgstr "Язык" -#: qml/LanguageSelector.qml:43 qml/PreferencesPage.qml:71 -#: qml/PreferencesPage.qml:943 -msgid "English" -msgstr "Английский" - -#: qml/LanguageSelector.qml:44 routers/gpx_osmscout_settings.qml:84 -#: routers/here_settings.qml:83 routers/mapquest_open_settings.qml:59 -#: routers/ValhallaSettings.qml:67 -msgid "English (United States)" -msgstr "английский (Соединенные Штаты)" - #: qml/LicensePage.qml:25 msgid "Accept" msgstr "Принять" @@ -904,20 +873,20 @@ msgid "Stop navigation to select POI" msgstr "Остановить навигацию для выбора точек интереса" -#: qml/Map.qml:647 qml/NavigationPage.qml:207 qml/PoiBlock.qml:254 +#: qml/Map.qml:650 qml/NavigationPage.qml:207 qml/PoiBlock.qml:254 #: qml/RoutePage.qml:173 msgid "Origin" msgstr "Пункт отправления" -#: qml/Map.qml:649 qml/NavigationPage.qml:210 qml/PoiBlock.qml:274 +#: qml/Map.qml:652 qml/NavigationPage.qml:210 qml/PoiBlock.qml:274 msgid "Final destination" msgstr "Конечный пункт" -#: qml/Map.qml:651 +#: qml/Map.qml:654 msgid "✓" msgstr "✓" -#: qml/Map.qml:654 +#: qml/Map.qml:657 msgid "#%1" msgstr "#%1" @@ -1012,7 +981,7 @@ msgid "Pause" msgstr "Пауза" -#: qml/NavigationPage.qml:46 qml/PreferencesPage.qml:835 qml/RoutePage.qml:67 +#: qml/NavigationPage.qml:46 qml/PreferencesPage.qml:837 qml/RoutePage.qml:67 msgid "Navigate" msgstr "Прокладка маршрута" @@ -1430,143 +1399,155 @@ msgstr "Предпочитаемый язык карты." #: qml/PreferencesPage.qml:62 +msgid "Map default" +msgstr "" + +#: qml/PreferencesPage.qml:63 msgid "Local" msgstr "Местный" -#: qml/PreferencesPage.qml:63 +#: qml/PreferencesPage.qml:64 +msgid "International" +msgstr "" + +#: qml/PreferencesPage.qml:65 msgid "Arabic" msgstr "Арабский" -#: qml/PreferencesPage.qml:64 routers/here_settings.qml:66 +#: qml/PreferencesPage.qml:66 routers/here_settings.qml:66 msgid "Basque" msgstr "Баскский" -#: qml/PreferencesPage.qml:65 qml/PreferencesPage.qml:944 +#: qml/PreferencesPage.qml:67 qml/PreferencesPage.qml:946 #: routers/here_settings.qml:72 msgid "Catalan" msgstr "Каталонский" -#: qml/PreferencesPage.qml:66 +#: qml/PreferencesPage.qml:68 msgid "Chinese (simplified)" msgstr "Китайский (упрощенный)" -#: qml/PreferencesPage.qml:67 +#: qml/PreferencesPage.qml:69 msgid "Chinese (traditional)" msgstr "Китайский (традиционный)" -#: qml/PreferencesPage.qml:68 qml/PreferencesPage.qml:945 +#: qml/PreferencesPage.qml:70 qml/PreferencesPage.qml:947 msgid "Czech" msgstr "Чешский" -#: qml/PreferencesPage.qml:69
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/po/sk_SK.po ^
@@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-08-21 11:41+0300\n" +"POT-Creation-Date: 2023-01-24 22:19+0200\n" "PO-Revision-Date: 2018-08-22 13:49+0000\n" "Last-Translator: Ladislav Hodas <ladislav@hodas.sk>, 2022\n" "Language-Team: Slovak (Slovakia) (https://www.transifex.com/rinigus/teams/89597/sk_SK/)\n" @@ -163,6 +163,7 @@ msgstr "Kľúč HERE API" #: poor/keystore.py:94 +#, python-brace-format msgid "" "<p>Your Pure Maps installation has enabled support for HERE " "services.</p><br><p>Please consult <a href=\"https://legal.here.com/en-" @@ -171,20 +172,17 @@ " use policy</a>, and <a href=\"https://legal.here.com/en-gb/privacy\">HERE " "Privacy policies</a>. In context of use of HERE and privacy policy, Pure " "Maps communicates with HERE using REST API.<p></br><p>For <a " -"href=\"https://knowledge.here.com/csm_kb?id=public_kb_csm_details&number=KB0016412\">legal" -" reasons</a>, Pure Maps enables HERE search and routing in a dedicated " -"\"HERE Online\" profile only. While not active anymore, see acceptable use " -"policy of 2018 for details regarding use of HERE together with other " -"providers under <a href=\"https://legal.here.com/en-gb/terms/acceptable-use-" -"policy-2018\">Layering and Modifications</a> section of the " -"document.</p><br><p>Please either accept the terms and the policy or decline" -" them. If declined, HERE support will be inactive and can be enabled later " -"by accepting the terms in Preferences under Licenses.</p>" +"href=\"{lruri}\">legal reasons</a>, Pure Maps enables HERE search and " +"routing in a dedicated \"HERE Online\" profile only. While not active " +"anymore, see acceptable use policy of 2018 for details regarding use of HERE" +" together with other providers under <a href=\"https://legal.here.com/en-" +"gb/terms/acceptable-use-policy-2018\">Layering and Modifications</a> section" +" of the document.</p><br><p>Please either accept the terms and the policy or" +" decline them. If declined, HERE support will be inactive and can be enabled" +" later by accepting the terms in Preferences under Licenses.</p>" msgstr "" -"<p>Vaša inštalácia Pure Maps umožňuje podporu pre služby HERE.</p><br><p>Prečítajte, prosím <a href=\"https://legal.here.com/en-gb/terms/here-end-user-terms\">podmienky pre koncového používateľa</a>, <a href=\"https://legal.here.com/en-gb/terms/acceptable-use-policy\">prijateľné zásady používania</a>, a <a href=\"https://legal.here.com/en-gb/privacy\">zásady ochrany osobných údajov HERE</a>. V kontexte používania HERE a zásad ochrany osobných údajov Pure Maps komunikuje s HERE pomocou REST API.<p></br><p>Na základe <a href=\"https://knowledge.here.com/csm_kb?id=public_kb_csm_details&number=KB0016412\">zákonných dôvodov</a>, Pure Maps povolia vyhľadávanie a smerovanie HERE iba vo vyhradenom profile \"HERE Online\". Ak už nie je aktívny, pozrite si pravidlá prijateľného používania z roku 2018, kde nájdete podrobnosti týkajúce sa používania HERE spolu s ďalšími poskytovateľmi v <a href=\"https://legal.here.com/en-gb/terms/acceptable-use-policy-2018\">sekcii dokumentu Layering and Modifications</a>.</p><br><p>Prijmite podmienky a zásady alebo ich odmietnite.  " -"V prípade odmietnutia bude podpora HERE neaktívna a možno ju povoliť neskôr prijatím podmienok v Predvoľbách v časti Licencie.</p>" -#: poor/keystore.py:108 +#: poor/keystore.py:109 msgid "HERE End-User Terms" msgstr "Podmienky pre koncového používateľa HERE" @@ -288,11 +286,11 @@ #: poor/util.py:383 msgid "API key missing" -msgstr "" +msgstr "Chýba kľúč pre AP" #: poor/util.py:385 msgid "Available" -msgstr "" +msgstr "Dostupné" #: routers/here.py:319 #, python-brace-format @@ -554,7 +552,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:135 qml/PreferencesPage.qml:826 +#: qml/PoiPage.qml:135 qml/PreferencesPage.qml:828 msgid "Search" msgstr "Hľadať" @@ -563,7 +561,7 @@ msgstr "Miesta" #: qml/AttributionPage.qml:119 qml/MenuPage.qml:60 qml/NavigationPage.qml:27 -#: qml/PreferencesPage.qml:481 qml/RoutePage.qml:25 +#: qml/PreferencesPage.qml:483 qml/RoutePage.qml:25 msgid "Navigation" msgstr "Navigácia" @@ -618,14 +616,14 @@ msgid "Transport" msgstr "Doprava" -#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:461 qml/RoutePage.qml:644 +#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:463 qml/RoutePage.qml:644 #: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53 #: routers/here_settings.qml:37 routers/mapquest_open_settings.qml:29 #: routers/ValhallaSettings.qml:38 msgid "Bicycle" msgstr "Bicykel" -#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:461 qml/RoutePage.qml:644 +#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:463 qml/RoutePage.qml:644 #: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53 #: routers/here_settings.qml:37 routers/mapquest_open_settings.qml:29 #: routers/ValhallaSettings.qml:38 @@ -654,11 +652,11 @@ #: qml/BasemapPage.qml:49 msgid "%1 (default, disabled, API key missing)" -msgstr "" +msgstr "%1 (predvolené, nedostupné, chýba kľúč pre API)" #: qml/BasemapPage.qml:50 msgid "%1 (disabled, API key missing)" -msgstr "" +msgstr "%1 (nedostupné, chýba kľúč pre API)" #: qml/BasemapPage.qml:56 msgid "Map: %1" @@ -743,7 +741,7 @@ #: qml/GeocoderPage.qml:54 qml/GuidePage.qml:55 qml/RouterPage.qml:53 msgid "%1 (disabled, %2)" -msgstr "" +msgstr "%1 (nedostupné, %2)" #: qml/InitPage.qml:34 msgid "Initializing" @@ -785,17 +783,6 @@ msgid "Language" msgstr "Jazyk" -#: qml/LanguageSelector.qml:43 qml/PreferencesPage.qml:71 -#: qml/PreferencesPage.qml:943 -msgid "English" -msgstr "Angličtina" - -#: qml/LanguageSelector.qml:44 routers/gpx_osmscout_settings.qml:84 -#: routers/here_settings.qml:83 routers/mapquest_open_settings.qml:59 -#: routers/ValhallaSettings.qml:67 -msgid "English (United States)" -msgstr "angličtina (Spojené štáty)" - #: qml/LicensePage.qml:25 msgid "Accept" msgstr "Prijať" @@ -869,7 +856,7 @@ #: qml/MapErrorPage.qml:119 qml/MenuPage.qml:129 msgid "HERE (disabled, API key missing)" -msgstr "" +msgstr "HERE (nedostupné, chýba kľúč pre API)" #: qml/MapErrorPage.qml:120 qml/MenuPage.qml:136 msgid "Mixed" @@ -879,20 +866,20 @@ msgid "Stop navigation to select POI" msgstr "Pre výber POI zastavte navigáciu" -#: qml/Map.qml:647 qml/NavigationPage.qml:207 qml/PoiBlock.qml:254 +#: qml/Map.qml:650 qml/NavigationPage.qml:207 qml/PoiBlock.qml:254 #: qml/RoutePage.qml:173 msgid "Origin" msgstr "Počiatok" -#: qml/Map.qml:649 qml/NavigationPage.qml:210 qml/PoiBlock.qml:274 +#: qml/Map.qml:652 qml/NavigationPage.qml:210 qml/PoiBlock.qml:274 msgid "Final destination" msgstr "Konečný cieľ" -#: qml/Map.qml:651 +#: qml/Map.qml:654 msgid "✓" msgstr "✓" -#: qml/Map.qml:654 +#: qml/Map.qml:657 msgid "#%1" msgstr "#%1" @@ -987,7 +974,7 @@ msgid "Pause" msgstr "Prestávka" -#: qml/NavigationPage.qml:46 qml/PreferencesPage.qml:835 qml/RoutePage.qml:67 +#: qml/NavigationPage.qml:46 qml/PreferencesPage.qml:837 qml/RoutePage.qml:67 msgid "Navigate" msgstr "Navigovať" @@ -1407,143 +1394,155 @@ msgstr "Uprednostnený jazyk mapy." #: qml/PreferencesPage.qml:62 +msgid "Map default" +msgstr "" + +#: qml/PreferencesPage.qml:63 msgid "Local" msgstr "Miestny" -#: qml/PreferencesPage.qml:63 +#: qml/PreferencesPage.qml:64 +msgid "International" +msgstr "" + +#: qml/PreferencesPage.qml:65 msgid "Arabic" msgstr "Arabština"
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/po/sv.po ^
@@ -5,16 +5,16 @@ # # Translators: # rinigus github, 2021 -# Åke Engelbrektson, 2022 +# Åke Engelbrektson, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-08-21 11:41+0300\n" +"POT-Creation-Date: 2023-01-24 22:19+0200\n" "PO-Revision-Date: 2018-08-22 13:49+0000\n" -"Last-Translator: Åke Engelbrektson, 2022\n" +"Last-Translator: Åke Engelbrektson, 2023\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" @@ -162,6 +162,7 @@ msgstr "HERE API-nyckel" #: poor/keystore.py:94 +#, python-brace-format msgid "" "<p>Your Pure Maps installation has enabled support for HERE " "services.</p><br><p>Please consult <a href=\"https://legal.here.com/en-" @@ -170,15 +171,14 @@ " use policy</a>, and <a href=\"https://legal.here.com/en-gb/privacy\">HERE " "Privacy policies</a>. In context of use of HERE and privacy policy, Pure " "Maps communicates with HERE using REST API.<p></br><p>For <a " -"href=\"https://knowledge.here.com/csm_kb?id=public_kb_csm_details&number=KB0016412\">legal" -" reasons</a>, Pure Maps enables HERE search and routing in a dedicated " -"\"HERE Online\" profile only. While not active anymore, see acceptable use " -"policy of 2018 for details regarding use of HERE together with other " -"providers under <a href=\"https://legal.here.com/en-gb/terms/acceptable-use-" -"policy-2018\">Layering and Modifications</a> section of the " -"document.</p><br><p>Please either accept the terms and the policy or decline" -" them. If declined, HERE support will be inactive and can be enabled later " -"by accepting the terms in Preferences under Licenses.</p>" +"href=\"{lruri}\">legal reasons</a>, Pure Maps enables HERE search and " +"routing in a dedicated \"HERE Online\" profile only. While not active " +"anymore, see acceptable use policy of 2018 for details regarding use of HERE" +" together with other providers under <a href=\"https://legal.here.com/en-" +"gb/terms/acceptable-use-policy-2018\">Layering and Modifications</a> section" +" of the document.</p><br><p>Please either accept the terms and the policy or" +" decline them. If declined, HERE support will be inactive and can be enabled" +" later by accepting the terms in Preferences under Licenses.</p>" msgstr "" "<p>Din Pure Maps-installation har aktiverat stöd för HERE-" "tjänster.</p><br><p> Se <a href=\"https://legal.here.com/en-gb/terms/here-" @@ -186,19 +186,17 @@ "gb/terms/acceptable-use-policy\">policy för godtagbar användning</a> och <a " "href=\"https://legal.here.com/en-gb/privacy\">HERE sekretesspolicy</a>. I " "samband med användning av HERE och integritetspolicy kommunicerar Pure Maps " -"med HERE via REST API.<p></br><p> Av <a " -"href=\"https://knowledge.here.com/csm_kb?id=public_kb_csm_details&number=KB0016412\">juridiska" -" skäl</a> möjliggör Pure Maps HERE-sökning och ruttberäkning i en dedikerad " -"\"HERE Online-profil\". Vid inaktiv, se policyn för godtagbar användning " -"från 2018 för detaljerad info om användning av HERE tillsammans med andra " -"leverantörer under avsnittet <a href=\"https://legal.here.com/en-" -"gb/terms/acceptable-use-policy-2018\">Lager och ändringar</a> i " -"dokumentet.</p><br><p> Vänligen acceptera antingen villkoren och policyn " -"eller avvisa dem. Om det avvisas kommer HERE-supporten att vara inaktiv och " -"kan aktiveras senare genom att acceptera villkoren i Inställningar under " -"Licenser.</p>" +"med HERE via REST API.<p></br><p> Av <a href=\"{lruri}\">juridiska skäl</a> " +"möjliggör Pure Maps HERE-sökning och ruttberäkning i en dedikerad \"HERE " +"Online-profil\". Vid inaktiv, se policyn för godtagbar användning från 2018 " +"för detaljerad info om användning av HERE tillsammans med andra leverantörer" +" under avsnittet <a href=\"https://legal.here.com/en-gb/terms/acceptable-" +"use-policy-2018\">Lager och ändringar</a> i dokumentet.</p><br><p> Vänligen " +"acceptera antingen villkoren och policyn eller avvisa dem. Om det avvisas " +"kommer HERE-supporten att vara inaktiv och kan aktiveras senare genom att " +"acceptera villkoren i Inställningar under Licenser.</p>" -#: poor/keystore.py:108 +#: poor/keystore.py:109 msgid "HERE End-User Terms" msgstr "HERE slutanvändaravtal" @@ -302,11 +300,11 @@ #: poor/util.py:383 msgid "API key missing" -msgstr "" +msgstr "API-nyckel saknas" #: poor/util.py:385 msgid "Available" -msgstr "" +msgstr "Tillgänglig" #: routers/here.py:319 #, python-brace-format @@ -568,7 +566,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:135 qml/PreferencesPage.qml:826 +#: qml/PoiPage.qml:135 qml/PreferencesPage.qml:828 msgid "Search" msgstr "Sök" @@ -577,7 +575,7 @@ msgstr "Platser" #: qml/AttributionPage.qml:119 qml/MenuPage.qml:60 qml/NavigationPage.qml:27 -#: qml/PreferencesPage.qml:481 qml/RoutePage.qml:25 +#: qml/PreferencesPage.qml:483 qml/RoutePage.qml:25 msgid "Navigation" msgstr "Navigation" @@ -632,14 +630,14 @@ msgid "Transport" msgstr "Transport" -#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:461 qml/RoutePage.qml:644 +#: qml/BasemapButton.qml:318 qml/PreferencesPage.qml:463 qml/RoutePage.qml:644 #: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53 #: routers/here_settings.qml:37 routers/mapquest_open_settings.qml:29 #: routers/ValhallaSettings.qml:38 msgid "Bicycle" msgstr "Cykel" -#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:461 qml/RoutePage.qml:644 +#: qml/BasemapButton.qml:319 qml/PreferencesPage.qml:463 qml/RoutePage.qml:644 #: routers/gpx_osmscout_settings.qml:55 routers/gpx_settings.qml:53 #: routers/here_settings.qml:37 routers/mapquest_open_settings.qml:29 #: routers/ValhallaSettings.qml:38 @@ -668,11 +666,11 @@ #: qml/BasemapPage.qml:49 msgid "%1 (default, disabled, API key missing)" -msgstr "" +msgstr "%1 (standard, inaktiverad, API-nyckel saknas)" #: qml/BasemapPage.qml:50 msgid "%1 (disabled, API key missing)" -msgstr "" +msgstr "%1 (inaktiverad, API-nyckel saknas)" #: qml/BasemapPage.qml:56 msgid "Map: %1" @@ -757,7 +755,7 @@ #: qml/GeocoderPage.qml:54 qml/GuidePage.qml:55 qml/RouterPage.qml:53 msgid "%1 (disabled, %2)" -msgstr "" +msgstr "%1 (inaktiverad, %2)" #: qml/InitPage.qml:34 msgid "Initializing" @@ -799,17 +797,6 @@ msgid "Language" msgstr "Språk" -#: qml/LanguageSelector.qml:43 qml/PreferencesPage.qml:71 -#: qml/PreferencesPage.qml:943 -msgid "English" -msgstr "Engelska" - -#: qml/LanguageSelector.qml:44 routers/gpx_osmscout_settings.qml:84 -#: routers/here_settings.qml:83 routers/mapquest_open_settings.qml:59 -#: routers/ValhallaSettings.qml:67 -msgid "English (United States)" -msgstr "Engelska (USA)" - #: qml/LicensePage.qml:25 msgid "Accept" msgstr "Godkänn" @@ -883,7 +870,7 @@ #: qml/MapErrorPage.qml:119 qml/MenuPage.qml:129 msgid "HERE (disabled, API key missing)" -msgstr "" +msgstr "HERE (inaktiverad, API-nyckel saknas)" #: qml/MapErrorPage.qml:120 qml/MenuPage.qml:136 msgid "Mixed" @@ -893,20 +880,20 @@ msgid "Stop navigation to select POI" msgstr "Stoppa navigeringen för att välja POI" -#: qml/Map.qml:647 qml/NavigationPage.qml:207 qml/PoiBlock.qml:254 +#: qml/Map.qml:650 qml/NavigationPage.qml:207 qml/PoiBlock.qml:254 #: qml/RoutePage.qml:173 msgid "Origin" msgstr "Ursprung" -#: qml/Map.qml:649 qml/NavigationPage.qml:210 qml/PoiBlock.qml:274 +#: qml/Map.qml:652 qml/NavigationPage.qml:210 qml/PoiBlock.qml:274 msgid "Final destination" msgstr "Slutdestination" -#: qml/Map.qml:651 +#: qml/Map.qml:654 msgid "✓" msgstr "✓"
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/poor/geocoder.py ^
@@ -63,7 +63,7 @@ """Return a list of attribution dictionaries.""" return [{"text": k, "url": v} for k, v in self._attribution.items()] - def autocomplete(self, query, x=0, y=0, center_x=0, center_y=0, params=None): + def autocomplete(self, query, x=0, y=0, center_x=0, center_y=0, zoom=16, params=None): """ Return a list of autocomplete dictionaries matching `query`. @@ -78,7 +78,7 @@ olc_isFull(query.strip())): return [] try: - results = self._provider.autocomplete(query=query, x=center_x, y=center_y, params=params) + results = self._provider.autocomplete(query=query, x=center_x, y=center_y, zoom=zoom, params=params) except Exception: print("Autocomplete failed:", file=sys.stderr) traceback.print_exc() @@ -93,7 +93,7 @@ bearing = poor.util.calculate_bearing(x1, y1, x2, y2) return poor.util.format_distance_and_bearing(distance, bearing) - def geocode(self, query, x=0, y=0, center_x=0, center_y=0, params=None): + def geocode(self, query, x=0, y=0, center_x=0, center_y=0, zoom=16, params=None): """ Return a list of dictionaries of places matching `query`. @@ -140,7 +140,7 @@ provider=self.id)] try: - results = self._provider.geocode(query=query, x=center_x, y=center_y, params=params) + results = self._provider.geocode(query=query, x=center_x, y=center_y, zoom=zoom, params=params) except socket.timeout: return dict(error=True, message=_("Connection timed out")) except Exception:
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/poor/keystore.py ^
@@ -96,7 +96,7 @@ '<a href="https://legal.here.com/en-gb/terms/acceptable-use-policy">acceptable use policy</a>, ' 'and <a href="https://legal.here.com/en-gb/privacy">HERE Privacy policies</a>. ' 'In context of use of HERE and privacy policy, Pure Maps communicates with HERE using REST API.<p></br>' - '<p>For <a href="https://knowledge.here.com/csm_kb?id=public_kb_csm_details&number=KB0016412">legal reasons</a>, ' + '<p>For <a href="{lruri}">legal reasons</a>, ' 'Pure Maps enables HERE search and routing in a dedicated "HERE Online" profile only. ' 'While not active anymore, see acceptable use policy of 2018 for details regarding ' 'use of HERE together with other providers under ' @@ -105,7 +105,8 @@ '<p>Please either accept the terms and the policy or decline them. If declined, ' 'HERE support will be inactive and ' 'can be enabled later by accepting the terms in Preferences under Licenses.</p>' - ), _('HERE End-User Terms')) + ).format(lruri="https://knowledge.here.com/csm_kb?id=public_kb_csm_details&number=KB0017825"), + _('HERE End-User Terms')) } class KeyStore:
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/poor/map.py ^
@@ -31,6 +31,10 @@ """Map data and style source.""" + KEY_INT = "int" + KEY_LOCAL = "local" + KEY_MAP_DEFAULT = "map default" + def __new__(cls, id, values=None): """Return possibly existing instance for `id`.""" if not hasattr(cls, "_instances"): @@ -52,7 +56,7 @@ self.format = values["format"] self.keys = values.get("keys", []) self.fingerprint = values.get("fingerprint", {}) - self.lang = values.get("lang", "local") + self.lang = values.get("lang", Map.KEY_LOCAL) self.lang_key = values.get("lang_key", None) self.light = values.get("light", "day") self.logo = values.get("logo", "default") @@ -88,8 +92,9 @@ def complies(self, lang="", light="", type="", vehicle=""): """Return True if the applied restrictions are met""" return \ - (lang=='' or ((isinstance(self.lang, str) and lang==self.lang) or \ - (isinstance(self.lang, dict) and lang in self.lang))) and \ + (lang=='' or lang==Map.KEY_MAP_DEFAULT or \ + ((isinstance(self.lang, str) and lang==self.lang) or \ + (isinstance(self.lang, dict) and lang in self.lang))) and \ (light=='' or light==self.light) and \ (type=='' or type==self.type or (type=="preview" and self.type=="traffic")) and \ (vehicle=='' or self.vehicle==vehicle) @@ -102,21 +107,68 @@ path = os.path.join(poor.DATA_DIR, leaf) return poor.util.read_json(path) + def _process_style_json(self, element, replacement): + """Used to process style object recursively""" + if isinstance(element, dict): + return {k: self._process_style_json(v, replacement) for k,v in element.items()} + if isinstance(element, list) and element == ["get", self.lang_key]: + return replacement + if isinstance(element, list): + return [self._process_style_json(e, replacement) for e in element] + if isinstance(element, str): + if element == "{" + self.lang_key + "}": + return replacement + return element + def process_style(self, style, lang=None): if self.format != "mapbox-gl": return None if self.style_json_orig is None and (style is None or len(style)==0): return None + if isinstance(style, str) and self.style_json_processed != style: - import json sj = json.loads(style) for k,v in self.fingerprint.items(): if k not in sj or v != sj[k]: + print('Style has unexpected fingerprint') return None self.style_json_orig = style - if not isinstance(self.lang, dict) or self.lang_key is None or lang not in self.lang: + + if lang == Map.KEY_MAP_DEFAULT: + return self.style_json_orig + + if not isinstance(self.lang, dict) or \ + self.lang_key is None or \ + lang not in self.lang or \ + Map.KEY_LOCAL not in self.lang or \ + Map.KEY_INT not in self.lang or \ + self.lang_key == self.lang[lang]: return None - self.style_json_processed = self.style_json_orig.replace(self.lang_key, self.lang[lang]) + + if self.lang_key[0] == "{" and self.lang_key[-1] == "}": + # text based replacement, as used for older MapBox styles + self.style_json_processed = self.style_json_orig.replace(self.lang_key, self.lang[lang]) + + else: + # replacement using expressions with fallbacks + if lang == Map.KEY_LOCAL: + replacement = ["get", self.lang[Map.KEY_LOCAL]] + elif lang == Map.KEY_INT: + replacement = ["coalesce", + ["get", self.lang[Map.KEY_INT]], + ["get", self.lang[Map.KEY_LOCAL]]] + else: + replacement = ["coalesce", + ["get", self.lang[lang]], + ["get", self.lang[Map.KEY_INT]], + ["get", self.lang[Map.KEY_LOCAL]]] + sj = self._process_style_json(json.loads(self.style_json_orig), replacement) + self.style_json_processed = json.dumps(sj) + # for l in sj['layers']: + # print(l['id']) + # print() + + # with open('style.json', "w") as f: f.write(self.style_json_processed) return self.style_json_processed def style_json(self, lang=None): @@ -124,16 +176,18 @@ def process(s): if isinstance(self.lang, dict) and self.lang_key is not None: if lang in self.lang: r = self.lang[lang] - elif "local" in self.lang: r = self.lang["local"] - elif "en" in self.lang: r = self.lang["en"] + elif Map.KEY_LOCAL in self.lang: r = self.lang[Map.KEY_LOCAL] + elif Map.KEY_INT in self.lang: r = self.lang[Map.KEY_INT] else: r = self.lang.values()[0] s = s.replace(self.lang_key, r) return s if self.style_dict: return process(json.dumps(self.style_dict, ensure_ascii=False)) - glyphs = "mapbox://fonts/mapbox/{fontstack}/{range}.pbf" + glyphs = "http://fonts.openmaptiles.org/{fontstack}/{range}.pbf" if poor.conf.font_provider == "osmscout": glyphs = "http://127.0.0.1:8553/v1/mbgl/glyphs?stack={fontstack}&range={range}" + elif poor.conf.font_provider == "mapbox": + glyphs = "mapbox://fonts/mapbox/{fontstack}/{range}.pbf" elif poor.conf.font_provider == "maptiler": glyphs = "https://api.maptiler.com/fonts/{fontstack}/{range}.pbf?key=" + poor.key.maptiler_key return json.dumps({
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/poor/test/test_guide.py ^
@@ -22,7 +22,7 @@ def test___new____no(self): a = poor.Guide("foursquare") - b = poor.Guide("nominatim") + b = poor.Guide("osmscout") assert a is not b def test___new____yes(self):
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/qml/GeocodeItem.qml ^
@@ -336,8 +336,8 @@ geo._prevAutocompleteQuery = query; py.call("poor.app.geocoder.autocomplete", gps.coordinateValid ? [query, gps.coordinate.longitude, gps.coordinate.latitude, - map.center.longitude, map.center.latitude] : - [query, 0, 0, map.center.longitude, map.center.latitude], + map.center.longitude, map.center.latitude, map.zoomLevel] : + [query, 0, 0, map.center.longitude, map.center.latitude, map.zoomLevel], function(results) { if (!geo._autocompletePending) return; @@ -369,8 +369,8 @@ } py.call("poor.app.geocoder.geocode", gps.coordinateValid ? [q, gps.coordinate.longitude, gps.coordinate.latitude, - map.center.longitude, map.center.latitude] : - [q, 0, 0, map.center.longitude, map.center.latitude], + map.center.longitude, map.center.latitude, map.zoomLevel] : + [q, 0, 0, map.center.longitude, map.center.latitude, map.zoomLevel], function(results) { // skip, new search or autocomplete was started if (_searchIndex !== mySearchIndex \|\| !_searchPending) return;
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/qml/LanguageSelector.qml ^
@@ -29,29 +29,27 @@ property var languages // has to be set on construction Component.onCompleted: { - var p = []; + var s = [], p = []; for (var i=0; i < languages.length; i++) - p.push(languages[i].name); - p.sort(); + if (languages[i].no_sort) + p.push(languages[i].name); + else + s.push(languages[i].name); + s.sort(); + p = p.concat(s); 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; } ); - // } + + if (index < 0) + index = 0; + index = model.indexOf(languages[index].name); comboBox.currentIndex = index; }
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/qml/Map.qml ^
@@ -375,6 +375,7 @@ map.setLayoutProperty(map.layers.pois, "text-anchor", "top"); map.setLayoutProperty(map.layers.pois, "text-field", "{name}"); map.setLayoutProperty(map.layers.pois, "text-optional", true); + map.setLayoutProperty(map.layers.pois, "text-font", '["Open Sans Regular"]'); map.setLayoutProperty(map.layers.pois, "text-size", 12); map.setPaintProperty(map.layers.pois, "text-color", styler.itemFg); map.setPaintProperty(map.layers.pois, "text-halo-color", styler.itemBg); @@ -387,6 +388,7 @@ map.setLayoutProperty(map.layers.poisBookmarked, "text-anchor", "top"); map.setLayoutProperty(map.layers.poisBookmarked, "text-field", "{name}"); map.setLayoutProperty(map.layers.poisBookmarked, "text-optional", true); + map.setLayoutProperty(map.layers.poisBookmarked, "text-font", '["Open Sans Regular"]'); map.setLayoutProperty(map.layers.poisBookmarked, "text-size", 12); map.setPaintProperty(map.layers.poisBookmarked, "text-color", styler.itemFg); map.setPaintProperty(map.layers.poisBookmarked, "text-halo-color", styler.itemBg); @@ -429,6 +431,7 @@ map.setLayoutProperty(map.layers.locations, "text-anchor", "top"); map.setLayoutProperty(map.layers.locations, "text-field", "{name}"); map.setLayoutProperty(map.layers.locations, "text-optional", true); + map.setLayoutProperty(map.layers.locations, "text-font", '["Open Sans Regular"]'); map.setLayoutProperty(map.layers.locations, "text-size", 12); map.setPaintProperty(map.layers.locations, "text-color", styler.itemFg); map.setPaintProperty(map.layers.locations, "text-halo-color", styler.itemBg); @@ -707,10 +710,10 @@ function updateRoute() { // Update route polyline on the map. - if (app.navigator && app.navigator.route) + if (app.navigator && app.navigator.route && app.navigator.route.length > 0) map.updateSourceLine(map.sources.route, app.navigator.route); else - map.updateSourceLine(map.sources.route, []); + map.updateSourcePoints(map.sources.route, [], []); } }
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/qml/PreferencesPage.qml ^
@@ -59,7 +59,9 @@ description: app.tr("Preferred map language.") key: app.conf.basemapLang languages: [ - { "key": "local", "name": app.tr("Local") }, + { "key": "map default", "name": app.tr("Map default"), "no_sort": true }, + { "key": "local", "name": app.tr("Local"), "no_sort": true }, + { "key": "int", "name": app.tr("International"), "no_sort": true }, { "key": "ar", "name": app.tr("Arabic") }, { "key": "eu", "name": app.tr("Basque") }, { "key": "ca", "name": app.tr("Catalan") },
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/qml/platform.kirigami/PageListPL.qml ^
@@ -22,7 +22,7 @@ import org.kde.kirigami 2.7 as Kirigami import "." -Kirigami.Page { +Kirigami.ScrollablePage { id: page leftPadding: 0 rightPadding: 0
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/qml/platform.uuitk/ClipboardPL.qml ^
@@ -17,7 +17,7 @@ */ import QtQuick 2.0 -import Ubuntu.Components 1.3 +import Lomiri.Components 1.3 QtObject { function copy(t) {
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/qml/platform.uuitk/FileSelectorPL.qml ^
@@ -20,7 +20,7 @@ import QtQuick 2.9 import QtQuick.Controls 2.2 -import Ubuntu.Content 1.3 +import Lomiri.Content 1.3 import "." Page {
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/qml/platform.uuitk/HeaderBarImpl.qml ^
@@ -20,7 +20,7 @@ import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import QtGraphicalEffects 1.0 -import Ubuntu.Components 1.3 as UC +import Lomiri.Components 1.3 as UC import "." UC.PageHeader {
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/qml/platform.uuitk/IconButtonPL.qml ^
@@ -17,7 +17,7 @@ */ import QtQuick 2.0 -import Ubuntu.Components 1.3 +import Lomiri.Components 1.3 import "." Item {
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/qml/platform.uuitk/IconPL.qml ^
@@ -17,7 +17,7 @@ */ import QtQuick 2.0 -import Ubuntu.Components 1.3 +import Lomiri.Components 1.3 Icon { id: image
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/qml/platform.uuitk/PageMenuItemPL.qml ^
@@ -18,7 +18,7 @@ import QtQuick 2.9 import QtQuick.Controls 2.2 -import Ubuntu.Components 1.3 as UC +import Lomiri.Components 1.3 as UC UC.Action { iconSource: iconName
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/qml/platform.uuitk/PageMenuPL.qml ^
@@ -18,7 +18,7 @@ import QtQuick 2.9 import QtQuick.Controls 2.2 -import Ubuntu.Components 1.3 as UC +import Lomiri.Components 1.3 as UC Item { id: menu
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/qml/platform.uuitk/README.md ^
@@ -1,5 +1,5 @@ UUITK implementation used in Ubuntu Touch. Its currently based on -Ubuntu Components and QtControls platform. +Lomiri Components and QtControls platform. Recommended imports are @@ -7,7 +7,7 @@ import QtQuick 2.9 import QtQuick.Controls 2.2 import QtQuick.Layouts 1.2 -import Ubuntu.Components 1.3 +import Lomiri.Components 1.3 import "." ```
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/qml/platform.uuitk/SearchFieldPL.qml ^
@@ -17,7 +17,7 @@ */ import QtQuick 2.9 -import Ubuntu.Components 1.3 +import Lomiri.Components 1.3 import "." TextField {
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/qml/platform.uuitk/StylerPL.qml ^
@@ -18,8 +18,8 @@ import QtQuick 2.0 import QtQuick.Window 2.2 -import Ubuntu.Components 1.3 -import Ubuntu.Components.Themes 1.3 +import Lomiri.Components 1.3 +import Lomiri.Components.Themes 1.3 QtObject { // font sizes and family
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/qml/platform.uuitk/TextAreaPL.qml ^
@@ -17,7 +17,7 @@ */ import QtQuick 2.9 -import Ubuntu.Components 1.3 as UC +import Lomiri.Components 1.3 as UC UC.TextArea { anchors.left: parent.left
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/qml/platform.uuitk/TextFieldPL.qml ^
@@ -18,7 +18,7 @@ import QtQuick 2.9 import QtQuick.Controls 2.2 -import Ubuntu.Components 1.3 as UC +import Lomiri.Components 1.3 as UC Item { id: row
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/routers/mapquest_open.py ^
@@ -70,7 +70,7 @@ "ru_RU", ] -URL = ("http://open.mapquestapi.com/directions/v2/{service}" +URL = ("http://www.mapquestapi.com/directions/v2/{service}" "?key=" + poor.key.get("MAPQUEST_KEY") ) cache = {}
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/routers/test/test_mapquest_open.py ^
@@ -24,7 +24,7 @@ self.router = poor.Router("mapquest_open") def test_geocode(self): - result = self.router.route(["viikki, helsinki", "kontula, helsinki"]) + result = self.router.route([(25.0201,60.2251), (25.0836,60.2366)]) result = poor.AttrDict(result) assert result.maneuvers assert result.x
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/routers/test/test_osrm.py ^
@@ -24,8 +24,8 @@ self.router = poor.Router("osrm") # XXX: OSRM demo server is often over capacity. - def __test_geocode(self): - result = self.router.route(["maunula, helsinki", "kallio, helsinki"]) + def test_geocode(self): + result = self.router.route([(25.0201,60.2251), (25.0836,60.2366)]) result = poor.AttrDict(result) assert result.maneuvers assert result.x
[-] [+]	Changed	_service:tar_git:harbour-pure-maps-3.2.0.tar.xz/routers/test/test_stadiamaps.py ^
@@ -24,7 +24,7 @@ self.router = poor.Router("stadiamaps") def test_geocode(self): - result = self.router.route(["vuosaari, helsinki", "arabianranta, helsinki"]) + result = self.router.route([(25.0201,60.2251), (25.0836,60.2366)]) result = poor.AttrDict(result) assert result.maneuvers assert result.x