Changes - SailfishOS Open Build Service

@@ -39,6 +39,18 @@ </screenshots> <metadata_license>CC-BY-SA-3.0</metadata_license> <releases> + <release version="1.15.0" date="2019-09-22"> + <description> + <ul> + <li>Update Valhalla to 3.0.x</li> + <li>Support for DBus activation</li> + <li>Add root DBus API</li> + <li>Specify full path in systemd service invocation</li> + <li>Update translations</li> + <li>Bugfixes</li> + </ul> + </description> + </release> <release version="1.14.5" date="2019-05-22"> <description> <ul>

@@ -45,16 +45,10 @@ id: profileSelection enabled: manager.ready label: qsTr("Profile") - model: [ - qsTr("Default"), - qsTr("Recommended for raster tiles maps"), - qsTr("Recommended for vector and raster tiles maps"), - qsTr("libosmscout with Geocoder-NLP"), - qsTr("libosmscout"), - qsTr("Custom") - ] - - Component.onCompleted: currentIndex = settings.valueInt(settingsGeneralPrefix + "profile") + model: settings.availableProfiles() + Component.onCompleted: { + currentIndex = settings.currentProfile(); + } } ListItemLabel { @@ -92,10 +86,15 @@ "the user is responsible for adjusting the settings to make them consistent between requirements of " + "the used backends and storage." ) } + + ListItemLabel { + font.pixelSize: styler.themeFontSizeMedium + text: qsTr("Please note that some profiles maybe missing due to the packaging of OSM Scout Server.") + } } onAccepted: { if (manager.ready) - settings.setValue(settingsGeneralPrefix + "profile", profileSelection.currentIndex) + settings.setCurrentProfile(profileSelection.currentIndex) } }

@@ -70,8 +70,9 @@ /////////////////////////////////////// /// systemd support Column { - width: parent.width spacing: styler.themePaddingMedium + visible: settings.hasBackendSystemD + width: parent.width TextSwitchPL { id: systemdEnable @@ -164,11 +165,13 @@ SectionHeaderPL { text: qsTr("Rendering") + visible: cbMapnik.visible } ListItemLabel { font.pixelSize: styler.themeFontSizeSmall text: qsTr("Rendering backend is responsible for drawing the maps on raster tiles.") + visible: cbMapnik.visible } ComboBoxPL { @@ -179,6 +182,7 @@ qsTr("Mapnik (default)"), qsTr("libosmscout") ] + visible: settings.hasBackendMapnik && settings.hasBackendOsmScout Component.onCompleted: { if (settings.valueInt(settingsMapnikPrefix + "use_mapnik") > 0) currentIndex = 0; @@ -189,12 +193,14 @@ SectionHeaderPL { text: qsTr("Geocoder") + visible: cbGeocoder.visible } ListItemLabel { font.pixelSize: styler.themeFontSizeSmall text: qsTr("Geocoder is responsible for resolving search requests. " + "For that, it parses the search string and finds the corresponding objects on a map.") + visible: cbGeocoder.visible } ComboBoxPL { @@ -205,6 +211,7 @@ qsTr("Geocoder-NLP (default)"), qsTr("libosmscout") ] + visible: settings.hasBackendOsmScout Component.onCompleted: { if (settings.valueInt(settingsGeomasterPrefix + "use_geocoder_nlp") > 0) currentIndex = 0; @@ -217,16 +224,18 @@ font.pixelSize: styler.themeFontSizeSmall text: qsTr("NB! If you select Geocoder-NLP, please specify languages that should be used for " + "address parsing in the backend settings below. Otherwise, the server could use large amounts of RAM.") - visible: cbGeocoder.currentIndex === 0 + visible: cbGeocoder.currentIndex === 0 && cbGeocoder.visible } SectionHeaderPL { text: qsTr("Routing Engine") + visible: cbRouter.visible } ListItemLabel { font.pixelSize: styler.themeFontSizeSmall text: qsTr("Routing engine is responsible for calculating routes between origin and destination.") + visible: cbRouter.visible } ComboBoxPL { @@ -237,6 +246,7 @@ qsTr("Valhalla (default)"), qsTr("libosmscout") ] + visible: settings.hasBackendMapnik && settings.hasBackendOsmScout Component.onCompleted: { if (settings.valueInt(settingsValhallaPrefix + "use_valhalla") > 0) currentIndex = 0; @@ -253,6 +263,7 @@ Column { width: parent.width spacing: styler.themePaddingMedium + visible: settings.hasBackendMapnik ButtonPL { anchors.horizontalCenter: parent.horizontalCenter @@ -293,6 +304,7 @@ Column { width: parent.width spacing: styler.themePaddingMedium + visible: settings.hasBackendValhalla Rectangle { color: "transparent" @@ -316,6 +328,7 @@ Column { width: parent.width spacing: styler.themePaddingMedium + visible: settings.hasBackendOsmScout Rectangle { width: parent.width @@ -389,15 +402,20 @@ settings.setValue(settingsGeneralPrefix + "language", preferredLanguageSelection.currentIndex) eMapsRoot.apply() - settings.setValue(settingsMapnikPrefix + "use_mapnik", cbMapnik.currentIndex ? 0 : 1) - settings.setValue(settingsGeomasterPrefix + "use_geocoder_nlp", cbGeocoder.currentIndex ? 0 : 1) - settings.setValue(settingsValhallaPrefix + "use_valhalla", cbRouter.currentIndex ? 0 : 1) + if (cbMapnik.visible) + settings.setValue(settingsMapnikPrefix + "use_mapnik", cbMapnik.currentIndex ? 0 : 1) + if (cbGeocoder.visible) + settings.setValue(settingsGeomasterPrefix + "use_geocoder_nlp", cbGeocoder.currentIndex ? 0 : 1) + if (cbRouter.visible) + settings.setValue(settingsValhallaPrefix + "use_valhalla", cbRouter.currentIndex ? 0 : 1) /// units are changed the last settings.setValue(settingsGeneralPrefix + "units", unitsBox.currentIndex) - systemd_service.enabled = systemdEnable.checked - idleTimeout.apply() + if (settings.hasBackendSystemD) { + systemd_service.enabled = systemdEnable.checked + idleTimeout.apply() + } } function checkState() {

@@ -1,18 +1,18 @@ /* * Copyright (C) 2016-2018 Rinigus https://github.com/rinigus - * + * * This file is part of OSM Scout Server. - * + * * 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 <https://www.gnu.org/licenses/>. */ @@ -35,10 +35,11 @@ AppSettings::AppSettings(): QSettings() { + m_available_profile_index = availableProfilesIndex(); } -#define CHECK(s, d) if (!contains(s)) QSettings::setValue(s, d); -#define CHECKF(s, d) if (!contains(s)) QSettings::setValue(s, (double)d); +#define CHECK(s, d) if (!contains(s)) QSettings::setValue(s, d) +#define CHECKF(s, d) if (!contains(s)) QSettings::setValue(s, (double)d) void AppSettings::initDefaults() { // defaults for server @@ -49,7 +50,7 @@ /// general settings CHECK(GENERAL_SETTINGS "units", 0); - CHECK(GENERAL_SETTINGS "profile", 0); + CHECK(GENERAL_SETTINGS "profile", defaultProfile()); CHECK(GENERAL_SETTINGS "language", 0); CHECK(GENERAL_SETTINGS "rollingLoggerSize", 10); @@ -88,7 +89,7 @@ /// defaults for libosmscout /// used internally by MapManager to set the path - will be modified when support - /// for multi-map handling is be ready + /// for multi-map handling will be ready CHECK(OSM_SETTINGS "map", ""); CHECK(OSM_SETTINGS "style", DATA_PREFIX "styles/osmscout/stylesheets/standard.oss"); @@ -135,7 +136,10 @@ setValue(OSM_SETTINGS "icons", icons); } - CHECK(GEOMASTER_SETTINGS "use_geocoder_nlp", 0); + ///////////////////////////////////////// + /// geocoder-nlp settings + + CHECK(GEOMASTER_SETTINGS "use_geocoder_nlp", 1); CHECK(GEOMASTER_SETTINGS "initialize_every_call", 0); CHECK(GEOMASTER_SETTINGS "use_postal", 1); CHECK(GEOMASTER_SETTINGS "use_primitive", 1); @@ -200,21 +204,48 @@ /// location of styles changed in version 3 if (m_last_run_version < 3) - { + { setValue(OSM_SETTINGS "style", DATA_PREFIX "styles/osmscout/stylesheets/standard.oss"); setValue(OSM_SETTINGS "icons", DATA_PREFIX "styles/osmscout/icons/28x28/standard"); setValue(MAPNIKMASTER_SETTINGS "styles_dir", DATA_PREFIX "styles/mapnik"); - } + } /// profiles changed from version 2 to version 4 if (m_last_run_version < 4) - { + { int old_profile = valueInt(GENERAL_SETTINGS "profile"); int new_profile = old_profile; if (old_profile == 0) new_profile = 1; else if (old_profile == 1) new_profile = 0; setValue(GENERAL_SETTINGS "profile", new_profile); - } + } + + /////////////////////////////////////////// + /// check and update settings in accordance + /// with the available backends + + if (!m_available_profile_index.contains(valueInt(GENERAL_SETTINGS "profile"))) + setValue(GENERAL_SETTINGS "profile", defaultProfile()); + + if (!hasBackendOsmScout()) + { + setValue(MAPMANAGER_SETTINGS "osmscout", 0); + setValue(GEOMASTER_SETTINGS "use_geocoder_nlp", 1); + setValue(MAPNIKMASTER_SETTINGS "use_mapnik", 1); + setValue(VALHALLA_MASTER_SETTINGS "use_valhalla", 1); + } + + if (!hasBackendMapnik() && hasBackendOsmScout()) + { + setValue(MAPMANAGER_SETTINGS "mapnik", 0); + setValue(MAPNIKMASTER_SETTINGS "use_mapnik", 0); + } + + if (!hasBackendValhalla() && hasBackendOsmScout()) + { + setValue(MAPMANAGER_SETTINGS "valhalla", 0); + setValue(VALHALLA_MASTER_SETTINGS "use_valhalla", 0); + } /// set profile if specified (after all version checks) setProfile(); @@ -264,22 +295,22 @@ } -int AppSettings::valueInt(const QString &key) +int AppSettings::valueInt(const QString &key) const { return value(key, 0).toInt(); } -bool AppSettings::valueBool(const QString &key) +bool AppSettings::valueBool(const QString &key) const { return (value(key, 0).toInt() > 0); } -double AppSettings::valueFloat(const QString &key) +double AppSettings::valueFloat(const QString &key) const { - return value(key, 0).toFloat(); + return value(key, 0).toDouble(); } -QString AppSettings::valueString(const QString &key) +QString AppSettings::valueString(const QString &key) const { return value(key, QString()).toString(); } @@ -341,16 +372,69 @@ } /////////////////////////////////////////////////////// -/// NB! Profiles have to be in sync here with the -/// QML Profile page +/// NB! Profiles have to be set using either local +/// indexes (exposed methods) or internally via +/// configuration settings (protected methods) /////////////////////////////////////////////////////// +QStringList AppSettings::availableProfiles() const +{ + // compose list of locally available profile descriptions + QStringList l; + const QList<int> &prof = m_available_profile_index; + if (prof.contains(0)) l << tr("Default"); + if (prof.contains(1)) l << tr("Recommended for raster tiles maps"); + if (prof.contains(2)) l << tr("Recommended for vector and raster tiles maps"); + if (prof.contains(3)) l << tr("libosmscout with Geocoder-NLP"); + if (prof.contains(4)) l << tr("libosmscout"); + if (prof.contains(5)) l << tr("Custom"); + return l; +} + +int AppSettings::currentProfile() const +{ + const QList<int> &prof = m_available_profile_index; + int index = valueInt(GENERAL_SETTINGS "profile"); + return prof.indexOf(index); +} + +void AppSettings::setCurrentProfile(int profile) +{ + if (profile > 0 && profile < m_available_profile_index.size()) + setValue(GENERAL_SETTINGS "profile", m_available_profile_index[profile]); +} + +QList<int> AppSettings::availableProfilesIndex() const +{ + // uses universal profile indexes + QList<int> prof; + if (hasBackendValhalla()) prof.append(0); + if (hasBackendMapnik() && hasBackendValhalla()) prof.append(1); + if (hasBackendMapnik() && hasBackendValhalla()) prof.append(2); + if (hasBackendOsmScout()) prof.append(3); + if (hasBackendOsmScout()) prof.append(4); + prof.append(5); + + return prof; +} +

@@ -41,24 +41,45 @@ /// \brief application version that was run before Q_PROPERTY(int lastRunVersion READ lastRunVersion) + /// \brief build configuration: whether mapnik backend is available + Q_PROPERTY(bool hasBackendMapnik READ hasBackendMapnik NOTIFY hasBackendMapnikChanged) + + /// \brief build configuration: whether libosmscout backend is available + Q_PROPERTY(bool hasBackendOsmScout READ hasBackendOsmScout NOTIFY hasBackendOsmScoutChanged) + + /// \brief build configuration: whether systemd support is available + Q_PROPERTY(bool hasBackendSystemD READ hasBackendSystemD NOTIFY hasBackendSystemDChanged) + + /// \brief build configuration: whether valhalla backend is available + Q_PROPERTY(bool hasBackendValhalla READ hasBackendValhalla NOTIFY hasBackendValhallaChanged) + public: AppSettings(); virtual ~AppSettings() {} Q_INVOKABLE void setValue(const QString &key, const QVariant &value); - Q_INVOKABLE int valueInt(const QString &key); - Q_INVOKABLE bool valueBool(const QString &key); - Q_INVOKABLE double valueFloat(const QString &key); - Q_INVOKABLE QString valueString(const QString &key); + Q_INVOKABLE int valueInt(const QString &key) const; + Q_INVOKABLE bool valueBool(const QString &key) const; + Q_INVOKABLE double valueFloat(const QString &key) const; + Q_INVOKABLE QString valueString(const QString &key) const; Q_INVOKABLE int unitIndex() const; ///< Index of selected units Q_INVOKABLE int unitDisplayDecimals() const; - Q_INVOKABLE double unitFactor() const; /// multiply by this factor when displaying distance or speed to the user + Q_INVOKABLE double unitFactor() const; ///< multiply by this factor when displaying distance or speed to the user Q_INVOKABLE bool hasUnits(const QString &key) const; Q_INVOKABLE QString unitName(const QString &key) const; + // Profile management and GUI interaction + // As not all profiles are available in all configurations, these + // functions hide the complexity of profile selection by + // - presenting only available profiles + // - indexing profiles according to that list + Q_INVOKABLE QStringList availableProfiles() const; ///< Profile available in this application install + Q_INVOKABLE int currentProfile() const; ///< Current profile index of a profile as in availableProfiles + Q_INVOKABLE void setCurrentProfile(int profile); ///< Set current profile using the index of a profile as in availableProfiles + void initDefaults(); ///< Initialize settings for configurable parameters on the first start bool profilesUsed() const { return m_profiles_used; } @@ -75,17 +96,59 @@ /// language or a language code QString preferredLanguage(); + /// State of the backends + + bool hasBackendMapnik() const { +#ifdef USE_MAPNIK + return true; +#else + return false; +#endif + } + + bool hasBackendOsmScout() const { +#ifdef USE_OSMSCOUT + return true; +#else + return false; +#endif + } + + bool hasBackendSystemD() const { +#ifdef USE_SYSTEMD + return true; +#else + return false; +#endif + } + + bool hasBackendValhalla() const { +#ifdef USE_VALHALLA + return true; +#else + return false; +#endif + } + signals: void osmScoutSettingsChanged(); void profilesUsedChanged(bool used); void countrySelectionNeededChanged(bool selection); + // never used, but makes QML happy + void hasBackendMapnikChanged(bool); + void hasBackendOsmScoutChanged(bool); + void hasBackendSystemDChanged(bool); + void hasBackendValhallaChanged(bool); + public slots: void fireOsmScoutSettingsChanged(); protected: QString unitName(bool speed) const; + QList<int> availableProfilesIndex() const; + int defaultProfile() const; void setProfile(); void checkCountrySelectionNeeded(); @@ -96,6 +159,7 @@ bool m_country_selection_needed = true; bool m_first_time = false; int m_last_run_version{0}; + QList<int> m_available_profile_index; }; #endif // APPSETTINGS_H

@@ -51,7 +51,9 @@ Manager::Manager(QObject *parent) : QObject(parent) { +#ifdef USE_OSMSCOUT m_features.append(new FeatureOsmScout(this)); +#endif m_features.append(new FeatureGeocoderNLP(this)); m_features.append(new FeaturePostalGlobal(this)); m_features.append(new FeaturePostalCountry(this)); @@ -59,10 +61,14 @@ m_features.append(new FeatureMapboxGLGlyphs(this)); m_features.append(new FeatureMapboxGLCountry(this)); m_features.append(new FeatureMapnikGlobal(this)); +#ifdef USE_MAPNIK m_features.append(new FeatureMapnikCountry(this)); +#endif m_feature_valhalla = new FeatureValhalla(this); +#ifdef USE_VALHALLA m_features.append(m_feature_valhalla); +#endif for (Feature *p: m_features) if (p == nullptr)

@@ -11,17 +11,17 @@ <message> <location filename="../qml/AboutPage.qml" line="35"/> <source>Copyright:</source> - <translation>Copyright:</translation> + <translation>Autorská práva:</translation> </message> <message> <location filename="../qml/AboutPage.qml" line="42"/> <source>Artwork</source> - <translation type="unfinished"></translation> + <translation>Kresba</translation> </message> <message> <location filename="../qml/AboutPage.qml" line="43"/> <source>Icons by %1.</source> - <translation type="unfinished"></translation> + <translation>Ikony od %1.</translation> </message> <message> <location filename="../qml/AboutPage.qml" line="44"/> @@ -97,25 +97,55 @@ <context> <name>AppSettings</name> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mph</source> <translation>mi/h</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mi.</source> <translation>mi</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km/h</source> <translation>km/h</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km</source> <translation>km</translation> </message> + <message> + <location filename="../src/appsettings.cpp" line="385"/> + <source>Default</source> + <translation>Výchozí</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="386"/> + <source>Recommended for raster tiles maps</source> + <translation>Doporučeno pro mapování rastrových dlaždic</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="387"/> + <source>Recommended for vector and raster tiles maps</source> + <translation>Doporučeno pro mapy vektorových a rastrových dlaždic.</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="388"/> + <source>libosmscout with Geocoder-NLP</source> + <translation>libosmscout s Geocoder-NLP</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="389"/> + <source>libosmscout</source> + <translation>libosmscout</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="390"/> + <source>Custom</source> + <translation>Vlastní</translation> + </message> </context> <context> <name>CountryDetailsPage</name> @@ -137,7 +167,7 @@ <message> <location filename="../qml/CountryDetailsPage.qml" line="230"/> <source>Some or all datasets are incompatible with this version. You would have to update list of provided maps, the maps, and/or install the latest release of OSM Scout Server.</source> - <translation>Některé nebo všechny datové sady jsou s touto verzí nekompatibilní. Budete muset aktualizovat seznam poskytnutých map, mapy a / nebo nainstalovat nejnovější verzi serveru OSM Scout.</translation> + <translation>Některé nebo všechny datové sady jsou s touto verzí nekompatibilní. Budete muset aktualizovat seznam poskytnutých map, mapy a / nebo nainstalovat nejnovější verzi OSM Scout Serveru.</translation> </message> <message> <location filename="../qml/CountryDetailsPage.qml" line="237"/> @@ -694,217 +724,217 @@ <context> <name>MapManager::Manager</name> <message> - <location filename="../src/mapmanager.cpp" line="70"/> + <location filename="../src/mapmanager.cpp" line="76"/> <source>Could not allocate Map Manager features</source> <translation>Nelze přidělit funkce Map Manageru</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="116"/> + <location filename="../src/mapmanager.cpp" line="122"/> <source>Storage folder changed to %1</source> <translation>Úložiště bylo změněno na %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="123"/> + <location filename="../src/mapmanager.cpp" line="129"/> <source>Maps storage folder does not exist: %1</source> <translation>Složka úložiště mapy neexistuje: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="126"/> + <location filename="../src/mapmanager.cpp" line="132"/> <source>Maps storage folder path does not point to a directory: %1</source> <translation>Cesta složky pro ukládání map není odkazem na adresář: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="132"/> + <location filename="../src/mapmanager.cpp" line="138"/> <source>Maps storage folder is not writable, please adjust permissions for %1</source> <translation>Složka pro ukládání map není zapisovatelná, upravte oprávnění pro %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="185"/> - <location filename="../src/mapmanager.cpp" line="187"/> + <location filename="../src/mapmanager.cpp" line="191"/> + <location filename="../src/mapmanager.cpp" line="193"/> <source>Failed to open the database for tracking downloaded files</source> <translation>Nepodařilo se otevřít databázi pro sledování stažených souborů</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="188"/> + <location filename="../src/mapmanager.cpp" line="194"/> <source>Map Manager functionality would be disturbed</source> <translation>Funkce Map Manageru může být narušena</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="250"/> + <location filename="../src/mapmanager.cpp" line="256"/> <source>Cannot create directory without any name</source> <translation>Adresář nelze vytvořit bez názvu</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="257"/> + <location filename="../src/mapmanager.cpp" line="263"/> <source>Error creating directory %1</source> <translation>Chyba při vytváření adresáře %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="304"/> + <location filename="../src/mapmanager.cpp" line="310"/> <source>Address parsing language support</source> <translation>Jazyková podpora analýzy adres</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="337"/> - <location filename="../src/mapmanager.cpp" line="808"/> - <location filename="../src/mapmanager.cpp" line="937"/> + <location filename="../src/mapmanager.cpp" line="343"/> + <location filename="../src/mapmanager.cpp" line="814"/> + <location filename="../src/mapmanager.cpp" line="943"/> <source>Maps storage folder does not exist: </source> <translation>Složka úložiště mapy neexistuje:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="346"/> - <location filename="../src/mapmanager.cpp" line="815"/> + <location filename="../src/mapmanager.cpp" line="352"/> + <location filename="../src/mapmanager.cpp" line="821"/> <source>No maps were requested</source> <translation>Nebyly vyžádány žádné mapy</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="367"/> + <location filename="../src/mapmanager.cpp" line="373"/> <source>No maps loaded: %1</source> <translation>Žádné načtené mapy: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="842"/> + <location filename="../src/mapmanager.cpp" line="848"/> <source>%1: version of dataset for %2 is not supported</source> <translation>%1: verze datové sady pro %2 není podporována</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="393"/> + <location filename="../src/mapmanager.cpp" line="399"/> <source>Missing dataset for %1: %2</source> <translation>Chybějící dataset pro %1: %2</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="306"/> + <location filename="../src/mapmanager.cpp" line="312"/> <source>Mapnik World coastlines</source> <translation>Pobřeží světa z databáze Mapnik</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="308"/> + <location filename="../src/mapmanager.cpp" line="314"/>

@@ -97,25 +97,55 @@ <context> <name>AppSettings</name> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mph</source> <translation>mph</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mi.</source> <translation>mi.</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km/h</source> <translation>km/h</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km</source> <translation>km</translation> </message> + <message> + <location filename="../src/appsettings.cpp" line="385"/> + <source>Default</source> + <translation>Vorgabe</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="386"/> + <source>Recommended for raster tiles maps</source> + <translation>Empfehlung für Karten mit Rasterkacheln</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="387"/> + <source>Recommended for vector and raster tiles maps</source> + <translation>Empfohlen für Vektor- und Rasterkacheln Karten</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="388"/> + <source>libosmscout with Geocoder-NLP</source> + <translation>libosmscout und Geocoder-NLP</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="389"/> + <source>libosmscout</source> + <translation>libosmscout</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="390"/> + <source>Custom</source> + <translation>Benutzerdefiniert</translation> + </message> </context> <context> <name>CountryDetailsPage</name> @@ -695,217 +725,217 @@ <context> <name>MapManager::Manager</name> <message> - <location filename="../src/mapmanager.cpp" line="70"/> + <location filename="../src/mapmanager.cpp" line="76"/> <source>Could not allocate Map Manager features</source> <translation>Konnte Funktionen der Kartenverwaltung nicht bereitstellen.</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="116"/> + <location filename="../src/mapmanager.cpp" line="122"/> <source>Storage folder changed to %1</source> <translation>Speicherordner geändert zu %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="123"/> + <location filename="../src/mapmanager.cpp" line="129"/> <source>Maps storage folder does not exist: %1</source> <translation>Kartenspeicher-Verzeichnis existiert nicht: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="126"/> + <location filename="../src/mapmanager.cpp" line="132"/> <source>Maps storage folder path does not point to a directory: %1</source> <translation>Maps Speicherordner Pfad verweist nicht auf ein Verzeichnis: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="132"/> + <location filename="../src/mapmanager.cpp" line="138"/> <source>Maps storage folder is not writable, please adjust permissions for %1</source> <translation>Das Kartenverzeichnis ist nicht beschreibbar, bitte passe die Berechtigungen für %1 an.</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="185"/> - <location filename="../src/mapmanager.cpp" line="187"/> + <location filename="../src/mapmanager.cpp" line="191"/> + <location filename="../src/mapmanager.cpp" line="193"/> <source>Failed to open the database for tracking downloaded files</source> <translation>Fehler beim Öffnen der Datenbank zum Verfolgen heruntergeladener Dateien.</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="188"/> + <location filename="../src/mapmanager.cpp" line="194"/> <source>Map Manager functionality would be disturbed</source> <translation>Kartenverwaltung Funktionalität wäre gestört</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="250"/> + <location filename="../src/mapmanager.cpp" line="256"/> <source>Cannot create directory without any name</source> <translation>Kann kein Verzeichnis ohne Namen erstellen</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="257"/> + <location filename="../src/mapmanager.cpp" line="263"/> <source>Error creating directory %1</source> <translation>Fehler beim Erstellen des Verzeichnisses %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="304"/> + <location filename="../src/mapmanager.cpp" line="310"/> <source>Address parsing language support</source> <translation>Adressanalyse Sprachunterstützung</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="337"/> - <location filename="../src/mapmanager.cpp" line="808"/> - <location filename="../src/mapmanager.cpp" line="937"/> + <location filename="../src/mapmanager.cpp" line="343"/> + <location filename="../src/mapmanager.cpp" line="814"/> + <location filename="../src/mapmanager.cpp" line="943"/> <source>Maps storage folder does not exist: </source> <translation>Kartenspeicherordner existiert nicht:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="346"/> - <location filename="../src/mapmanager.cpp" line="815"/> + <location filename="../src/mapmanager.cpp" line="352"/> + <location filename="../src/mapmanager.cpp" line="821"/> <source>No maps were requested</source> <translation>Es wurden keine Karten angefordert.</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="367"/> + <location filename="../src/mapmanager.cpp" line="373"/> <source>No maps loaded: %1</source> <translation>Keine Karten geladen: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="842"/> + <location filename="../src/mapmanager.cpp" line="848"/> <source>%1: version of dataset for %2 is not supported</source> <translation>%1: Version des Datensatzes für %2 wird nicht unterstützt</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="393"/> + <location filename="../src/mapmanager.cpp" line="399"/> <source>Missing dataset for %1: %2</source> <translation>Fehlender Datensatz für %1: %2</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="306"/> + <location filename="../src/mapmanager.cpp" line="312"/> <source>Mapnik World coastlines</source> <translation>Mapnik Welt Küstenlinien</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="308"/> + <location filename="../src/mapmanager.cpp" line="314"/> <source>Mapbox GL World overlay</source> <translation>Mapbox GL Weltkartenschablone</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="310"/> + <location filename="../src/mapmanager.cpp" line="316"/> <source>Mapbox GL fonts</source> <translation>Schriftarten für Mapbox GL</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="440"/> + <location filename="../src/mapmanager.cpp" line="446"/> <source>Available country or territory: </source> <translation>Verfügbares Land oder Gebiet:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="641"/> + <location filename="../src/mapmanager.cpp" line="647"/> <source>World</source> <translation>Welt</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="705"/> + <location filename="../src/mapmanager.cpp" line="711"/> <source>Removing country from requested list: </source> <translation>Land aus der angeforderten Liste entfernen:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="863"/> + <location filename="../src/mapmanager.cpp" line="869"/>

@@ -97,25 +97,55 @@ <context> <name>AppSettings</name> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mph</source> <translation>mph</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mi.</source> <translation>mi.</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km/h</source> <translation>km/h</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km</source> <translation>km</translation> </message> + <message> + <location filename="../src/appsettings.cpp" line="385"/> + <source>Default</source> + <translation>Por defecto</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="386"/> + <source>Recommended for raster tiles maps</source> + <translation>Recomendado para mapas de bits</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="387"/> + <source>Recommended for vector and raster tiles maps</source> + <translation>Recomendado para mapas vectoriales y de bits</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="388"/> + <source>libosmscout with Geocoder-NLP</source> + <translation>libosmscout con Geocoder-NLP</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="389"/> + <source>libosmscout</source> + <translation>libosmscout</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="390"/> + <source>Custom</source> + <translation>Personalizado</translation> + </message> </context> <context> <name>CountryDetailsPage</name> @@ -694,217 +724,217 @@ <context> <name>MapManager::Manager</name> <message> - <location filename="../src/mapmanager.cpp" line="70"/> + <location filename="../src/mapmanager.cpp" line="76"/> <source>Could not allocate Map Manager features</source> <translation>No se han podido asignar las funciones al Gestor de mapas</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="116"/> + <location filename="../src/mapmanager.cpp" line="122"/> <source>Storage folder changed to %1</source> <translation>La carpeta de almacenamiento cambió a %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="123"/> + <location filename="../src/mapmanager.cpp" line="129"/> <source>Maps storage folder does not exist: %1</source> <translation>La carpeta de almacenamiento de mapas no existe: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="126"/> + <location filename="../src/mapmanager.cpp" line="132"/> <source>Maps storage folder path does not point to a directory: %1</source> <translation>La ruta de la carpeta de almacenamiento de mapas no apunta a un directorio: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="132"/> + <location filename="../src/mapmanager.cpp" line="138"/> <source>Maps storage folder is not writable, please adjust permissions for %1</source> <translation>La carpeta de almacenamiento de mapas no tiene permisos de escritura, por favor, modifica los permisos de %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="185"/> - <location filename="../src/mapmanager.cpp" line="187"/> + <location filename="../src/mapmanager.cpp" line="191"/> + <location filename="../src/mapmanager.cpp" line="193"/> <source>Failed to open the database for tracking downloaded files</source> <translation>Error al abrir la base de datos para el seguimiento de los ficheros descargados</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="188"/> + <location filename="../src/mapmanager.cpp" line="194"/> <source>Map Manager functionality would be disturbed</source> <translation>La funcionalidad del Gestor de mapas se ha alterado</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="250"/> + <location filename="../src/mapmanager.cpp" line="256"/> <source>Cannot create directory without any name</source> <translation>No es posible crear un directorio sin indicar un nombre</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="257"/> + <location filename="../src/mapmanager.cpp" line="263"/> <source>Error creating directory %1</source> <translation>Error al crear directorio %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="304"/> + <location filename="../src/mapmanager.cpp" line="310"/> <source>Address parsing language support</source> <translation>Soporte del idioma en el análisis de direcciones</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="337"/> - <location filename="../src/mapmanager.cpp" line="808"/> - <location filename="../src/mapmanager.cpp" line="937"/> + <location filename="../src/mapmanager.cpp" line="343"/> + <location filename="../src/mapmanager.cpp" line="814"/> + <location filename="../src/mapmanager.cpp" line="943"/> <source>Maps storage folder does not exist: </source> <translation>No existe la carpeta de almacenamieto de los mapas: </translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="346"/> - <location filename="../src/mapmanager.cpp" line="815"/> + <location filename="../src/mapmanager.cpp" line="352"/> + <location filename="../src/mapmanager.cpp" line="821"/> <source>No maps were requested</source> <translation>No se han solicitado mapas</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="367"/> + <location filename="../src/mapmanager.cpp" line="373"/> <source>No maps loaded: %1</source> <translation>No hay mapas cargados: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="842"/> + <location filename="../src/mapmanager.cpp" line="848"/> <source>%1: version of dataset for %2 is not supported</source> <translation>%1: la versión del conjunto de datos para %2 no es compatible</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="393"/> + <location filename="../src/mapmanager.cpp" line="399"/> <source>Missing dataset for %1: %2</source> <translation>Falta conjunto de datos para %1: %2</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="306"/> + <location filename="../src/mapmanager.cpp" line="312"/> <source>Mapnik World coastlines</source> <translation>Costas del mundo de Mapnik</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="308"/> + <location filename="../src/mapmanager.cpp" line="314"/> <source>Mapbox GL World overlay</source> <translation>Capa del mundo de Mapbox GL</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="310"/> + <location filename="../src/mapmanager.cpp" line="316"/> <source>Mapbox GL fonts</source> <translation>Fuentes de Mapbox GL</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="440"/> + <location filename="../src/mapmanager.cpp" line="446"/> <source>Available country or territory: </source> <translation>País o territorio disponible: </translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="641"/> + <location filename="../src/mapmanager.cpp" line="647"/> <source>World</source> <translation>Mundo</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="705"/> + <location filename="../src/mapmanager.cpp" line="711"/> <source>Removing country from requested list: </source> <translation>Eliminando país de la lista solicitada: </translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="863"/> + <location filename="../src/mapmanager.cpp" line="869"/>

@@ -97,25 +97,55 @@ <context> <name>AppSettings</name> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mph</source> <translation>mph</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mi.</source> <translation>mi.</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km/h</source> <translation>km/h</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km</source> <translation>km</translation> </message> + <message> + <location filename="../src/appsettings.cpp" line="385"/> + <source>Default</source> + <translation>Oletus</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="386"/> + <source>Recommended for raster tiles maps</source> + <translation>Suositeltu rasterilaattakarttojen kanssa</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="387"/> + <source>Recommended for vector and raster tiles maps</source> + <translation>Suositeltu vektori- ja rasterilaattakarttojen kanssa</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="388"/> + <source>libosmscout with Geocoder-NLP</source> + <translation>libosmscout ja Geocoder-NLP</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="389"/> + <source>libosmscout</source> + <translation>libosmscout</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="390"/> + <source>Custom</source> + <translation>Mukautettu</translation> + </message> </context> <context> <name>CountryDetailsPage</name> @@ -694,217 +724,217 @@ <context> <name>MapManager::Manager</name> <message> - <location filename="../src/mapmanager.cpp" line="70"/> + <location filename="../src/mapmanager.cpp" line="76"/> <source>Could not allocate Map Manager features</source> <translation>Karttamanagerin ominaisuuksia ei voitu varata</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="116"/> + <location filename="../src/mapmanager.cpp" line="122"/> <source>Storage folder changed to %1</source> <translation>Tallennuskansioksi vaihtui %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="123"/> + <location filename="../src/mapmanager.cpp" line="129"/> <source>Maps storage folder does not exist: %1</source> <translation>Karttojen tallennuskansiota ei ole olemassa: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="126"/> + <location filename="../src/mapmanager.cpp" line="132"/> <source>Maps storage folder path does not point to a directory: %1</source> <translation>Karttojen tallennuskansion polku ei osoita kansioon: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="132"/> + <location filename="../src/mapmanager.cpp" line="138"/> <source>Maps storage folder is not writable, please adjust permissions for %1</source> <translation>Karttojen tallennuskansio ei ole kirjoittavissa, muokkaa %1 käyttäjäoikeudet</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="185"/> - <location filename="../src/mapmanager.cpp" line="187"/> + <location filename="../src/mapmanager.cpp" line="191"/> + <location filename="../src/mapmanager.cpp" line="193"/> <source>Failed to open the database for tracking downloaded files</source> <translation>Tietokannan avaaminen ladattujen tiedostojen seurantaan epäonnistui</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="188"/> + <location filename="../src/mapmanager.cpp" line="194"/> <source>Map Manager functionality would be disturbed</source> <translation>Karttamanagerin toiminta häiriintyisi</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="250"/> + <location filename="../src/mapmanager.cpp" line="256"/> <source>Cannot create directory without any name</source> <translation>Hakemistoa ei voida luoda ilman nimeä</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="257"/> + <location filename="../src/mapmanager.cpp" line="263"/> <source>Error creating directory %1</source> <translation>Virhe luotaessa hakemistoa %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="304"/> + <location filename="../src/mapmanager.cpp" line="310"/> <source>Address parsing language support</source> <translation>Osoitteiden tulkinnan kielituki</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="337"/> - <location filename="../src/mapmanager.cpp" line="808"/> - <location filename="../src/mapmanager.cpp" line="937"/> + <location filename="../src/mapmanager.cpp" line="343"/> + <location filename="../src/mapmanager.cpp" line="814"/> + <location filename="../src/mapmanager.cpp" line="943"/> <source>Maps storage folder does not exist: </source> <translation>Karttojen tallennuskansiota ei ole olemassa: </translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="346"/> - <location filename="../src/mapmanager.cpp" line="815"/> + <location filename="../src/mapmanager.cpp" line="352"/> + <location filename="../src/mapmanager.cpp" line="821"/> <source>No maps were requested</source> <translation>Yhtään karttaa ei pyydetty</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="367"/> + <location filename="../src/mapmanager.cpp" line="373"/> <source>No maps loaded: %1</source> <translation>Yhtään karttaa ei ladattu: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="842"/> + <location filename="../src/mapmanager.cpp" line="848"/> <source>%1: version of dataset for %2 is not supported</source> <translation>%1: %2 datasetin versio ei ole tuettu</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="393"/> + <location filename="../src/mapmanager.cpp" line="399"/> <source>Missing dataset for %1: %2</source> <translation>Puuttuva %1 datasetti: %2</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="306"/> + <location filename="../src/mapmanager.cpp" line="312"/> <source>Mapnik World coastlines</source> <translation>Mapnik maailman rantaviivat</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="308"/> + <location filename="../src/mapmanager.cpp" line="314"/> <source>Mapbox GL World overlay</source> <translation>Mapbox GL maailman overlay</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="310"/> + <location filename="../src/mapmanager.cpp" line="316"/> <source>Mapbox GL fonts</source> <translation>Mapbox GL fontit</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="440"/> + <location filename="../src/mapmanager.cpp" line="446"/> <source>Available country or territory: </source> <translation>Saatavilla oleva maa tai alue: </translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="641"/> + <location filename="../src/mapmanager.cpp" line="647"/> <source>World</source> <translation>Maailma</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="705"/> + <location filename="../src/mapmanager.cpp" line="711"/> <source>Removing country from requested list: </source> <translation>Poistetaan maa pyydettyjen listalta: </translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="863"/> + <location filename="../src/mapmanager.cpp" line="869"/>

@@ -97,25 +97,55 @@ <context> <name>AppSettings</name> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mph</source> <translation>mph</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mi.</source> <translation>mi.</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km/h</source> <translation>km/h</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km</source> <translation>km</translation> </message> + <message> + <location filename="../src/appsettings.cpp" line="385"/> + <source>Default</source> + <translation>Par défaut</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="386"/> + <source>Recommended for raster tiles maps</source> + <translation>Recommandé pour des tuiles de cartes plus précises</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="387"/> + <source>Recommended for vector and raster tiles maps</source> + <translation>Recommandé pour les tuiles de cartes vectorielles et matricielles</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="388"/> + <source>libosmscout with Geocoder-NLP</source> + <translation>libosmscout avec Geocoder-NLP</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="389"/> + <source>libosmscout</source> + <translation>libosmscout</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="390"/> + <source>Custom</source> + <translation>Personnalisé</translation> + </message> </context> <context> <name>CountryDetailsPage</name> @@ -694,217 +724,217 @@ <context> <name>MapManager::Manager</name> <message> - <location filename="../src/mapmanager.cpp" line="70"/> + <location filename="../src/mapmanager.cpp" line="76"/> <source>Could not allocate Map Manager features</source> <translation>Impossible d'allouer les fonctionnalités du Gestionnaire</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="116"/> + <location filename="../src/mapmanager.cpp" line="122"/> <source>Storage folder changed to %1</source> <translation>Dossier de stockage modifié pour %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="123"/> + <location filename="../src/mapmanager.cpp" line="129"/> <source>Maps storage folder does not exist: %1</source> <translation>Le dossier de stockage n'existe pas : %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="126"/> + <location filename="../src/mapmanager.cpp" line="132"/> <source>Maps storage folder path does not point to a directory: %1</source> <translation>Le chemin du stockage des cartes ne pointe sur aucun dossier : %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="132"/> + <location filename="../src/mapmanager.cpp" line="138"/> <source>Maps storage folder is not writable, please adjust permissions for %1</source> <translation>Le dossier de stockage n'est pas modifiable, merci d'ajuster les permissions de %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="185"/> - <location filename="../src/mapmanager.cpp" line="187"/> + <location filename="../src/mapmanager.cpp" line="191"/> + <location filename="../src/mapmanager.cpp" line="193"/> <source>Failed to open the database for tracking downloaded files</source> <translation>Impossible de charger la base de données permettant d'accéder aux fichiers téléchargés</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="188"/> + <location filename="../src/mapmanager.cpp" line="194"/> <source>Map Manager functionality would be disturbed</source> <translation>Le Gestionnaire va être perturbé</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="250"/> + <location filename="../src/mapmanager.cpp" line="256"/> <source>Cannot create directory without any name</source> <translation>Impossible de créer un dossier sans nom</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="257"/> + <location filename="../src/mapmanager.cpp" line="263"/> <source>Error creating directory %1</source> <translation>Impossible de créer le dossier %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="304"/> + <location filename="../src/mapmanager.cpp" line="310"/> <source>Address parsing language support</source> <translation>Langues supportées pour le décodage des adresses</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="337"/> - <location filename="../src/mapmanager.cpp" line="808"/> - <location filename="../src/mapmanager.cpp" line="937"/> + <location filename="../src/mapmanager.cpp" line="343"/> + <location filename="../src/mapmanager.cpp" line="814"/> + <location filename="../src/mapmanager.cpp" line="943"/> <source>Maps storage folder does not exist: </source> <translation>Le dossier de stockage n'existe pas : </translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="346"/> - <location filename="../src/mapmanager.cpp" line="815"/> + <location filename="../src/mapmanager.cpp" line="352"/> + <location filename="../src/mapmanager.cpp" line="821"/> <source>No maps were requested</source> <translation>Aucune carte n'a été sollicitée</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="367"/> + <location filename="../src/mapmanager.cpp" line="373"/> <source>No maps loaded: %1</source> <translation>Aucune carte chargée : %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="842"/> + <location filename="../src/mapmanager.cpp" line="848"/> <source>%1: version of dataset for %2 is not supported</source> <translation>%1 : la version du jeu de données pour %2 n'est pas supportée</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="393"/> + <location filename="../src/mapmanager.cpp" line="399"/> <source>Missing dataset for %1: %2</source> <translation>Jeux de données manquants pour %1 : %2</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="306"/> + <location filename="../src/mapmanager.cpp" line="312"/> <source>Mapnik World coastlines</source> <translation>Littoral mondial Mapnik</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="308"/> + <location filename="../src/mapmanager.cpp" line="314"/> <source>Mapbox GL World overlay</source> <translation>Couche mondiale Mapbox GL</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="310"/> + <location filename="../src/mapmanager.cpp" line="316"/> <source>Mapbox GL fonts</source> <translation>Polices Mapbox GL</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="440"/> + <location filename="../src/mapmanager.cpp" line="446"/> <source>Available country or territory: </source> <translation>Pays et territoires disponibles : </translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="641"/> + <location filename="../src/mapmanager.cpp" line="647"/> <source>World</source> <translation>Monde</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="705"/> + <location filename="../src/mapmanager.cpp" line="711"/> <source>Removing country from requested list: </source> <translation>Suppression du pays dans la liste : </translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="863"/> + <location filename="../src/mapmanager.cpp" line="869"/>

@@ -97,25 +97,55 @@ <context> <name>AppSettings</name> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mph</source> <translation>mph</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mi.</source> <translation>mi</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km/h</source> <translation>km/h</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km</source> <translation>km</translation> </message> + <message> + <location filename="../src/appsettings.cpp" line="385"/> + <source>Default</source> + <translation>Predefinita</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="386"/> + <source>Recommended for raster tiles maps</source> + <translation>Raccomandato per mappe con tile raster</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="387"/> + <source>Recommended for vector and raster tiles maps</source> + <translation>Raccomandato per mappe con tile vettoriali e raster</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="388"/> + <source>libosmscout with Geocoder-NLP</source> + <translation>libosmscout con Geocoder-NLP</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="389"/> + <source>libosmscout</source> + <translation>libosmscout</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="390"/> + <source>Custom</source> + <translation>Personalizzato</translation> + </message> </context> <context> <name>CountryDetailsPage</name> @@ -694,217 +724,217 @@ <context> <name>MapManager::Manager</name> <message> - <location filename="../src/mapmanager.cpp" line="70"/> + <location filename="../src/mapmanager.cpp" line="76"/> <source>Could not allocate Map Manager features</source> <translation>Impossibile allocare funzioni del Gestore delle Mappe</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="116"/> + <location filename="../src/mapmanager.cpp" line="122"/> <source>Storage folder changed to %1</source> <translation>Cartella di archivio cambiata in %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="123"/> + <location filename="../src/mapmanager.cpp" line="129"/> <source>Maps storage folder does not exist: %1</source> <translation>La cartella di archivio delle mappe non esiste: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="126"/> + <location filename="../src/mapmanager.cpp" line="132"/> <source>Maps storage folder path does not point to a directory: %1</source> <translation>Il percorso della cartella di archivio delle mappe non punta a una cartella: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="132"/> + <location filename="../src/mapmanager.cpp" line="138"/> <source>Maps storage folder is not writable, please adjust permissions for %1</source> <translation>Impossibile scrivere sulla cartella di archivio delle mappe, aggiustare i permessi per %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="185"/> - <location filename="../src/mapmanager.cpp" line="187"/> + <location filename="../src/mapmanager.cpp" line="191"/> + <location filename="../src/mapmanager.cpp" line="193"/> <source>Failed to open the database for tracking downloaded files</source> <translation>Impossibile aprire il database per tracciare i file scaricati</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="188"/> + <location filename="../src/mapmanager.cpp" line="194"/> <source>Map Manager functionality would be disturbed</source> <translation>La funzionalità del Gestore delle Mappe sarebbe disturbata</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="250"/> + <location filename="../src/mapmanager.cpp" line="256"/> <source>Cannot create directory without any name</source> <translation>Impossibile creare una cartella senza nome</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="257"/> + <location filename="../src/mapmanager.cpp" line="263"/> <source>Error creating directory %1</source> <translation>Errore nella creare la cartella %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="304"/> + <location filename="../src/mapmanager.cpp" line="310"/> <source>Address parsing language support</source> <translation>Supporto analisi indirizzo per lingua</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="337"/> - <location filename="../src/mapmanager.cpp" line="808"/> - <location filename="../src/mapmanager.cpp" line="937"/> + <location filename="../src/mapmanager.cpp" line="343"/> + <location filename="../src/mapmanager.cpp" line="814"/> + <location filename="../src/mapmanager.cpp" line="943"/> <source>Maps storage folder does not exist: </source> <translation>La cartella di archivio delle mappe non esiste:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="346"/> - <location filename="../src/mapmanager.cpp" line="815"/> + <location filename="../src/mapmanager.cpp" line="352"/> + <location filename="../src/mapmanager.cpp" line="821"/> <source>No maps were requested</source> <translation>Nessuna mappa richiesta</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="367"/> + <location filename="../src/mapmanager.cpp" line="373"/> <source>No maps loaded: %1</source> <translation>Nessuna mappa caricata: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="842"/> + <location filename="../src/mapmanager.cpp" line="848"/> <source>%1: version of dataset for %2 is not supported</source> <translation>%1: versione del set di dati per %2 non supportata</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="393"/> + <location filename="../src/mapmanager.cpp" line="399"/> <source>Missing dataset for %1: %2</source> <translation>Set di dati mancanti per %1: %2</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="306"/> + <location filename="../src/mapmanager.cpp" line="312"/> <source>Mapnik World coastlines</source> <translation>Linee costiere mondiali di Mapnik</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="308"/> + <location filename="../src/mapmanager.cpp" line="314"/> <source>Mapbox GL World overlay</source> <translation>Overlay del mondo di Mapbox GL</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="310"/> + <location filename="../src/mapmanager.cpp" line="316"/> <source>Mapbox GL fonts</source> <translation>Caratteri di Mapbox GL</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="440"/> + <location filename="../src/mapmanager.cpp" line="446"/> <source>Available country or territory: </source> <translation>Paesi o territori disponibili:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="641"/> + <location filename="../src/mapmanager.cpp" line="647"/> <source>World</source> <translation>Mondo</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="705"/> + <location filename="../src/mapmanager.cpp" line="711"/> <source>Removing country from requested list: </source> <translation>Rimozione paese dalla lista di richieste:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="863"/> + <location filename="../src/mapmanager.cpp" line="869"/>

@@ -97,25 +97,55 @@ <context> <name>AppSettings</name> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mph</source> <translation>mph</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mi.</source> <translation>mi.</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km/h</source> <translation>km/t</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km</source> <translation>km</translation> </message> + <message> + <location filename="../src/appsettings.cpp" line="385"/> + <source>Default</source> + <translation>Standard</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="386"/> + <source>Recommended for raster tiles maps</source> + <translation>Anbefales for rasterfliser kart</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="387"/> + <source>Recommended for vector and raster tiles maps</source> + <translation>Annbefalt for vektor and raster kart</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="388"/> + <source>libosmscout with Geocoder-NLP</source> + <translation>libosmscout med Geocoder-NLP</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="389"/> + <source>libosmscout</source> + <translation>libosmscout</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="390"/> + <source>Custom</source> + <translation>Tilpasset</translation> + </message> </context> <context> <name>CountryDetailsPage</name> @@ -694,217 +724,217 @@ <context> <name>MapManager::Manager</name> <message> - <location filename="../src/mapmanager.cpp" line="70"/> + <location filename="../src/mapmanager.cpp" line="76"/> <source>Could not allocate Map Manager features</source> <translation>Kunne ikke allokere Kart Behandler funksjonen</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="116"/> + <location filename="../src/mapmanager.cpp" line="122"/> <source>Storage folder changed to %1</source> <translation>Lagringsmappe endret til %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="123"/> + <location filename="../src/mapmanager.cpp" line="129"/> <source>Maps storage folder does not exist: %1</source> <translation>Kart lagringsmappen finnes ikke: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="126"/> + <location filename="../src/mapmanager.cpp" line="132"/> <source>Maps storage folder path does not point to a directory: %1</source> <translation>Kart lagringsmappestien peker ikke på en mappe: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="132"/> + <location filename="../src/mapmanager.cpp" line="138"/> <source>Maps storage folder is not writable, please adjust permissions for %1</source> <translation>Kart lagringsmappen er skrivebeskyttet. vennligst endre rettighetene for %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="185"/> - <location filename="../src/mapmanager.cpp" line="187"/> + <location filename="../src/mapmanager.cpp" line="191"/> + <location filename="../src/mapmanager.cpp" line="193"/> <source>Failed to open the database for tracking downloaded files</source> <translation>Kunne ikke åpne database for sporing av nedlastede filer</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="188"/> + <location filename="../src/mapmanager.cpp" line="194"/> <source>Map Manager functionality would be disturbed</source> <translation>Map Manager funksjonalitet ville bli forstyrret</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="250"/> + <location filename="../src/mapmanager.cpp" line="256"/> <source>Cannot create directory without any name</source> <translation>Kan ikke lage mappe uten navn</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="257"/> + <location filename="../src/mapmanager.cpp" line="263"/> <source>Error creating directory %1</source> <translation>Feil ved oppretting av mappe %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="304"/> + <location filename="../src/mapmanager.cpp" line="310"/> <source>Address parsing language support</source> <translation>Adresse oppdeling språkstøtte</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="337"/> - <location filename="../src/mapmanager.cpp" line="808"/> - <location filename="../src/mapmanager.cpp" line="937"/> + <location filename="../src/mapmanager.cpp" line="343"/> + <location filename="../src/mapmanager.cpp" line="814"/> + <location filename="../src/mapmanager.cpp" line="943"/> <source>Maps storage folder does not exist: </source> <translation>Kart lagringsmappen finnes ikke:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="346"/> - <location filename="../src/mapmanager.cpp" line="815"/> + <location filename="../src/mapmanager.cpp" line="352"/> + <location filename="../src/mapmanager.cpp" line="821"/> <source>No maps were requested</source> <translation>Ingen kart ble forespurt</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="367"/> + <location filename="../src/mapmanager.cpp" line="373"/> <source>No maps loaded: %1</source> <translation>Ingen kart lastet: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="842"/> + <location filename="../src/mapmanager.cpp" line="848"/> <source>%1: version of dataset for %2 is not supported</source> <translation>%1: versjon av datasettet for %2 støttes ikke</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="393"/> + <location filename="../src/mapmanager.cpp" line="399"/> <source>Missing dataset for %1: %2</source> <translation>Manglende datasett for %1: %2</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="306"/> + <location filename="../src/mapmanager.cpp" line="312"/> <source>Mapnik World coastlines</source> <translation>Mapnik verdens kystlinjer</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="308"/> + <location filename="../src/mapmanager.cpp" line="314"/> <source>Mapbox GL World overlay</source> <translation>Mapbox GL verdens overlegg</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="310"/> + <location filename="../src/mapmanager.cpp" line="316"/> <source>Mapbox GL fonts</source> <translation>Mapbox GL fonter</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="440"/> + <location filename="../src/mapmanager.cpp" line="446"/> <source>Available country or territory: </source> <translation>Tilgjengelig land eller territorium:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="641"/> + <location filename="../src/mapmanager.cpp" line="647"/> <source>World</source> <translation>Verden</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="705"/> + <location filename="../src/mapmanager.cpp" line="711"/> <source>Removing country from requested list: </source> <translation>Fjerner landet fra forespurt listen:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="863"/> + <location filename="../src/mapmanager.cpp" line="869"/>

@@ -97,25 +97,55 @@ <context> <name>AppSettings</name> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mph</source> <translation>mpu</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mi.</source> <translation>mi.</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km/h</source> <translation>km/u</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km</source> <translation>km</translation> </message> + <message> + <location filename="../src/appsettings.cpp" line="385"/> + <source>Default</source> + <translation>Standaard</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="386"/> + <source>Recommended for raster tiles maps</source> + <translation>Aanbevolen voor kaarten op basis van rastertegels</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="387"/> + <source>Recommended for vector and raster tiles maps</source> + <translation>Aanbevolen voor kaarten op basis van vector- en rastertegels</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="388"/> + <source>libosmscout with Geocoder-NLP</source> + <translation>libosmscout met Geocoder-NLP</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="389"/> + <source>libosmscout</source> + <translation>libosmscout</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="390"/> + <source>Custom</source> + <translation>Aangepast</translation> + </message> </context> <context> <name>CountryDetailsPage</name> @@ -694,217 +724,217 @@ <context> <name>MapManager::Manager</name> <message> - <location filename="../src/mapmanager.cpp" line="70"/> + <location filename="../src/mapmanager.cpp" line="76"/> <source>Could not allocate Map Manager features</source> <translation>Kon kaartbeheerderfunctionaliteit niet toewijzen</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="116"/> + <location filename="../src/mapmanager.cpp" line="122"/> <source>Storage folder changed to %1</source> <translation>Opslagmap gewijzigd naar %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="123"/> + <location filename="../src/mapmanager.cpp" line="129"/> <source>Maps storage folder does not exist: %1</source> <translation>Kaartopslagmap bestaat niet: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="126"/> + <location filename="../src/mapmanager.cpp" line="132"/> <source>Maps storage folder path does not point to a directory: %1</source> <translation>Pad voor kaartopslagmap verwijst niet naar een map: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="132"/> + <location filename="../src/mapmanager.cpp" line="138"/> <source>Maps storage folder is not writable, please adjust permissions for %1</source> <translation>Kaartopslagmap is alleen-lezen, pas de toegangsrechten voor %1 aan</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="185"/> - <location filename="../src/mapmanager.cpp" line="187"/> + <location filename="../src/mapmanager.cpp" line="191"/> + <location filename="../src/mapmanager.cpp" line="193"/> <source>Failed to open the database for tracking downloaded files</source> <translation>Openen van database voor het volgen van gedownloade bestanden mislukt</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="188"/> + <location filename="../src/mapmanager.cpp" line="194"/> <source>Map Manager functionality would be disturbed</source> <translation>Functionaliteit van Kaartbeheerder zou worden verstoord</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="250"/> + <location filename="../src/mapmanager.cpp" line="256"/> <source>Cannot create directory without any name</source> <translation>Kan geen naamloze map aanmaken</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="257"/> + <location filename="../src/mapmanager.cpp" line="263"/> <source>Error creating directory %1</source> <translation>Fout bij aanmaken van map %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="304"/> + <location filename="../src/mapmanager.cpp" line="310"/> <source>Address parsing language support</source> <translation>Adresverwerkingstaalondersteuning</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="337"/> - <location filename="../src/mapmanager.cpp" line="808"/> - <location filename="../src/mapmanager.cpp" line="937"/> + <location filename="../src/mapmanager.cpp" line="343"/> + <location filename="../src/mapmanager.cpp" line="814"/> + <location filename="../src/mapmanager.cpp" line="943"/> <source>Maps storage folder does not exist: </source> <translation>Kaartopslagmap bestaat niet:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="346"/> - <location filename="../src/mapmanager.cpp" line="815"/> + <location filename="../src/mapmanager.cpp" line="352"/> + <location filename="../src/mapmanager.cpp" line="821"/> <source>No maps were requested</source> <translation>Geen kaarten opgevraagd</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="367"/> + <location filename="../src/mapmanager.cpp" line="373"/> <source>No maps loaded: %1</source> <translation>Geen kaarten geladen: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="842"/> + <location filename="../src/mapmanager.cpp" line="848"/> <source>%1: version of dataset for %2 is not supported</source> <translation>%1: versie van gegevensset voor %2 wordt niet ondersteund</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="393"/> + <location filename="../src/mapmanager.cpp" line="399"/> <source>Missing dataset for %1: %2</source> <translation>Ontbrekende gegevensset voor %1: %2</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="306"/> + <location filename="../src/mapmanager.cpp" line="312"/> <source>Mapnik World coastlines</source> <translation>Mapnik-wereldkustlijnen</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="308"/> + <location filename="../src/mapmanager.cpp" line="314"/> <source>Mapbox GL World overlay</source> <translation>Mapbox GL-wereldoverlay</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="310"/> + <location filename="../src/mapmanager.cpp" line="316"/> <source>Mapbox GL fonts</source> <translation>Mapbox GL-lettertypen</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="440"/> + <location filename="../src/mapmanager.cpp" line="446"/> <source>Available country or territory: </source> <translation>Beschikbaar land of territorium:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="641"/> + <location filename="../src/mapmanager.cpp" line="647"/> <source>World</source> <translation>Wereld</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="705"/> + <location filename="../src/mapmanager.cpp" line="711"/> <source>Removing country from requested list: </source> <translation>Land wordt verwijderd van opgevraagde lijst:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="863"/> + <location filename="../src/mapmanager.cpp" line="869"/>

@@ -97,25 +97,55 @@ <context> <name>AppSettings</name> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mph</source> <translation>mpu</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mi.</source> <translation>mi.</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km/h</source> <translation>km/u</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km</source> <translation>km</translation> </message> + <message> + <location filename="../src/appsettings.cpp" line="385"/> + <source>Default</source> + <translation>Standaard</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="386"/> + <source>Recommended for raster tiles maps</source> + <translation>Aanbevolen voor kaarten op basis van rastertegels</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="387"/> + <source>Recommended for vector and raster tiles maps</source> + <translation>Aanbevolen voor kaarten op basis van vector- en rastertegels</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="388"/> + <source>libosmscout with Geocoder-NLP</source> + <translation>libosmscout met Geocoder-NLP</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="389"/> + <source>libosmscout</source> + <translation>libosmscout</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="390"/> + <source>Custom</source> + <translation>Aangepast</translation> + </message> </context> <context> <name>CountryDetailsPage</name> @@ -694,217 +724,217 @@ <context> <name>MapManager::Manager</name> <message> - <location filename="../src/mapmanager.cpp" line="70"/> + <location filename="../src/mapmanager.cpp" line="76"/> <source>Could not allocate Map Manager features</source> <translation>Kon kaartbeheerderfunctionaliteit niet toewijzen</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="116"/> + <location filename="../src/mapmanager.cpp" line="122"/> <source>Storage folder changed to %1</source> <translation>Opslagmap gewijzigd naar %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="123"/> + <location filename="../src/mapmanager.cpp" line="129"/> <source>Maps storage folder does not exist: %1</source> <translation>Kaartopslagmap bestaat niet: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="126"/> + <location filename="../src/mapmanager.cpp" line="132"/> <source>Maps storage folder path does not point to a directory: %1</source> <translation>Pad voor kaartopslagmap verwijst niet naar een map: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="132"/> + <location filename="../src/mapmanager.cpp" line="138"/> <source>Maps storage folder is not writable, please adjust permissions for %1</source> <translation>Kaartopslagmap is alleen-lezen, past de toegangsrechten voor %1 aan</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="185"/> - <location filename="../src/mapmanager.cpp" line="187"/> + <location filename="../src/mapmanager.cpp" line="191"/> + <location filename="../src/mapmanager.cpp" line="193"/> <source>Failed to open the database for tracking downloaded files</source> <translation>Openen van databank voor het volgen van gedownloade bestanden mislukt</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="188"/> + <location filename="../src/mapmanager.cpp" line="194"/> <source>Map Manager functionality would be disturbed</source> <translation>Functionaliteit van Kaartbeheerder zou verstoord worden</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="250"/> + <location filename="../src/mapmanager.cpp" line="256"/> <source>Cannot create directory without any name</source> <translation>Kan geen naamloze map aanmaken</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="257"/> + <location filename="../src/mapmanager.cpp" line="263"/> <source>Error creating directory %1</source> <translation>Fout bij aanmaken van map %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="304"/> + <location filename="../src/mapmanager.cpp" line="310"/> <source>Address parsing language support</source> <translation>Adresverwerkingstaalondersteuning</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="337"/> - <location filename="../src/mapmanager.cpp" line="808"/> - <location filename="../src/mapmanager.cpp" line="937"/> + <location filename="../src/mapmanager.cpp" line="343"/> + <location filename="../src/mapmanager.cpp" line="814"/> + <location filename="../src/mapmanager.cpp" line="943"/> <source>Maps storage folder does not exist: </source> <translation>Kaartopslagmap bestaat niet:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="346"/> - <location filename="../src/mapmanager.cpp" line="815"/> + <location filename="../src/mapmanager.cpp" line="352"/> + <location filename="../src/mapmanager.cpp" line="821"/> <source>No maps were requested</source> <translation>Geen kaarten opgevraagd</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="367"/> + <location filename="../src/mapmanager.cpp" line="373"/> <source>No maps loaded: %1</source> <translation>Geen kaarten geladen: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="842"/> + <location filename="../src/mapmanager.cpp" line="848"/> <source>%1: version of dataset for %2 is not supported</source> <translation>%1: versie van gegevensset voor %2 wordt niet ondersteund</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="393"/> + <location filename="../src/mapmanager.cpp" line="399"/> <source>Missing dataset for %1: %2</source> <translation>Ontbrekende gegevensset voor %1: %2</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="306"/> + <location filename="../src/mapmanager.cpp" line="312"/> <source>Mapnik World coastlines</source> <translation>Mapnik-wereldkustlijnen</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="308"/> + <location filename="../src/mapmanager.cpp" line="314"/> <source>Mapbox GL World overlay</source> <translation>Mapbox GL-wereldoverlay</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="310"/> + <location filename="../src/mapmanager.cpp" line="316"/> <source>Mapbox GL fonts</source> <translation>Mapbox GL-lettertypen</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="440"/> + <location filename="../src/mapmanager.cpp" line="446"/> <source>Available country or territory: </source> <translation>Beschikbaar land of territorium:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="641"/> + <location filename="../src/mapmanager.cpp" line="647"/> <source>World</source> <translation>Wereld</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="705"/> + <location filename="../src/mapmanager.cpp" line="711"/> <source>Removing country from requested list: </source> <translation>Land wordt verwijderd uit opgevraagde lijst:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="863"/> + <location filename="../src/mapmanager.cpp" line="869"/>

@@ -97,25 +97,55 @@ <context> <name>AppSettings</name> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mph</source> <translation>mph</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mi.</source> <translation>mi</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km/h</source> <translation>km/h</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km</source> <translation>km</translation> </message> + <message> + <location filename="../src/appsettings.cpp" line="385"/> + <source>Default</source> + <translation>Domyślny</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="386"/> + <source>Recommended for raster tiles maps</source> + <translation>Rekomendowane dla kafelków map rastrowych</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="387"/> + <source>Recommended for vector and raster tiles maps</source> + <translation>Zalecane dla kafelków map wektorowych i rastrowych</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="388"/> + <source>libosmscout with Geocoder-NLP</source> + <translation>libosmscout z Geocoder-NLP</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="389"/> + <source>libosmscout</source> + <translation>libosmscout</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="390"/> + <source>Custom</source> + <translation>Wybrany</translation> + </message> </context> <context> <name>CountryDetailsPage</name> @@ -694,217 +724,217 @@ <context> <name>MapManager::Manager</name> <message> - <location filename="../src/mapmanager.cpp" line="70"/> + <location filename="../src/mapmanager.cpp" line="76"/> <source>Could not allocate Map Manager features</source> <translation>Nie można przydzielić funkcji Map Manager'a</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="116"/> + <location filename="../src/mapmanager.cpp" line="122"/> <source>Storage folder changed to %1</source> <translation>Katalog przechowywania zmieniony na %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="123"/> + <location filename="../src/mapmanager.cpp" line="129"/> <source>Maps storage folder does not exist: %1</source> <translation>Katalog przechowywania map nie istnieje: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="126"/> + <location filename="../src/mapmanager.cpp" line="132"/> <source>Maps storage folder path does not point to a directory: %1</source> <translation>Ścieżka katalogu przechowywania map nie wskazuje katalogu: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="132"/> + <location filename="../src/mapmanager.cpp" line="138"/> <source>Maps storage folder is not writable, please adjust permissions for %1</source> <translation>Katalog przechowywania map nie ma uprawnień do zapisu, zmień jego uprawnienia na %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="185"/> - <location filename="../src/mapmanager.cpp" line="187"/> + <location filename="../src/mapmanager.cpp" line="191"/> + <location filename="../src/mapmanager.cpp" line="193"/> <source>Failed to open the database for tracking downloaded files</source> <translation>Niepowodzenie przy otwieraniu bazy danych śledzenia ściągniętych plików</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="188"/> + <location filename="../src/mapmanager.cpp" line="194"/> <source>Map Manager functionality would be disturbed</source> <translation>Funkcjonalność Managera Map może być zakłócona</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="250"/> + <location filename="../src/mapmanager.cpp" line="256"/> <source>Cannot create directory without any name</source> <translation>Nie można utworzyć katalogu bez nazwy</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="257"/> + <location filename="../src/mapmanager.cpp" line="263"/> <source>Error creating directory %1</source> <translation>Błąd podczas tworzenia katalogu %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="304"/> + <location filename="../src/mapmanager.cpp" line="310"/> <source>Address parsing language support</source> <translation>Wsparcie parsowanie adresu języka</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="337"/> - <location filename="../src/mapmanager.cpp" line="808"/> - <location filename="../src/mapmanager.cpp" line="937"/> + <location filename="../src/mapmanager.cpp" line="343"/> + <location filename="../src/mapmanager.cpp" line="814"/> + <location filename="../src/mapmanager.cpp" line="943"/> <source>Maps storage folder does not exist: </source> <translation>Katalog z mapami nie istnieje</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="346"/> - <location filename="../src/mapmanager.cpp" line="815"/> + <location filename="../src/mapmanager.cpp" line="352"/> + <location filename="../src/mapmanager.cpp" line="821"/> <source>No maps were requested</source> <translation>Nie wybrano map</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="367"/> + <location filename="../src/mapmanager.cpp" line="373"/> <source>No maps loaded: %1</source> <translation>Brak załadowanych map: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="842"/> + <location filename="../src/mapmanager.cpp" line="848"/> <source>%1: version of dataset for %2 is not supported</source> <translation>%1: wersja zbioru danych dla %2 jest nie wspierana</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="393"/> + <location filename="../src/mapmanager.cpp" line="399"/> <source>Missing dataset for %1: %2</source> <translation>Brakujący zbiór danych dla %1: %2</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="306"/> + <location filename="../src/mapmanager.cpp" line="312"/> <source>Mapnik World coastlines</source> <translation>Wybrzeża świata Mapnik</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="308"/> + <location filename="../src/mapmanager.cpp" line="314"/> <source>Mapbox GL World overlay</source> <translation>Nakładka Mapbox GL World</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="310"/> + <location filename="../src/mapmanager.cpp" line="316"/> <source>Mapbox GL fonts</source> <translation>Czcionki Mapbox GL</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="440"/> + <location filename="../src/mapmanager.cpp" line="446"/> <source>Available country or territory: </source> <translation>Dostępne państwa lub terytoria:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="641"/> + <location filename="../src/mapmanager.cpp" line="647"/> <source>World</source> <translation>Świat</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="705"/> + <location filename="../src/mapmanager.cpp" line="711"/> <source>Removing country from requested list: </source> <translation>Usuwanie państwa z listy żądanych:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="863"/> + <location filename="../src/mapmanager.cpp" line="869"/>

@@ -26,7 +26,7 @@ <message> <location filename="../qml/AboutPage.qml" line="44"/> <source>Banner photo by %1 (%2 licanse).</source> - <translation type="unfinished"></translation> + <translation>Фото на баннере от %1 (лицензия %2).</translation> </message> <message> <location filename="../qml/AboutPage.qml" line="46"/> @@ -97,25 +97,55 @@ <context> <name>AppSettings</name> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mph</source> <translation>миль/ч</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mi.</source> <translation>миль</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km/h</source> <translation>км/ч</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km</source> <translation>км</translation> </message> + <message> + <location filename="../src/appsettings.cpp" line="385"/> + <source>Default</source> + <translation>По умолчанию</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="386"/> + <source>Recommended for raster tiles maps</source> + <translation>Рекомендовано для растровых карт</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="387"/> + <source>Recommended for vector and raster tiles maps</source> + <translation>Рекомендовано для карт с векторными и растровыми тайлами</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="388"/> + <source>libosmscout with Geocoder-NLP</source> + <translation>libosmscout и Geocoder-NLP</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="389"/> + <source>libosmscout</source> + <translation>libosmscout</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="390"/> + <source>Custom</source> + <translation>Пользовательский</translation> + </message> </context> <context> <name>CountryDetailsPage</name> @@ -694,217 +724,217 @@ <context> <name>MapManager::Manager</name> <message> - <location filename="../src/mapmanager.cpp" line="70"/> + <location filename="../src/mapmanager.cpp" line="76"/> <source>Could not allocate Map Manager features</source> <translation>Невозможно назначить параметры Диспетчера Карт</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="116"/> + <location filename="../src/mapmanager.cpp" line="122"/> <source>Storage folder changed to %1</source> <translation>Папка хранения изменена на %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="123"/> + <location filename="../src/mapmanager.cpp" line="129"/> <source>Maps storage folder does not exist: %1</source> <translation>Нет папки для хранения карт: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="126"/> + <location filename="../src/mapmanager.cpp" line="132"/> <source>Maps storage folder path does not point to a directory: %1</source> <translation>Путь папки хранения карт не указывает на каталог: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="132"/> + <location filename="../src/mapmanager.cpp" line="138"/> <source>Maps storage folder is not writable, please adjust permissions for %1</source> <translation>Папка хранения карт недоступна для записи. Необходимо изменить разрешения для %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="185"/> - <location filename="../src/mapmanager.cpp" line="187"/> + <location filename="../src/mapmanager.cpp" line="191"/> + <location filename="../src/mapmanager.cpp" line="193"/> <source>Failed to open the database for tracking downloaded files</source> <translation>Невозможно открыть базу данных для отслеживания загруженных файлов</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="188"/> + <location filename="../src/mapmanager.cpp" line="194"/> <source>Map Manager functionality would be disturbed</source> <translation>Функциональность Диспетчера Карт возможно нарушена</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="250"/> + <location filename="../src/mapmanager.cpp" line="256"/> <source>Cannot create directory without any name</source> <translation>Невозможно создать каталог без имени</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="257"/> + <location filename="../src/mapmanager.cpp" line="263"/> <source>Error creating directory %1</source> <translation>Ошибка создания каталога %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="304"/> + <location filename="../src/mapmanager.cpp" line="310"/> <source>Address parsing language support</source> <translation>Поддержка языка анализа адреса</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="337"/> - <location filename="../src/mapmanager.cpp" line="808"/> - <location filename="../src/mapmanager.cpp" line="937"/> + <location filename="../src/mapmanager.cpp" line="343"/> + <location filename="../src/mapmanager.cpp" line="814"/> + <location filename="../src/mapmanager.cpp" line="943"/> <source>Maps storage folder does not exist: </source> <translation>Папка хранения карт отсутствует</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="346"/> - <location filename="../src/mapmanager.cpp" line="815"/> + <location filename="../src/mapmanager.cpp" line="352"/> + <location filename="../src/mapmanager.cpp" line="821"/> <source>No maps were requested</source> <translation>Карты не были запрошены</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="367"/> + <location filename="../src/mapmanager.cpp" line="373"/> <source>No maps loaded: %1</source> <translation>Карты не загружены: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="842"/> + <location filename="../src/mapmanager.cpp" line="848"/> <source>%1: version of dataset for %2 is not supported</source> <translation>%1: версия набора данных для %2 не поддерживается</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="393"/> + <location filename="../src/mapmanager.cpp" line="399"/> <source>Missing dataset for %1: %2</source> <translation>Отсутствует набор данных для %1: %2</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="306"/> + <location filename="../src/mapmanager.cpp" line="312"/> <source>Mapnik World coastlines</source> <translation>Береговые линии земного шара от Mapnik</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="308"/> + <location filename="../src/mapmanager.cpp" line="314"/> <source>Mapbox GL World overlay</source> <translation>Наложение по земному шару от Mapbox GL</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="310"/> + <location filename="../src/mapmanager.cpp" line="316"/> <source>Mapbox GL fonts</source> <translation>Шрифты Mapbox GL</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="440"/> + <location filename="../src/mapmanager.cpp" line="446"/> <source>Available country or territory: </source> <translation>Доступна страна или территория</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="641"/> + <location filename="../src/mapmanager.cpp" line="647"/> <source>World</source> <translation>Планета</translation> </message>

@@ -26,7 +26,7 @@ <message> <location filename="../qml/AboutPage.qml" line="44"/> <source>Banner photo by %1 (%2 licanse).</source> - <translation type="unfinished"></translation> + <translation>Banderollfoto av %1 (%2-licens).</translation> </message> <message> <location filename="../qml/AboutPage.qml" line="46"/> @@ -97,25 +97,55 @@ <context> <name>AppSettings</name> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mph</source> <translation>mph</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mi.</source> <translation>mi.</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km/h</source> <translation>km/h</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km</source> <translation>km</translation> </message> + <message> + <location filename="../src/appsettings.cpp" line="385"/> + <source>Default</source> + <translation>Standard</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="386"/> + <source>Recommended for raster tiles maps</source> + <translation>Rekommenderas för rasterkartor</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="387"/> + <source>Recommended for vector and raster tiles maps</source> + <translation>Rekommenderas för vektor- och rasterbaserade kartrutor</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="388"/> + <source>libosmscout with Geocoder-NLP</source> + <translation>libosmscout med Geocoder-NLP</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="389"/> + <source>libosmscout</source> + <translation>libosmscout</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="390"/> + <source>Custom</source> + <translation>Anpassad</translation> + </message> </context> <context> <name>CountryDetailsPage</name> @@ -694,217 +724,217 @@ <context> <name>MapManager::Manager</name> <message> - <location filename="../src/mapmanager.cpp" line="70"/> + <location filename="../src/mapmanager.cpp" line="76"/> <source>Could not allocate Map Manager features</source> <translation>Kunde inte allokera karthanteringsfunktioner</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="116"/> + <location filename="../src/mapmanager.cpp" line="122"/> <source>Storage folder changed to %1</source> <translation>Lagringsmappen ändrad till %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="123"/> + <location filename="../src/mapmanager.cpp" line="129"/> <source>Maps storage folder does not exist: %1</source> <translation>Kartlagringsmappen finns inte: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="126"/> + <location filename="../src/mapmanager.cpp" line="132"/> <source>Maps storage folder path does not point to a directory: %1</source> <translation>Sökvägen för kartlagring pekar inte mot någon mapp: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="132"/> + <location filename="../src/mapmanager.cpp" line="138"/> <source>Maps storage folder is not writable, please adjust permissions for %1</source> <translation>Kartlagringsmappen är inte skrivbar, justera rättigheterna för %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="185"/> - <location filename="../src/mapmanager.cpp" line="187"/> + <location filename="../src/mapmanager.cpp" line="191"/> + <location filename="../src/mapmanager.cpp" line="193"/> <source>Failed to open the database for tracking downloaded files</source> <translation>Kunde inte öppna databasen för att spåra nerladdade filer</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="188"/> + <location filename="../src/mapmanager.cpp" line="194"/> <source>Map Manager functionality would be disturbed</source> <translation>Karthanteringsfunktioner kommer att störas</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="250"/> + <location filename="../src/mapmanager.cpp" line="256"/> <source>Cannot create directory without any name</source> <translation>Kan inte skapa en mapp utan namn</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="257"/> + <location filename="../src/mapmanager.cpp" line="263"/> <source>Error creating directory %1</source> <translation>Kunde inte skapa mappen %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="304"/> + <location filename="../src/mapmanager.cpp" line="310"/> <source>Address parsing language support</source> <translation>Språkstöd för adresstolkning</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="337"/> - <location filename="../src/mapmanager.cpp" line="808"/> - <location filename="../src/mapmanager.cpp" line="937"/> + <location filename="../src/mapmanager.cpp" line="343"/> + <location filename="../src/mapmanager.cpp" line="814"/> + <location filename="../src/mapmanager.cpp" line="943"/> <source>Maps storage folder does not exist: </source> <translation>Kartlagringsmappen finns inte: </translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="346"/> - <location filename="../src/mapmanager.cpp" line="815"/> + <location filename="../src/mapmanager.cpp" line="352"/> + <location filename="../src/mapmanager.cpp" line="821"/> <source>No maps were requested</source> <translation>Inga kartor efterfrågades</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="367"/> + <location filename="../src/mapmanager.cpp" line="373"/> <source>No maps loaded: %1</source> <translation>Inga kartor inlästa: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="842"/> + <location filename="../src/mapmanager.cpp" line="848"/> <source>%1: version of dataset for %2 is not supported</source> <translation>%1: Dataupssättningsversionen för %2 stöds inte</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="393"/> + <location filename="../src/mapmanager.cpp" line="399"/> <source>Missing dataset for %1: %2</source> <translation>Saknad datamängd för %1: %2</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="306"/> + <location filename="../src/mapmanager.cpp" line="312"/> <source>Mapnik World coastlines</source> <translation>Mapnik World kustlinjer</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="308"/> + <location filename="../src/mapmanager.cpp" line="314"/> <source>Mapbox GL World overlay</source> <translation>Mapbox GL World överlager</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="310"/> + <location filename="../src/mapmanager.cpp" line="316"/> <source>Mapbox GL fonts</source> <translation>Mapbox GL teckensnitt</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="440"/> + <location filename="../src/mapmanager.cpp" line="446"/> <source>Available country or territory: </source> <translation>Tillgängligt land eller område: </translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="641"/> + <location filename="../src/mapmanager.cpp" line="647"/> <source>World</source> <translation>Världen</translation> </message>

@@ -97,25 +97,55 @@ <context> <name>AppSettings</name> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mph</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mi.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km/h</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/appsettings.cpp" line="385"/> + <source>Default</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="386"/> + <source>Recommended for raster tiles maps</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="387"/> + <source>Recommended for vector and raster tiles maps</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="388"/> + <source>libosmscout with Geocoder-NLP</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="389"/> + <source>libosmscout</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="390"/> + <source>Custom</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CountryDetailsPage</name> @@ -694,217 +724,217 @@ <context> <name>MapManager::Manager</name> <message> - <location filename="../src/mapmanager.cpp" line="70"/> + <location filename="../src/mapmanager.cpp" line="76"/> <source>Could not allocate Map Manager features</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="116"/> + <location filename="../src/mapmanager.cpp" line="122"/> <source>Storage folder changed to %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="123"/> + <location filename="../src/mapmanager.cpp" line="129"/> <source>Maps storage folder does not exist: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="126"/> + <location filename="../src/mapmanager.cpp" line="132"/> <source>Maps storage folder path does not point to a directory: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="132"/> + <location filename="../src/mapmanager.cpp" line="138"/> <source>Maps storage folder is not writable, please adjust permissions for %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="185"/> - <location filename="../src/mapmanager.cpp" line="187"/> + <location filename="../src/mapmanager.cpp" line="191"/> + <location filename="../src/mapmanager.cpp" line="193"/> <source>Failed to open the database for tracking downloaded files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="188"/> + <location filename="../src/mapmanager.cpp" line="194"/> <source>Map Manager functionality would be disturbed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="250"/> + <location filename="../src/mapmanager.cpp" line="256"/> <source>Cannot create directory without any name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="257"/> + <location filename="../src/mapmanager.cpp" line="263"/> <source>Error creating directory %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="304"/> + <location filename="../src/mapmanager.cpp" line="310"/> <source>Address parsing language support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="337"/> - <location filename="../src/mapmanager.cpp" line="808"/> - <location filename="../src/mapmanager.cpp" line="937"/> + <location filename="../src/mapmanager.cpp" line="343"/> + <location filename="../src/mapmanager.cpp" line="814"/> + <location filename="../src/mapmanager.cpp" line="943"/> <source>Maps storage folder does not exist: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="346"/> - <location filename="../src/mapmanager.cpp" line="815"/> + <location filename="../src/mapmanager.cpp" line="352"/> + <location filename="../src/mapmanager.cpp" line="821"/> <source>No maps were requested</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="367"/> + <location filename="../src/mapmanager.cpp" line="373"/> <source>No maps loaded: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="842"/> + <location filename="../src/mapmanager.cpp" line="848"/> <source>%1: version of dataset for %2 is not supported</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="393"/> + <location filename="../src/mapmanager.cpp" line="399"/> <source>Missing dataset for %1: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="306"/> + <location filename="../src/mapmanager.cpp" line="312"/> <source>Mapnik World coastlines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="308"/> + <location filename="../src/mapmanager.cpp" line="314"/> <source>Mapbox GL World overlay</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="310"/> + <location filename="../src/mapmanager.cpp" line="316"/> <source>Mapbox GL fonts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="440"/> + <location filename="../src/mapmanager.cpp" line="446"/> <source>Available country or territory: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="641"/> + <location filename="../src/mapmanager.cpp" line="647"/> <source>World</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="705"/> + <location filename="../src/mapmanager.cpp" line="711"/> <source>Removing country from requested list: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="863"/> + <location filename="../src/mapmanager.cpp" line="869"/>

@@ -1,7 +1,7 @@ Name: harbour-osmscout-server Summary: OSM Scout Server # don't forget to set the version in osmscout-server.pro as well -Version: 1.15.0 +Version: 1.15.5 Release: 1 # The contents of the Group field should be one of the groups listed here: # http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS

[-] [+]	Changed	_service:tar_git:harbour-osmscout-server.spec
@@ -15,7 +15,7 @@ %{!?qtc_make:%define qtc_make make} %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: OSM Scout Server -Version: 1.15.0 +Version: 1.15.5 Release: 1 Group: Qt/Qt License: GPLv3
[-] [+]	Changed	_service:tar_git:harbour-osmscout-server-1.15.5.tar.bz2/packaging/osmscout-server.appdata.xml ^
@@ -39,6 +39,18 @@ </screenshots> <metadata_license>CC-BY-SA-3.0</metadata_license> <releases> + <release version="1.15.0" date="2019-09-22"> + <description> + <ul> + <li>Update Valhalla to 3.0.x</li> + <li>Support for DBus activation</li> + <li>Add root DBus API</li> + <li>Specify full path in systemd service invocation</li> + <li>Update translations</li> + <li>Bugfixes</li> + </ul> + </description> + </release> <release version="1.14.5" date="2019-05-22"> <description> <ul>
[-] [+]	Changed	_service:tar_git:harbour-osmscout-server-1.15.5.tar.bz2/qml/ProfilesPage.qml ^
@@ -45,16 +45,10 @@ id: profileSelection enabled: manager.ready label: qsTr("Profile") - model: [ - qsTr("Default"), - qsTr("Recommended for raster tiles maps"), - qsTr("Recommended for vector and raster tiles maps"), - qsTr("<i>libosmscout</i> with <i>Geocoder-NLP</i>"), - qsTr("<i>libosmscout</i>"), - qsTr("Custom") - ] - - Component.onCompleted: currentIndex = settings.valueInt(settingsGeneralPrefix + "profile") + model: settings.availableProfiles() + Component.onCompleted: { + currentIndex = settings.currentProfile(); + } } ListItemLabel { @@ -92,10 +86,15 @@ "the user is responsible for adjusting the settings to make them consistent between requirements of " + "the used backends and storage." ) } + + ListItemLabel { + font.pixelSize: styler.themeFontSizeMedium + text: qsTr("Please note that some profiles maybe missing due to the packaging of OSM Scout Server.") + } } onAccepted: { if (manager.ready) - settings.setValue(settingsGeneralPrefix + "profile", profileSelection.currentIndex) + settings.setCurrentProfile(profileSelection.currentIndex) } }
[-] [+]	Changed	_service:tar_git:harbour-osmscout-server-1.15.5.tar.bz2/qml/SettingsPage.qml ^
@@ -70,8 +70,9 @@ /////////////////////////////////////// /// systemd support Column { - width: parent.width spacing: styler.themePaddingMedium + visible: settings.hasBackendSystemD + width: parent.width TextSwitchPL { id: systemdEnable @@ -164,11 +165,13 @@ SectionHeaderPL { text: qsTr("Rendering") + visible: cbMapnik.visible } ListItemLabel { font.pixelSize: styler.themeFontSizeSmall text: qsTr("Rendering backend is responsible for drawing the maps on raster tiles.") + visible: cbMapnik.visible } ComboBoxPL { @@ -179,6 +182,7 @@ qsTr("Mapnik (default)"), qsTr("libosmscout") ] + visible: settings.hasBackendMapnik && settings.hasBackendOsmScout Component.onCompleted: { if (settings.valueInt(settingsMapnikPrefix + "use_mapnik") > 0) currentIndex = 0; @@ -189,12 +193,14 @@ SectionHeaderPL { text: qsTr("Geocoder") + visible: cbGeocoder.visible } ListItemLabel { font.pixelSize: styler.themeFontSizeSmall text: qsTr("Geocoder is responsible for resolving search requests. " + "For that, it parses the search string and finds the corresponding objects on a map.") + visible: cbGeocoder.visible } ComboBoxPL { @@ -205,6 +211,7 @@ qsTr("Geocoder-NLP (default)"), qsTr("libosmscout") ] + visible: settings.hasBackendOsmScout Component.onCompleted: { if (settings.valueInt(settingsGeomasterPrefix + "use_geocoder_nlp") > 0) currentIndex = 0; @@ -217,16 +224,18 @@ font.pixelSize: styler.themeFontSizeSmall text: qsTr("NB! If you select <i>Geocoder-NLP</i>, please specify languages that should be used for " + "address parsing in the backend settings below. Otherwise, the server could use large amounts of RAM.") - visible: cbGeocoder.currentIndex === 0 + visible: cbGeocoder.currentIndex === 0 && cbGeocoder.visible } SectionHeaderPL { text: qsTr("Routing Engine") + visible: cbRouter.visible } ListItemLabel { font.pixelSize: styler.themeFontSizeSmall text: qsTr("Routing engine is responsible for calculating routes between origin and destination.") + visible: cbRouter.visible } ComboBoxPL { @@ -237,6 +246,7 @@ qsTr("Valhalla (default)"), qsTr("libosmscout") ] + visible: settings.hasBackendMapnik && settings.hasBackendOsmScout Component.onCompleted: { if (settings.valueInt(settingsValhallaPrefix + "use_valhalla") > 0) currentIndex = 0; @@ -253,6 +263,7 @@ Column { width: parent.width spacing: styler.themePaddingMedium + visible: settings.hasBackendMapnik ButtonPL { anchors.horizontalCenter: parent.horizontalCenter @@ -293,6 +304,7 @@ Column { width: parent.width spacing: styler.themePaddingMedium + visible: settings.hasBackendValhalla Rectangle { color: "transparent" @@ -316,6 +328,7 @@ Column { width: parent.width spacing: styler.themePaddingMedium + visible: settings.hasBackendOsmScout Rectangle { width: parent.width @@ -389,15 +402,20 @@ settings.setValue(settingsGeneralPrefix + "language", preferredLanguageSelection.currentIndex) eMapsRoot.apply() - settings.setValue(settingsMapnikPrefix + "use_mapnik", cbMapnik.currentIndex ? 0 : 1) - settings.setValue(settingsGeomasterPrefix + "use_geocoder_nlp", cbGeocoder.currentIndex ? 0 : 1) - settings.setValue(settingsValhallaPrefix + "use_valhalla", cbRouter.currentIndex ? 0 : 1) + if (cbMapnik.visible) + settings.setValue(settingsMapnikPrefix + "use_mapnik", cbMapnik.currentIndex ? 0 : 1) + if (cbGeocoder.visible) + settings.setValue(settingsGeomasterPrefix + "use_geocoder_nlp", cbGeocoder.currentIndex ? 0 : 1) + if (cbRouter.visible) + settings.setValue(settingsValhallaPrefix + "use_valhalla", cbRouter.currentIndex ? 0 : 1) /// units are changed the last settings.setValue(settingsGeneralPrefix + "units", unitsBox.currentIndex) - systemd_service.enabled = systemdEnable.checked - idleTimeout.apply() + if (settings.hasBackendSystemD) { + systemd_service.enabled = systemdEnable.checked + idleTimeout.apply() + } } function checkState() {
[-] [+]	Changed	_service:tar_git:harbour-osmscout-server-1.15.5.tar.bz2/src/appsettings.cpp ^
@@ -1,18 +1,18 @@ /* * Copyright (C) 2016-2018 Rinigus https://github.com/rinigus - * + * * This file is part of OSM Scout Server. - * + * * 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 <https://www.gnu.org/licenses/>. */ @@ -35,10 +35,11 @@ AppSettings::AppSettings(): QSettings() { + m_available_profile_index = availableProfilesIndex(); } -#define CHECK(s, d) if (!contains(s)) QSettings::setValue(s, d); -#define CHECKF(s, d) if (!contains(s)) QSettings::setValue(s, (double)d); +#define CHECK(s, d) if (!contains(s)) QSettings::setValue(s, d) +#define CHECKF(s, d) if (!contains(s)) QSettings::setValue(s, (double)d) void AppSettings::initDefaults() { // defaults for server @@ -49,7 +50,7 @@ /// general settings CHECK(GENERAL_SETTINGS "units", 0); - CHECK(GENERAL_SETTINGS "profile", 0); + CHECK(GENERAL_SETTINGS "profile", defaultProfile()); CHECK(GENERAL_SETTINGS "language", 0); CHECK(GENERAL_SETTINGS "rollingLoggerSize", 10); @@ -88,7 +89,7 @@ /// defaults for libosmscout /// used internally by MapManager to set the path - will be modified when support - /// for multi-map handling is be ready + /// for multi-map handling will be ready CHECK(OSM_SETTINGS "map", ""); CHECK(OSM_SETTINGS "style", DATA_PREFIX "styles/osmscout/stylesheets/standard.oss"); @@ -135,7 +136,10 @@ setValue(OSM_SETTINGS "icons", icons); } - CHECK(GEOMASTER_SETTINGS "use_geocoder_nlp", 0); + ///////////////////////////////////////// + /// geocoder-nlp settings + + CHECK(GEOMASTER_SETTINGS "use_geocoder_nlp", 1); CHECK(GEOMASTER_SETTINGS "initialize_every_call", 0); CHECK(GEOMASTER_SETTINGS "use_postal", 1); CHECK(GEOMASTER_SETTINGS "use_primitive", 1); @@ -200,21 +204,48 @@ /// location of styles changed in version 3 if (m_last_run_version < 3) - { + { setValue(OSM_SETTINGS "style", DATA_PREFIX "styles/osmscout/stylesheets/standard.oss"); setValue(OSM_SETTINGS "icons", DATA_PREFIX "styles/osmscout/icons/28x28/standard"); setValue(MAPNIKMASTER_SETTINGS "styles_dir", DATA_PREFIX "styles/mapnik"); - } + } /// profiles changed from version 2 to version 4 if (m_last_run_version < 4) - { + { int old_profile = valueInt(GENERAL_SETTINGS "profile"); int new_profile = old_profile; if (old_profile == 0) new_profile = 1; else if (old_profile == 1) new_profile = 0; setValue(GENERAL_SETTINGS "profile", new_profile); - } + } + + /////////////////////////////////////////// + /// check and update settings in accordance + /// with the available backends + + if (!m_available_profile_index.contains(valueInt(GENERAL_SETTINGS "profile"))) + setValue(GENERAL_SETTINGS "profile", defaultProfile()); + + if (!hasBackendOsmScout()) + { + setValue(MAPMANAGER_SETTINGS "osmscout", 0); + setValue(GEOMASTER_SETTINGS "use_geocoder_nlp", 1); + setValue(MAPNIKMASTER_SETTINGS "use_mapnik", 1); + setValue(VALHALLA_MASTER_SETTINGS "use_valhalla", 1); + } + + if (!hasBackendMapnik() && hasBackendOsmScout()) + { + setValue(MAPMANAGER_SETTINGS "mapnik", 0); + setValue(MAPNIKMASTER_SETTINGS "use_mapnik", 0); + } + + if (!hasBackendValhalla() && hasBackendOsmScout()) + { + setValue(MAPMANAGER_SETTINGS "valhalla", 0); + setValue(VALHALLA_MASTER_SETTINGS "use_valhalla", 0); + } /// set profile if specified (after all version checks) setProfile(); @@ -264,22 +295,22 @@ } -int AppSettings::valueInt(const QString &key) +int AppSettings::valueInt(const QString &key) const { return value(key, 0).toInt(); } -bool AppSettings::valueBool(const QString &key) +bool AppSettings::valueBool(const QString &key) const { return (value(key, 0).toInt() > 0); } -double AppSettings::valueFloat(const QString &key) +double AppSettings::valueFloat(const QString &key) const { - return value(key, 0).toFloat(); + return value(key, 0).toDouble(); } -QString AppSettings::valueString(const QString &key) +QString AppSettings::valueString(const QString &key) const { return value(key, QString()).toString(); } @@ -341,16 +372,69 @@ } /////////////////////////////////////////////////////// -/// NB! Profiles have to be in sync here with the -/// QML Profile page +/// NB! Profiles have to be set using either local +/// indexes (exposed methods) or internally via +/// configuration settings (protected methods) /////////////////////////////////////////////////////// +QStringList AppSettings::availableProfiles() const +{ + // compose list of locally available profile descriptions + QStringList l; + const QList<int> &prof = m_available_profile_index; + if (prof.contains(0)) l << tr("Default"); + if (prof.contains(1)) l << tr("Recommended for raster tiles maps"); + if (prof.contains(2)) l << tr("Recommended for vector and raster tiles maps"); + if (prof.contains(3)) l << tr("<i>libosmscout</i> with <i>Geocoder-NLP</i>"); + if (prof.contains(4)) l << tr("<i>libosmscout</i>"); + if (prof.contains(5)) l << tr("Custom"); + return l; +} + +int AppSettings::currentProfile() const +{ + const QList<int> &prof = m_available_profile_index; + int index = valueInt(GENERAL_SETTINGS "profile"); + return prof.indexOf(index); +} + +void AppSettings::setCurrentProfile(int profile) +{ + if (profile > 0 && profile < m_available_profile_index.size()) + setValue(GENERAL_SETTINGS "profile", m_available_profile_index[profile]); +} + +QList<int> AppSettings::availableProfilesIndex() const +{ + // uses universal profile indexes + QList<int> prof; + if (hasBackendValhalla()) prof.append(0); + if (hasBackendMapnik() && hasBackendValhalla()) prof.append(1); + if (hasBackendMapnik() && hasBackendValhalla()) prof.append(2); + if (hasBackendOsmScout()) prof.append(3); + if (hasBackendOsmScout()) prof.append(4); + prof.append(5); + + return prof; +} +
[-] [+]	Changed	_service:tar_git:harbour-osmscout-server-1.15.5.tar.bz2/src/appsettings.h ^
@@ -41,24 +41,45 @@ /// \brief application version that was run before Q_PROPERTY(int lastRunVersion READ lastRunVersion) + /// \brief build configuration: whether mapnik backend is available + Q_PROPERTY(bool hasBackendMapnik READ hasBackendMapnik NOTIFY hasBackendMapnikChanged) + + /// \brief build configuration: whether libosmscout backend is available + Q_PROPERTY(bool hasBackendOsmScout READ hasBackendOsmScout NOTIFY hasBackendOsmScoutChanged) + + /// \brief build configuration: whether systemd support is available + Q_PROPERTY(bool hasBackendSystemD READ hasBackendSystemD NOTIFY hasBackendSystemDChanged) + + /// \brief build configuration: whether valhalla backend is available + Q_PROPERTY(bool hasBackendValhalla READ hasBackendValhalla NOTIFY hasBackendValhallaChanged) + public: AppSettings(); virtual ~AppSettings() {} Q_INVOKABLE void setValue(const QString &key, const QVariant &value); - Q_INVOKABLE int valueInt(const QString &key); - Q_INVOKABLE bool valueBool(const QString &key); - Q_INVOKABLE double valueFloat(const QString &key); - Q_INVOKABLE QString valueString(const QString &key); + Q_INVOKABLE int valueInt(const QString &key) const; + Q_INVOKABLE bool valueBool(const QString &key) const; + Q_INVOKABLE double valueFloat(const QString &key) const; + Q_INVOKABLE QString valueString(const QString &key) const; Q_INVOKABLE int unitIndex() const; ///< Index of selected units Q_INVOKABLE int unitDisplayDecimals() const; - Q_INVOKABLE double unitFactor() const; /// multiply by this factor when displaying distance or speed to the user + Q_INVOKABLE double unitFactor() const; ///< multiply by this factor when displaying distance or speed to the user Q_INVOKABLE bool hasUnits(const QString &key) const; Q_INVOKABLE QString unitName(const QString &key) const; + // Profile management and GUI interaction + // As not all profiles are available in all configurations, these + // functions hide the complexity of profile selection by + // - presenting only available profiles + // - indexing profiles according to that list + Q_INVOKABLE QStringList availableProfiles() const; ///< Profile available in this application install + Q_INVOKABLE int currentProfile() const; ///< Current profile index of a profile as in availableProfiles + Q_INVOKABLE void setCurrentProfile(int profile); ///< Set current profile using the index of a profile as in availableProfiles + void initDefaults(); ///< Initialize settings for configurable parameters on the first start bool profilesUsed() const { return m_profiles_used; } @@ -75,17 +96,59 @@ /// language or a language code QString preferredLanguage(); + /// State of the backends + + bool hasBackendMapnik() const { +#ifdef USE_MAPNIK + return true; +#else + return false; +#endif + } + + bool hasBackendOsmScout() const { +#ifdef USE_OSMSCOUT + return true; +#else + return false; +#endif + } + + bool hasBackendSystemD() const { +#ifdef USE_SYSTEMD + return true; +#else + return false; +#endif + } + + bool hasBackendValhalla() const { +#ifdef USE_VALHALLA + return true; +#else + return false; +#endif + } + signals: void osmScoutSettingsChanged(); void profilesUsedChanged(bool used); void countrySelectionNeededChanged(bool selection); + // never used, but makes QML happy + void hasBackendMapnikChanged(bool); + void hasBackendOsmScoutChanged(bool); + void hasBackendSystemDChanged(bool); + void hasBackendValhallaChanged(bool); + public slots: void fireOsmScoutSettingsChanged(); protected: QString unitName(bool speed) const; + QList<int> availableProfilesIndex() const; + int defaultProfile() const; void setProfile(); void checkCountrySelectionNeeded(); @@ -96,6 +159,7 @@ bool m_country_selection_needed = true; bool m_first_time = false; int m_last_run_version{0}; + QList<int> m_available_profile_index; }; #endif // APPSETTINGS_H
[-] [+]	Changed	_service:tar_git:harbour-osmscout-server-1.15.5.tar.bz2/src/mapmanager.cpp ^
@@ -51,7 +51,9 @@ Manager::Manager(QObject parent) : QObject(parent) { +#ifdef USE_OSMSCOUT m_features.append(new FeatureOsmScout(this)); +#endif m_features.append(new FeatureGeocoderNLP(this)); m_features.append(new FeaturePostalGlobal(this)); m_features.append(new FeaturePostalCountry(this)); @@ -59,10 +61,14 @@ m_features.append(new FeatureMapboxGLGlyphs(this)); m_features.append(new FeatureMapboxGLCountry(this)); m_features.append(new FeatureMapnikGlobal(this)); +#ifdef USE_MAPNIK m_features.append(new FeatureMapnikCountry(this)); +#endif m_feature_valhalla = new FeatureValhalla(this); +#ifdef USE_VALHALLA m_features.append(m_feature_valhalla); +#endif for (Feature p: m_features) if (p == nullptr)
[-] [+]	Changed	_service:tar_git:harbour-osmscout-server-1.15.5.tar.bz2/translations/harbour-osmscout-server-cs.ts ^
@@ -11,17 +11,17 @@ <message> <location filename="../qml/AboutPage.qml" line="35"/> <source>Copyright:</source> - <translation>Copyright:</translation> + <translation>Autorská práva:</translation> </message> <message> <location filename="../qml/AboutPage.qml" line="42"/> <source>Artwork</source> - <translation type="unfinished"></translation> + <translation>Kresba</translation> </message> <message> <location filename="../qml/AboutPage.qml" line="43"/> <source>Icons by %1.</source> - <translation type="unfinished"></translation> + <translation>Ikony od %1.</translation> </message> <message> <location filename="../qml/AboutPage.qml" line="44"/> @@ -97,25 +97,55 @@ <context> <name>AppSettings</name> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mph</source> <translation>mi/h</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mi.</source> <translation>mi</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km/h</source> <translation>km/h</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km</source> <translation>km</translation> </message> + <message> + <location filename="../src/appsettings.cpp" line="385"/> + <source>Default</source> + <translation>Výchozí</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="386"/> + <source>Recommended for raster tiles maps</source> + <translation>Doporučeno pro mapování rastrových dlaždic</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="387"/> + <source>Recommended for vector and raster tiles maps</source> + <translation>Doporučeno pro mapy vektorových a rastrových dlaždic.</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="388"/> + <source><i>libosmscout</i> with <i>Geocoder-NLP</i></source> + <translation><i>libosmscout</i> s <i>Geocoder-NLP</i></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="389"/> + <source><i>libosmscout</i></source> + <translation><i>libosmscout</i></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="390"/> + <source>Custom</source> + <translation>Vlastní</translation> + </message> </context> <context> <name>CountryDetailsPage</name> @@ -137,7 +167,7 @@ <message> <location filename="../qml/CountryDetailsPage.qml" line="230"/> <source>Some or all datasets are incompatible with this version. You would have to update list of provided maps, the maps, and/or install the latest release of OSM Scout Server.</source> - <translation>Některé nebo všechny datové sady jsou s touto verzí nekompatibilní. Budete muset aktualizovat seznam poskytnutých map, mapy a / nebo nainstalovat nejnovější verzi serveru OSM Scout.</translation> + <translation>Některé nebo všechny datové sady jsou s touto verzí nekompatibilní. Budete muset aktualizovat seznam poskytnutých map, mapy a / nebo nainstalovat nejnovější verzi OSM Scout Serveru.</translation> </message> <message> <location filename="../qml/CountryDetailsPage.qml" line="237"/> @@ -694,217 +724,217 @@ <context> <name>MapManager::Manager</name> <message> - <location filename="../src/mapmanager.cpp" line="70"/> + <location filename="../src/mapmanager.cpp" line="76"/> <source>Could not allocate Map Manager features</source> <translation>Nelze přidělit funkce Map Manageru</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="116"/> + <location filename="../src/mapmanager.cpp" line="122"/> <source>Storage folder changed to %1</source> <translation>Úložiště bylo změněno na %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="123"/> + <location filename="../src/mapmanager.cpp" line="129"/> <source>Maps storage folder does not exist: %1</source> <translation>Složka úložiště mapy neexistuje: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="126"/> + <location filename="../src/mapmanager.cpp" line="132"/> <source>Maps storage folder path does not point to a directory: %1</source> <translation>Cesta složky pro ukládání map není odkazem na adresář: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="132"/> + <location filename="../src/mapmanager.cpp" line="138"/> <source>Maps storage folder is not writable, please adjust permissions for %1</source> <translation>Složka pro ukládání map není zapisovatelná, upravte oprávnění pro %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="185"/> - <location filename="../src/mapmanager.cpp" line="187"/> + <location filename="../src/mapmanager.cpp" line="191"/> + <location filename="../src/mapmanager.cpp" line="193"/> <source>Failed to open the database for tracking downloaded files</source> <translation>Nepodařilo se otevřít databázi pro sledování stažených souborů</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="188"/> + <location filename="../src/mapmanager.cpp" line="194"/> <source>Map Manager functionality would be disturbed</source> <translation>Funkce Map Manageru může být narušena</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="250"/> + <location filename="../src/mapmanager.cpp" line="256"/> <source>Cannot create directory without any name</source> <translation>Adresář nelze vytvořit bez názvu</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="257"/> + <location filename="../src/mapmanager.cpp" line="263"/> <source>Error creating directory %1</source> <translation>Chyba při vytváření adresáře %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="304"/> + <location filename="../src/mapmanager.cpp" line="310"/> <source>Address parsing language support</source> <translation>Jazyková podpora analýzy adres</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="337"/> - <location filename="../src/mapmanager.cpp" line="808"/> - <location filename="../src/mapmanager.cpp" line="937"/> + <location filename="../src/mapmanager.cpp" line="343"/> + <location filename="../src/mapmanager.cpp" line="814"/> + <location filename="../src/mapmanager.cpp" line="943"/> <source>Maps storage folder does not exist: </source> <translation>Složka úložiště mapy neexistuje:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="346"/> - <location filename="../src/mapmanager.cpp" line="815"/> + <location filename="../src/mapmanager.cpp" line="352"/> + <location filename="../src/mapmanager.cpp" line="821"/> <source>No maps were requested</source> <translation>Nebyly vyžádány žádné mapy</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="367"/> + <location filename="../src/mapmanager.cpp" line="373"/> <source>No maps loaded: %1</source> <translation>Žádné načtené mapy: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="842"/> + <location filename="../src/mapmanager.cpp" line="848"/> <source>%1: version of dataset for %2 is not supported</source> <translation>%1: verze datové sady pro %2 není podporována</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="393"/> + <location filename="../src/mapmanager.cpp" line="399"/> <source>Missing dataset for %1: %2</source> <translation>Chybějící dataset pro %1: %2</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="306"/> + <location filename="../src/mapmanager.cpp" line="312"/> <source>Mapnik World coastlines</source> <translation>Pobřeží světa z databáze Mapnik</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="308"/> + <location filename="../src/mapmanager.cpp" line="314"/>
[-] [+]	Changed	_service:tar_git:harbour-osmscout-server-1.15.5.tar.bz2/translations/harbour-osmscout-server-de.ts ^
@@ -97,25 +97,55 @@ <context> <name>AppSettings</name> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mph</source> <translation>mph</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mi.</source> <translation>mi.</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km/h</source> <translation>km/h</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km</source> <translation>km</translation> </message> + <message> + <location filename="../src/appsettings.cpp" line="385"/> + <source>Default</source> + <translation>Vorgabe</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="386"/> + <source>Recommended for raster tiles maps</source> + <translation>Empfehlung für Karten mit Rasterkacheln</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="387"/> + <source>Recommended for vector and raster tiles maps</source> + <translation>Empfohlen für Vektor- und Rasterkacheln Karten</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="388"/> + <source><i>libosmscout</i> with <i>Geocoder-NLP</i></source> + <translation><i>libosmscout</i> und <i>Geocoder-NLP</i></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="389"/> + <source><i>libosmscout</i></source> + <translation><i>libosmscout</i></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="390"/> + <source>Custom</source> + <translation>Benutzerdefiniert</translation> + </message> </context> <context> <name>CountryDetailsPage</name> @@ -695,217 +725,217 @@ <context> <name>MapManager::Manager</name> <message> - <location filename="../src/mapmanager.cpp" line="70"/> + <location filename="../src/mapmanager.cpp" line="76"/> <source>Could not allocate Map Manager features</source> <translation>Konnte Funktionen der Kartenverwaltung nicht bereitstellen.</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="116"/> + <location filename="../src/mapmanager.cpp" line="122"/> <source>Storage folder changed to %1</source> <translation>Speicherordner geändert zu %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="123"/> + <location filename="../src/mapmanager.cpp" line="129"/> <source>Maps storage folder does not exist: %1</source> <translation>Kartenspeicher-Verzeichnis existiert nicht: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="126"/> + <location filename="../src/mapmanager.cpp" line="132"/> <source>Maps storage folder path does not point to a directory: %1</source> <translation>Maps Speicherordner Pfad verweist nicht auf ein Verzeichnis: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="132"/> + <location filename="../src/mapmanager.cpp" line="138"/> <source>Maps storage folder is not writable, please adjust permissions for %1</source> <translation>Das Kartenverzeichnis ist nicht beschreibbar, bitte passe die Berechtigungen für %1 an.</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="185"/> - <location filename="../src/mapmanager.cpp" line="187"/> + <location filename="../src/mapmanager.cpp" line="191"/> + <location filename="../src/mapmanager.cpp" line="193"/> <source>Failed to open the database for tracking downloaded files</source> <translation>Fehler beim Öffnen der Datenbank zum Verfolgen heruntergeladener Dateien.</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="188"/> + <location filename="../src/mapmanager.cpp" line="194"/> <source>Map Manager functionality would be disturbed</source> <translation>Kartenverwaltung Funktionalität wäre gestört</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="250"/> + <location filename="../src/mapmanager.cpp" line="256"/> <source>Cannot create directory without any name</source> <translation>Kann kein Verzeichnis ohne Namen erstellen</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="257"/> + <location filename="../src/mapmanager.cpp" line="263"/> <source>Error creating directory %1</source> <translation>Fehler beim Erstellen des Verzeichnisses %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="304"/> + <location filename="../src/mapmanager.cpp" line="310"/> <source>Address parsing language support</source> <translation>Adressanalyse Sprachunterstützung</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="337"/> - <location filename="../src/mapmanager.cpp" line="808"/> - <location filename="../src/mapmanager.cpp" line="937"/> + <location filename="../src/mapmanager.cpp" line="343"/> + <location filename="../src/mapmanager.cpp" line="814"/> + <location filename="../src/mapmanager.cpp" line="943"/> <source>Maps storage folder does not exist: </source> <translation>Kartenspeicherordner existiert nicht:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="346"/> - <location filename="../src/mapmanager.cpp" line="815"/> + <location filename="../src/mapmanager.cpp" line="352"/> + <location filename="../src/mapmanager.cpp" line="821"/> <source>No maps were requested</source> <translation>Es wurden keine Karten angefordert.</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="367"/> + <location filename="../src/mapmanager.cpp" line="373"/> <source>No maps loaded: %1</source> <translation>Keine Karten geladen: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="842"/> + <location filename="../src/mapmanager.cpp" line="848"/> <source>%1: version of dataset for %2 is not supported</source> <translation>%1: Version des Datensatzes für %2 wird nicht unterstützt</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="393"/> + <location filename="../src/mapmanager.cpp" line="399"/> <source>Missing dataset for %1: %2</source> <translation>Fehlender Datensatz für %1: %2</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="306"/> + <location filename="../src/mapmanager.cpp" line="312"/> <source>Mapnik World coastlines</source> <translation>Mapnik Welt Küstenlinien</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="308"/> + <location filename="../src/mapmanager.cpp" line="314"/> <source>Mapbox GL World overlay</source> <translation>Mapbox GL Weltkartenschablone</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="310"/> + <location filename="../src/mapmanager.cpp" line="316"/> <source>Mapbox GL fonts</source> <translation>Schriftarten für Mapbox GL</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="440"/> + <location filename="../src/mapmanager.cpp" line="446"/> <source>Available country or territory: </source> <translation>Verfügbares Land oder Gebiet:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="641"/> + <location filename="../src/mapmanager.cpp" line="647"/> <source>World</source> <translation>Welt</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="705"/> + <location filename="../src/mapmanager.cpp" line="711"/> <source>Removing country from requested list: </source> <translation>Land aus der angeforderten Liste entfernen:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="863"/> + <location filename="../src/mapmanager.cpp" line="869"/>
[-] [+]	Changed	_service:tar_git:harbour-osmscout-server-1.15.5.tar.bz2/translations/harbour-osmscout-server-es.ts ^
@@ -97,25 +97,55 @@ <context> <name>AppSettings</name> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mph</source> <translation>mph</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mi.</source> <translation>mi.</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km/h</source> <translation>km/h</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km</source> <translation>km</translation> </message> + <message> + <location filename="../src/appsettings.cpp" line="385"/> + <source>Default</source> + <translation>Por defecto</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="386"/> + <source>Recommended for raster tiles maps</source> + <translation>Recomendado para mapas de bits</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="387"/> + <source>Recommended for vector and raster tiles maps</source> + <translation>Recomendado para mapas vectoriales y de bits</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="388"/> + <source><i>libosmscout</i> with <i>Geocoder-NLP</i></source> + <translation><i>libosmscout</i> con <i>Geocoder-NLP</i></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="389"/> + <source><i>libosmscout</i></source> + <translation><i>libosmscout</i></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="390"/> + <source>Custom</source> + <translation>Personalizado</translation> + </message> </context> <context> <name>CountryDetailsPage</name> @@ -694,217 +724,217 @@ <context> <name>MapManager::Manager</name> <message> - <location filename="../src/mapmanager.cpp" line="70"/> + <location filename="../src/mapmanager.cpp" line="76"/> <source>Could not allocate Map Manager features</source> <translation>No se han podido asignar las funciones al Gestor de mapas</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="116"/> + <location filename="../src/mapmanager.cpp" line="122"/> <source>Storage folder changed to %1</source> <translation>La carpeta de almacenamiento cambió a %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="123"/> + <location filename="../src/mapmanager.cpp" line="129"/> <source>Maps storage folder does not exist: %1</source> <translation>La carpeta de almacenamiento de mapas no existe: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="126"/> + <location filename="../src/mapmanager.cpp" line="132"/> <source>Maps storage folder path does not point to a directory: %1</source> <translation>La ruta de la carpeta de almacenamiento de mapas no apunta a un directorio: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="132"/> + <location filename="../src/mapmanager.cpp" line="138"/> <source>Maps storage folder is not writable, please adjust permissions for %1</source> <translation>La carpeta de almacenamiento de mapas no tiene permisos de escritura, por favor, modifica los permisos de %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="185"/> - <location filename="../src/mapmanager.cpp" line="187"/> + <location filename="../src/mapmanager.cpp" line="191"/> + <location filename="../src/mapmanager.cpp" line="193"/> <source>Failed to open the database for tracking downloaded files</source> <translation>Error al abrir la base de datos para el seguimiento de los ficheros descargados</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="188"/> + <location filename="../src/mapmanager.cpp" line="194"/> <source>Map Manager functionality would be disturbed</source> <translation>La funcionalidad del Gestor de mapas se ha alterado</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="250"/> + <location filename="../src/mapmanager.cpp" line="256"/> <source>Cannot create directory without any name</source> <translation>No es posible crear un directorio sin indicar un nombre</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="257"/> + <location filename="../src/mapmanager.cpp" line="263"/> <source>Error creating directory %1</source> <translation>Error al crear directorio %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="304"/> + <location filename="../src/mapmanager.cpp" line="310"/> <source>Address parsing language support</source> <translation>Soporte del idioma en el análisis de direcciones</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="337"/> - <location filename="../src/mapmanager.cpp" line="808"/> - <location filename="../src/mapmanager.cpp" line="937"/> + <location filename="../src/mapmanager.cpp" line="343"/> + <location filename="../src/mapmanager.cpp" line="814"/> + <location filename="../src/mapmanager.cpp" line="943"/> <source>Maps storage folder does not exist: </source> <translation>No existe la carpeta de almacenamieto de los mapas: </translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="346"/> - <location filename="../src/mapmanager.cpp" line="815"/> + <location filename="../src/mapmanager.cpp" line="352"/> + <location filename="../src/mapmanager.cpp" line="821"/> <source>No maps were requested</source> <translation>No se han solicitado mapas</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="367"/> + <location filename="../src/mapmanager.cpp" line="373"/> <source>No maps loaded: %1</source> <translation>No hay mapas cargados: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="842"/> + <location filename="../src/mapmanager.cpp" line="848"/> <source>%1: version of dataset for %2 is not supported</source> <translation>%1: la versión del conjunto de datos para %2 no es compatible</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="393"/> + <location filename="../src/mapmanager.cpp" line="399"/> <source>Missing dataset for %1: %2</source> <translation>Falta conjunto de datos para %1: %2</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="306"/> + <location filename="../src/mapmanager.cpp" line="312"/> <source>Mapnik World coastlines</source> <translation>Costas del mundo de Mapnik</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="308"/> + <location filename="../src/mapmanager.cpp" line="314"/> <source>Mapbox GL World overlay</source> <translation>Capa del mundo de Mapbox GL</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="310"/> + <location filename="../src/mapmanager.cpp" line="316"/> <source>Mapbox GL fonts</source> <translation>Fuentes de Mapbox GL</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="440"/> + <location filename="../src/mapmanager.cpp" line="446"/> <source>Available country or territory: </source> <translation>País o territorio disponible: </translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="641"/> + <location filename="../src/mapmanager.cpp" line="647"/> <source>World</source> <translation>Mundo</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="705"/> + <location filename="../src/mapmanager.cpp" line="711"/> <source>Removing country from requested list: </source> <translation>Eliminando país de la lista solicitada: </translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="863"/> + <location filename="../src/mapmanager.cpp" line="869"/>
[-] [+]	Changed	_service:tar_git:harbour-osmscout-server-1.15.5.tar.bz2/translations/harbour-osmscout-server-fi.ts ^
@@ -97,25 +97,55 @@ <context> <name>AppSettings</name> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mph</source> <translation>mph</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mi.</source> <translation>mi.</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km/h</source> <translation>km/h</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km</source> <translation>km</translation> </message> + <message> + <location filename="../src/appsettings.cpp" line="385"/> + <source>Default</source> + <translation>Oletus</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="386"/> + <source>Recommended for raster tiles maps</source> + <translation>Suositeltu rasterilaattakarttojen kanssa</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="387"/> + <source>Recommended for vector and raster tiles maps</source> + <translation>Suositeltu vektori- ja rasterilaattakarttojen kanssa</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="388"/> + <source><i>libosmscout</i> with <i>Geocoder-NLP</i></source> + <translation><i>libosmscout</i> ja <i>Geocoder-NLP</i></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="389"/> + <source><i>libosmscout</i></source> + <translation><i>libosmscout</i></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="390"/> + <source>Custom</source> + <translation>Mukautettu</translation> + </message> </context> <context> <name>CountryDetailsPage</name> @@ -694,217 +724,217 @@ <context> <name>MapManager::Manager</name> <message> - <location filename="../src/mapmanager.cpp" line="70"/> + <location filename="../src/mapmanager.cpp" line="76"/> <source>Could not allocate Map Manager features</source> <translation>Karttamanagerin ominaisuuksia ei voitu varata</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="116"/> + <location filename="../src/mapmanager.cpp" line="122"/> <source>Storage folder changed to %1</source> <translation>Tallennuskansioksi vaihtui %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="123"/> + <location filename="../src/mapmanager.cpp" line="129"/> <source>Maps storage folder does not exist: %1</source> <translation>Karttojen tallennuskansiota ei ole olemassa: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="126"/> + <location filename="../src/mapmanager.cpp" line="132"/> <source>Maps storage folder path does not point to a directory: %1</source> <translation>Karttojen tallennuskansion polku ei osoita kansioon: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="132"/> + <location filename="../src/mapmanager.cpp" line="138"/> <source>Maps storage folder is not writable, please adjust permissions for %1</source> <translation>Karttojen tallennuskansio ei ole kirjoittavissa, muokkaa %1 käyttäjäoikeudet</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="185"/> - <location filename="../src/mapmanager.cpp" line="187"/> + <location filename="../src/mapmanager.cpp" line="191"/> + <location filename="../src/mapmanager.cpp" line="193"/> <source>Failed to open the database for tracking downloaded files</source> <translation>Tietokannan avaaminen ladattujen tiedostojen seurantaan epäonnistui</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="188"/> + <location filename="../src/mapmanager.cpp" line="194"/> <source>Map Manager functionality would be disturbed</source> <translation>Karttamanagerin toiminta häiriintyisi</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="250"/> + <location filename="../src/mapmanager.cpp" line="256"/> <source>Cannot create directory without any name</source> <translation>Hakemistoa ei voida luoda ilman nimeä</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="257"/> + <location filename="../src/mapmanager.cpp" line="263"/> <source>Error creating directory %1</source> <translation>Virhe luotaessa hakemistoa %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="304"/> + <location filename="../src/mapmanager.cpp" line="310"/> <source>Address parsing language support</source> <translation>Osoitteiden tulkinnan kielituki</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="337"/> - <location filename="../src/mapmanager.cpp" line="808"/> - <location filename="../src/mapmanager.cpp" line="937"/> + <location filename="../src/mapmanager.cpp" line="343"/> + <location filename="../src/mapmanager.cpp" line="814"/> + <location filename="../src/mapmanager.cpp" line="943"/> <source>Maps storage folder does not exist: </source> <translation>Karttojen tallennuskansiota ei ole olemassa: </translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="346"/> - <location filename="../src/mapmanager.cpp" line="815"/> + <location filename="../src/mapmanager.cpp" line="352"/> + <location filename="../src/mapmanager.cpp" line="821"/> <source>No maps were requested</source> <translation>Yhtään karttaa ei pyydetty</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="367"/> + <location filename="../src/mapmanager.cpp" line="373"/> <source>No maps loaded: %1</source> <translation>Yhtään karttaa ei ladattu: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="842"/> + <location filename="../src/mapmanager.cpp" line="848"/> <source>%1: version of dataset for %2 is not supported</source> <translation>%1: %2 datasetin versio ei ole tuettu</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="393"/> + <location filename="../src/mapmanager.cpp" line="399"/> <source>Missing dataset for %1: %2</source> <translation>Puuttuva %1 datasetti: %2</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="306"/> + <location filename="../src/mapmanager.cpp" line="312"/> <source>Mapnik World coastlines</source> <translation>Mapnik maailman rantaviivat</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="308"/> + <location filename="../src/mapmanager.cpp" line="314"/> <source>Mapbox GL World overlay</source> <translation>Mapbox GL maailman overlay</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="310"/> + <location filename="../src/mapmanager.cpp" line="316"/> <source>Mapbox GL fonts</source> <translation>Mapbox GL fontit</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="440"/> + <location filename="../src/mapmanager.cpp" line="446"/> <source>Available country or territory: </source> <translation>Saatavilla oleva maa tai alue: </translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="641"/> + <location filename="../src/mapmanager.cpp" line="647"/> <source>World</source> <translation>Maailma</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="705"/> + <location filename="../src/mapmanager.cpp" line="711"/> <source>Removing country from requested list: </source> <translation>Poistetaan maa pyydettyjen listalta: </translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="863"/> + <location filename="../src/mapmanager.cpp" line="869"/>
[-] [+]	Changed	_service:tar_git:harbour-osmscout-server-1.15.5.tar.bz2/translations/harbour-osmscout-server-fr.ts ^
@@ -97,25 +97,55 @@ <context> <name>AppSettings</name> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mph</source> <translation>mph</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mi.</source> <translation>mi.</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km/h</source> <translation>km/h</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km</source> <translation>km</translation> </message> + <message> + <location filename="../src/appsettings.cpp" line="385"/> + <source>Default</source> + <translation>Par défaut</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="386"/> + <source>Recommended for raster tiles maps</source> + <translation>Recommandé pour des tuiles de cartes plus précises</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="387"/> + <source>Recommended for vector and raster tiles maps</source> + <translation>Recommandé pour les tuiles de cartes vectorielles et matricielles</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="388"/> + <source><i>libosmscout</i> with <i>Geocoder-NLP</i></source> + <translation><i>libosmscout</i> avec <i>Geocoder-NLP</i></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="389"/> + <source><i>libosmscout</i></source> + <translation><i>libosmscout</i></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="390"/> + <source>Custom</source> + <translation>Personnalisé</translation> + </message> </context> <context> <name>CountryDetailsPage</name> @@ -694,217 +724,217 @@ <context> <name>MapManager::Manager</name> <message> - <location filename="../src/mapmanager.cpp" line="70"/> + <location filename="../src/mapmanager.cpp" line="76"/> <source>Could not allocate Map Manager features</source> <translation>Impossible d'allouer les fonctionnalités du Gestionnaire</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="116"/> + <location filename="../src/mapmanager.cpp" line="122"/> <source>Storage folder changed to %1</source> <translation>Dossier de stockage modifié pour %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="123"/> + <location filename="../src/mapmanager.cpp" line="129"/> <source>Maps storage folder does not exist: %1</source> <translation>Le dossier de stockage n'existe pas : %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="126"/> + <location filename="../src/mapmanager.cpp" line="132"/> <source>Maps storage folder path does not point to a directory: %1</source> <translation>Le chemin du stockage des cartes ne pointe sur aucun dossier : %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="132"/> + <location filename="../src/mapmanager.cpp" line="138"/> <source>Maps storage folder is not writable, please adjust permissions for %1</source> <translation>Le dossier de stockage n'est pas modifiable, merci d'ajuster les permissions de %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="185"/> - <location filename="../src/mapmanager.cpp" line="187"/> + <location filename="../src/mapmanager.cpp" line="191"/> + <location filename="../src/mapmanager.cpp" line="193"/> <source>Failed to open the database for tracking downloaded files</source> <translation>Impossible de charger la base de données permettant d'accéder aux fichiers téléchargés</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="188"/> + <location filename="../src/mapmanager.cpp" line="194"/> <source>Map Manager functionality would be disturbed</source> <translation>Le Gestionnaire va être perturbé</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="250"/> + <location filename="../src/mapmanager.cpp" line="256"/> <source>Cannot create directory without any name</source> <translation>Impossible de créer un dossier sans nom</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="257"/> + <location filename="../src/mapmanager.cpp" line="263"/> <source>Error creating directory %1</source> <translation>Impossible de créer le dossier %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="304"/> + <location filename="../src/mapmanager.cpp" line="310"/> <source>Address parsing language support</source> <translation>Langues supportées pour le décodage des adresses</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="337"/> - <location filename="../src/mapmanager.cpp" line="808"/> - <location filename="../src/mapmanager.cpp" line="937"/> + <location filename="../src/mapmanager.cpp" line="343"/> + <location filename="../src/mapmanager.cpp" line="814"/> + <location filename="../src/mapmanager.cpp" line="943"/> <source>Maps storage folder does not exist: </source> <translation>Le dossier de stockage n'existe pas : </translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="346"/> - <location filename="../src/mapmanager.cpp" line="815"/> + <location filename="../src/mapmanager.cpp" line="352"/> + <location filename="../src/mapmanager.cpp" line="821"/> <source>No maps were requested</source> <translation>Aucune carte n'a été sollicitée</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="367"/> + <location filename="../src/mapmanager.cpp" line="373"/> <source>No maps loaded: %1</source> <translation>Aucune carte chargée : %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="842"/> + <location filename="../src/mapmanager.cpp" line="848"/> <source>%1: version of dataset for %2 is not supported</source> <translation>%1 : la version du jeu de données pour %2 n'est pas supportée</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="393"/> + <location filename="../src/mapmanager.cpp" line="399"/> <source>Missing dataset for %1: %2</source> <translation>Jeux de données manquants pour %1 : %2</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="306"/> + <location filename="../src/mapmanager.cpp" line="312"/> <source>Mapnik World coastlines</source> <translation>Littoral mondial Mapnik</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="308"/> + <location filename="../src/mapmanager.cpp" line="314"/> <source>Mapbox GL World overlay</source> <translation>Couche mondiale Mapbox GL</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="310"/> + <location filename="../src/mapmanager.cpp" line="316"/> <source>Mapbox GL fonts</source> <translation>Polices Mapbox GL</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="440"/> + <location filename="../src/mapmanager.cpp" line="446"/> <source>Available country or territory: </source> <translation>Pays et territoires disponibles : </translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="641"/> + <location filename="../src/mapmanager.cpp" line="647"/> <source>World</source> <translation>Monde</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="705"/> + <location filename="../src/mapmanager.cpp" line="711"/> <source>Removing country from requested list: </source> <translation>Suppression du pays dans la liste : </translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="863"/> + <location filename="../src/mapmanager.cpp" line="869"/>
[-] [+]	Changed	_service:tar_git:harbour-osmscout-server-1.15.5.tar.bz2/translations/harbour-osmscout-server-it_IT.ts ^
@@ -97,25 +97,55 @@ <context> <name>AppSettings</name> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mph</source> <translation>mph</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mi.</source> <translation>mi</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km/h</source> <translation>km/h</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km</source> <translation>km</translation> </message> + <message> + <location filename="../src/appsettings.cpp" line="385"/> + <source>Default</source> + <translation>Predefinita</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="386"/> + <source>Recommended for raster tiles maps</source> + <translation>Raccomandato per mappe con tile raster</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="387"/> + <source>Recommended for vector and raster tiles maps</source> + <translation>Raccomandato per mappe con tile vettoriali e raster</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="388"/> + <source><i>libosmscout</i> with <i>Geocoder-NLP</i></source> + <translation><i>libosmscout</i> con <i>Geocoder-NLP</i></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="389"/> + <source><i>libosmscout</i></source> + <translation><i>libosmscout</i></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="390"/> + <source>Custom</source> + <translation>Personalizzato</translation> + </message> </context> <context> <name>CountryDetailsPage</name> @@ -694,217 +724,217 @@ <context> <name>MapManager::Manager</name> <message> - <location filename="../src/mapmanager.cpp" line="70"/> + <location filename="../src/mapmanager.cpp" line="76"/> <source>Could not allocate Map Manager features</source> <translation>Impossibile allocare funzioni del Gestore delle Mappe</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="116"/> + <location filename="../src/mapmanager.cpp" line="122"/> <source>Storage folder changed to %1</source> <translation>Cartella di archivio cambiata in %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="123"/> + <location filename="../src/mapmanager.cpp" line="129"/> <source>Maps storage folder does not exist: %1</source> <translation>La cartella di archivio delle mappe non esiste: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="126"/> + <location filename="../src/mapmanager.cpp" line="132"/> <source>Maps storage folder path does not point to a directory: %1</source> <translation>Il percorso della cartella di archivio delle mappe non punta a una cartella: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="132"/> + <location filename="../src/mapmanager.cpp" line="138"/> <source>Maps storage folder is not writable, please adjust permissions for %1</source> <translation>Impossibile scrivere sulla cartella di archivio delle mappe, aggiustare i permessi per %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="185"/> - <location filename="../src/mapmanager.cpp" line="187"/> + <location filename="../src/mapmanager.cpp" line="191"/> + <location filename="../src/mapmanager.cpp" line="193"/> <source>Failed to open the database for tracking downloaded files</source> <translation>Impossibile aprire il database per tracciare i file scaricati</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="188"/> + <location filename="../src/mapmanager.cpp" line="194"/> <source>Map Manager functionality would be disturbed</source> <translation>La funzionalità del Gestore delle Mappe sarebbe disturbata</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="250"/> + <location filename="../src/mapmanager.cpp" line="256"/> <source>Cannot create directory without any name</source> <translation>Impossibile creare una cartella senza nome</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="257"/> + <location filename="../src/mapmanager.cpp" line="263"/> <source>Error creating directory %1</source> <translation>Errore nella creare la cartella %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="304"/> + <location filename="../src/mapmanager.cpp" line="310"/> <source>Address parsing language support</source> <translation>Supporto analisi indirizzo per lingua</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="337"/> - <location filename="../src/mapmanager.cpp" line="808"/> - <location filename="../src/mapmanager.cpp" line="937"/> + <location filename="../src/mapmanager.cpp" line="343"/> + <location filename="../src/mapmanager.cpp" line="814"/> + <location filename="../src/mapmanager.cpp" line="943"/> <source>Maps storage folder does not exist: </source> <translation>La cartella di archivio delle mappe non esiste:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="346"/> - <location filename="../src/mapmanager.cpp" line="815"/> + <location filename="../src/mapmanager.cpp" line="352"/> + <location filename="../src/mapmanager.cpp" line="821"/> <source>No maps were requested</source> <translation>Nessuna mappa richiesta</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="367"/> + <location filename="../src/mapmanager.cpp" line="373"/> <source>No maps loaded: %1</source> <translation>Nessuna mappa caricata: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="842"/> + <location filename="../src/mapmanager.cpp" line="848"/> <source>%1: version of dataset for %2 is not supported</source> <translation>%1: versione del set di dati per %2 non supportata</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="393"/> + <location filename="../src/mapmanager.cpp" line="399"/> <source>Missing dataset for %1: %2</source> <translation>Set di dati mancanti per %1: %2</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="306"/> + <location filename="../src/mapmanager.cpp" line="312"/> <source>Mapnik World coastlines</source> <translation>Linee costiere mondiali di Mapnik</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="308"/> + <location filename="../src/mapmanager.cpp" line="314"/> <source>Mapbox GL World overlay</source> <translation>Overlay del mondo di Mapbox GL</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="310"/> + <location filename="../src/mapmanager.cpp" line="316"/> <source>Mapbox GL fonts</source> <translation>Caratteri di Mapbox GL</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="440"/> + <location filename="../src/mapmanager.cpp" line="446"/> <source>Available country or territory: </source> <translation>Paesi o territori disponibili:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="641"/> + <location filename="../src/mapmanager.cpp" line="647"/> <source>World</source> <translation>Mondo</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="705"/> + <location filename="../src/mapmanager.cpp" line="711"/> <source>Removing country from requested list: </source> <translation>Rimozione paese dalla lista di richieste:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="863"/> + <location filename="../src/mapmanager.cpp" line="869"/>
[-] [+]	Changed	_service:tar_git:harbour-osmscout-server-1.15.5.tar.bz2/translations/harbour-osmscout-server-nb.ts ^
@@ -97,25 +97,55 @@ <context> <name>AppSettings</name> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mph</source> <translation>mph</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mi.</source> <translation>mi.</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km/h</source> <translation>km/t</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km</source> <translation>km</translation> </message> + <message> + <location filename="../src/appsettings.cpp" line="385"/> + <source>Default</source> + <translation>Standard</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="386"/> + <source>Recommended for raster tiles maps</source> + <translation>Anbefales for rasterfliser kart</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="387"/> + <source>Recommended for vector and raster tiles maps</source> + <translation>Annbefalt for vektor and raster kart</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="388"/> + <source><i>libosmscout</i> with <i>Geocoder-NLP</i></source> + <translation><i>libosmscout</i> med <i>Geocoder-NLP</i></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="389"/> + <source><i>libosmscout</i></source> + <translation><i>libosmscout</i></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="390"/> + <source>Custom</source> + <translation>Tilpasset</translation> + </message> </context> <context> <name>CountryDetailsPage</name> @@ -694,217 +724,217 @@ <context> <name>MapManager::Manager</name> <message> - <location filename="../src/mapmanager.cpp" line="70"/> + <location filename="../src/mapmanager.cpp" line="76"/> <source>Could not allocate Map Manager features</source> <translation>Kunne ikke allokere Kart Behandler funksjonen</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="116"/> + <location filename="../src/mapmanager.cpp" line="122"/> <source>Storage folder changed to %1</source> <translation>Lagringsmappe endret til %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="123"/> + <location filename="../src/mapmanager.cpp" line="129"/> <source>Maps storage folder does not exist: %1</source> <translation>Kart lagringsmappen finnes ikke: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="126"/> + <location filename="../src/mapmanager.cpp" line="132"/> <source>Maps storage folder path does not point to a directory: %1</source> <translation>Kart lagringsmappestien peker ikke på en mappe: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="132"/> + <location filename="../src/mapmanager.cpp" line="138"/> <source>Maps storage folder is not writable, please adjust permissions for %1</source> <translation>Kart lagringsmappen er skrivebeskyttet. vennligst endre rettighetene for %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="185"/> - <location filename="../src/mapmanager.cpp" line="187"/> + <location filename="../src/mapmanager.cpp" line="191"/> + <location filename="../src/mapmanager.cpp" line="193"/> <source>Failed to open the database for tracking downloaded files</source> <translation>Kunne ikke åpne database for sporing av nedlastede filer</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="188"/> + <location filename="../src/mapmanager.cpp" line="194"/> <source>Map Manager functionality would be disturbed</source> <translation>Map Manager funksjonalitet ville bli forstyrret</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="250"/> + <location filename="../src/mapmanager.cpp" line="256"/> <source>Cannot create directory without any name</source> <translation>Kan ikke lage mappe uten navn</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="257"/> + <location filename="../src/mapmanager.cpp" line="263"/> <source>Error creating directory %1</source> <translation>Feil ved oppretting av mappe %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="304"/> + <location filename="../src/mapmanager.cpp" line="310"/> <source>Address parsing language support</source> <translation>Adresse oppdeling språkstøtte</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="337"/> - <location filename="../src/mapmanager.cpp" line="808"/> - <location filename="../src/mapmanager.cpp" line="937"/> + <location filename="../src/mapmanager.cpp" line="343"/> + <location filename="../src/mapmanager.cpp" line="814"/> + <location filename="../src/mapmanager.cpp" line="943"/> <source>Maps storage folder does not exist: </source> <translation>Kart lagringsmappen finnes ikke:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="346"/> - <location filename="../src/mapmanager.cpp" line="815"/> + <location filename="../src/mapmanager.cpp" line="352"/> + <location filename="../src/mapmanager.cpp" line="821"/> <source>No maps were requested</source> <translation>Ingen kart ble forespurt</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="367"/> + <location filename="../src/mapmanager.cpp" line="373"/> <source>No maps loaded: %1</source> <translation>Ingen kart lastet: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="842"/> + <location filename="../src/mapmanager.cpp" line="848"/> <source>%1: version of dataset for %2 is not supported</source> <translation>%1: versjon av datasettet for %2 støttes ikke</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="393"/> + <location filename="../src/mapmanager.cpp" line="399"/> <source>Missing dataset for %1: %2</source> <translation>Manglende datasett for %1: %2</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="306"/> + <location filename="../src/mapmanager.cpp" line="312"/> <source>Mapnik World coastlines</source> <translation>Mapnik verdens kystlinjer</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="308"/> + <location filename="../src/mapmanager.cpp" line="314"/> <source>Mapbox GL World overlay</source> <translation>Mapbox GL verdens overlegg</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="310"/> + <location filename="../src/mapmanager.cpp" line="316"/> <source>Mapbox GL fonts</source> <translation>Mapbox GL fonter</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="440"/> + <location filename="../src/mapmanager.cpp" line="446"/> <source>Available country or territory: </source> <translation>Tilgjengelig land eller territorium:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="641"/> + <location filename="../src/mapmanager.cpp" line="647"/> <source>World</source> <translation>Verden</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="705"/> + <location filename="../src/mapmanager.cpp" line="711"/> <source>Removing country from requested list: </source> <translation>Fjerner landet fra forespurt listen:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="863"/> + <location filename="../src/mapmanager.cpp" line="869"/>
[-] [+]	Changed	_service:tar_git:harbour-osmscout-server-1.15.5.tar.bz2/translations/harbour-osmscout-server-nl.ts ^
@@ -97,25 +97,55 @@ <context> <name>AppSettings</name> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mph</source> <translation>mpu</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mi.</source> <translation>mi.</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km/h</source> <translation>km/u</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km</source> <translation>km</translation> </message> + <message> + <location filename="../src/appsettings.cpp" line="385"/> + <source>Default</source> + <translation>Standaard</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="386"/> + <source>Recommended for raster tiles maps</source> + <translation>Aanbevolen voor kaarten op basis van rastertegels</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="387"/> + <source>Recommended for vector and raster tiles maps</source> + <translation>Aanbevolen voor kaarten op basis van vector- en rastertegels</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="388"/> + <source><i>libosmscout</i> with <i>Geocoder-NLP</i></source> + <translation><i>libosmscout</i> met <i>Geocoder-NLP</i></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="389"/> + <source><i>libosmscout</i></source> + <translation><i>libosmscout</i></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="390"/> + <source>Custom</source> + <translation>Aangepast</translation> + </message> </context> <context> <name>CountryDetailsPage</name> @@ -694,217 +724,217 @@ <context> <name>MapManager::Manager</name> <message> - <location filename="../src/mapmanager.cpp" line="70"/> + <location filename="../src/mapmanager.cpp" line="76"/> <source>Could not allocate Map Manager features</source> <translation>Kon kaartbeheerderfunctionaliteit niet toewijzen</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="116"/> + <location filename="../src/mapmanager.cpp" line="122"/> <source>Storage folder changed to %1</source> <translation>Opslagmap gewijzigd naar %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="123"/> + <location filename="../src/mapmanager.cpp" line="129"/> <source>Maps storage folder does not exist: %1</source> <translation>Kaartopslagmap bestaat niet: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="126"/> + <location filename="../src/mapmanager.cpp" line="132"/> <source>Maps storage folder path does not point to a directory: %1</source> <translation>Pad voor kaartopslagmap verwijst niet naar een map: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="132"/> + <location filename="../src/mapmanager.cpp" line="138"/> <source>Maps storage folder is not writable, please adjust permissions for %1</source> <translation>Kaartopslagmap is alleen-lezen, pas de toegangsrechten voor %1 aan</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="185"/> - <location filename="../src/mapmanager.cpp" line="187"/> + <location filename="../src/mapmanager.cpp" line="191"/> + <location filename="../src/mapmanager.cpp" line="193"/> <source>Failed to open the database for tracking downloaded files</source> <translation>Openen van database voor het volgen van gedownloade bestanden mislukt</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="188"/> + <location filename="../src/mapmanager.cpp" line="194"/> <source>Map Manager functionality would be disturbed</source> <translation>Functionaliteit van Kaartbeheerder zou worden verstoord</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="250"/> + <location filename="../src/mapmanager.cpp" line="256"/> <source>Cannot create directory without any name</source> <translation>Kan geen naamloze map aanmaken</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="257"/> + <location filename="../src/mapmanager.cpp" line="263"/> <source>Error creating directory %1</source> <translation>Fout bij aanmaken van map %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="304"/> + <location filename="../src/mapmanager.cpp" line="310"/> <source>Address parsing language support</source> <translation>Adresverwerkingstaalondersteuning</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="337"/> - <location filename="../src/mapmanager.cpp" line="808"/> - <location filename="../src/mapmanager.cpp" line="937"/> + <location filename="../src/mapmanager.cpp" line="343"/> + <location filename="../src/mapmanager.cpp" line="814"/> + <location filename="../src/mapmanager.cpp" line="943"/> <source>Maps storage folder does not exist: </source> <translation>Kaartopslagmap bestaat niet:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="346"/> - <location filename="../src/mapmanager.cpp" line="815"/> + <location filename="../src/mapmanager.cpp" line="352"/> + <location filename="../src/mapmanager.cpp" line="821"/> <source>No maps were requested</source> <translation>Geen kaarten opgevraagd</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="367"/> + <location filename="../src/mapmanager.cpp" line="373"/> <source>No maps loaded: %1</source> <translation>Geen kaarten geladen: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="842"/> + <location filename="../src/mapmanager.cpp" line="848"/> <source>%1: version of dataset for %2 is not supported</source> <translation>%1: versie van gegevensset voor %2 wordt niet ondersteund</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="393"/> + <location filename="../src/mapmanager.cpp" line="399"/> <source>Missing dataset for %1: %2</source> <translation>Ontbrekende gegevensset voor %1: %2</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="306"/> + <location filename="../src/mapmanager.cpp" line="312"/> <source>Mapnik World coastlines</source> <translation>Mapnik-wereldkustlijnen</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="308"/> + <location filename="../src/mapmanager.cpp" line="314"/> <source>Mapbox GL World overlay</source> <translation>Mapbox GL-wereldoverlay</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="310"/> + <location filename="../src/mapmanager.cpp" line="316"/> <source>Mapbox GL fonts</source> <translation>Mapbox GL-lettertypen</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="440"/> + <location filename="../src/mapmanager.cpp" line="446"/> <source>Available country or territory: </source> <translation>Beschikbaar land of territorium:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="641"/> + <location filename="../src/mapmanager.cpp" line="647"/> <source>World</source> <translation>Wereld</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="705"/> + <location filename="../src/mapmanager.cpp" line="711"/> <source>Removing country from requested list: </source> <translation>Land wordt verwijderd van opgevraagde lijst:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="863"/> + <location filename="../src/mapmanager.cpp" line="869"/>
[-] [+]	Changed	_service:tar_git:harbour-osmscout-server-1.15.5.tar.bz2/translations/harbour-osmscout-server-nl_BE.ts ^
@@ -97,25 +97,55 @@ <context> <name>AppSettings</name> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mph</source> <translation>mpu</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mi.</source> <translation>mi.</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km/h</source> <translation>km/u</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km</source> <translation>km</translation> </message> + <message> + <location filename="../src/appsettings.cpp" line="385"/> + <source>Default</source> + <translation>Standaard</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="386"/> + <source>Recommended for raster tiles maps</source> + <translation>Aanbevolen voor kaarten op basis van rastertegels</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="387"/> + <source>Recommended for vector and raster tiles maps</source> + <translation>Aanbevolen voor kaarten op basis van vector- en rastertegels</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="388"/> + <source><i>libosmscout</i> with <i>Geocoder-NLP</i></source> + <translation><i>libosmscout</i> met <i>Geocoder-NLP</i></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="389"/> + <source><i>libosmscout</i></source> + <translation><i>libosmscout</i></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="390"/> + <source>Custom</source> + <translation>Aangepast</translation> + </message> </context> <context> <name>CountryDetailsPage</name> @@ -694,217 +724,217 @@ <context> <name>MapManager::Manager</name> <message> - <location filename="../src/mapmanager.cpp" line="70"/> + <location filename="../src/mapmanager.cpp" line="76"/> <source>Could not allocate Map Manager features</source> <translation>Kon kaartbeheerderfunctionaliteit niet toewijzen</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="116"/> + <location filename="../src/mapmanager.cpp" line="122"/> <source>Storage folder changed to %1</source> <translation>Opslagmap gewijzigd naar %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="123"/> + <location filename="../src/mapmanager.cpp" line="129"/> <source>Maps storage folder does not exist: %1</source> <translation>Kaartopslagmap bestaat niet: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="126"/> + <location filename="../src/mapmanager.cpp" line="132"/> <source>Maps storage folder path does not point to a directory: %1</source> <translation>Pad voor kaartopslagmap verwijst niet naar een map: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="132"/> + <location filename="../src/mapmanager.cpp" line="138"/> <source>Maps storage folder is not writable, please adjust permissions for %1</source> <translation>Kaartopslagmap is alleen-lezen, past de toegangsrechten voor %1 aan</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="185"/> - <location filename="../src/mapmanager.cpp" line="187"/> + <location filename="../src/mapmanager.cpp" line="191"/> + <location filename="../src/mapmanager.cpp" line="193"/> <source>Failed to open the database for tracking downloaded files</source> <translation>Openen van databank voor het volgen van gedownloade bestanden mislukt</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="188"/> + <location filename="../src/mapmanager.cpp" line="194"/> <source>Map Manager functionality would be disturbed</source> <translation>Functionaliteit van Kaartbeheerder zou verstoord worden</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="250"/> + <location filename="../src/mapmanager.cpp" line="256"/> <source>Cannot create directory without any name</source> <translation>Kan geen naamloze map aanmaken</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="257"/> + <location filename="../src/mapmanager.cpp" line="263"/> <source>Error creating directory %1</source> <translation>Fout bij aanmaken van map %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="304"/> + <location filename="../src/mapmanager.cpp" line="310"/> <source>Address parsing language support</source> <translation>Adresverwerkingstaalondersteuning</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="337"/> - <location filename="../src/mapmanager.cpp" line="808"/> - <location filename="../src/mapmanager.cpp" line="937"/> + <location filename="../src/mapmanager.cpp" line="343"/> + <location filename="../src/mapmanager.cpp" line="814"/> + <location filename="../src/mapmanager.cpp" line="943"/> <source>Maps storage folder does not exist: </source> <translation>Kaartopslagmap bestaat niet:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="346"/> - <location filename="../src/mapmanager.cpp" line="815"/> + <location filename="../src/mapmanager.cpp" line="352"/> + <location filename="../src/mapmanager.cpp" line="821"/> <source>No maps were requested</source> <translation>Geen kaarten opgevraagd</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="367"/> + <location filename="../src/mapmanager.cpp" line="373"/> <source>No maps loaded: %1</source> <translation>Geen kaarten geladen: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="842"/> + <location filename="../src/mapmanager.cpp" line="848"/> <source>%1: version of dataset for %2 is not supported</source> <translation>%1: versie van gegevensset voor %2 wordt niet ondersteund</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="393"/> + <location filename="../src/mapmanager.cpp" line="399"/> <source>Missing dataset for %1: %2</source> <translation>Ontbrekende gegevensset voor %1: %2</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="306"/> + <location filename="../src/mapmanager.cpp" line="312"/> <source>Mapnik World coastlines</source> <translation>Mapnik-wereldkustlijnen</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="308"/> + <location filename="../src/mapmanager.cpp" line="314"/> <source>Mapbox GL World overlay</source> <translation>Mapbox GL-wereldoverlay</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="310"/> + <location filename="../src/mapmanager.cpp" line="316"/> <source>Mapbox GL fonts</source> <translation>Mapbox GL-lettertypen</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="440"/> + <location filename="../src/mapmanager.cpp" line="446"/> <source>Available country or territory: </source> <translation>Beschikbaar land of territorium:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="641"/> + <location filename="../src/mapmanager.cpp" line="647"/> <source>World</source> <translation>Wereld</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="705"/> + <location filename="../src/mapmanager.cpp" line="711"/> <source>Removing country from requested list: </source> <translation>Land wordt verwijderd uit opgevraagde lijst:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="863"/> + <location filename="../src/mapmanager.cpp" line="869"/>
[-] [+]	Changed	_service:tar_git:harbour-osmscout-server-1.15.5.tar.bz2/translations/harbour-osmscout-server-pl.ts ^
@@ -97,25 +97,55 @@ <context> <name>AppSettings</name> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mph</source> <translation>mph</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mi.</source> <translation>mi</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km/h</source> <translation>km/h</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km</source> <translation>km</translation> </message> + <message> + <location filename="../src/appsettings.cpp" line="385"/> + <source>Default</source> + <translation>Domyślny</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="386"/> + <source>Recommended for raster tiles maps</source> + <translation>Rekomendowane dla kafelków map rastrowych</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="387"/> + <source>Recommended for vector and raster tiles maps</source> + <translation>Zalecane dla kafelków map wektorowych i rastrowych</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="388"/> + <source><i>libosmscout</i> with <i>Geocoder-NLP</i></source> + <translation><i>libosmscout</i> z <i>Geocoder-NLP</i></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="389"/> + <source><i>libosmscout</i></source> + <translation><i>libosmscout</i></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="390"/> + <source>Custom</source> + <translation>Wybrany</translation> + </message> </context> <context> <name>CountryDetailsPage</name> @@ -694,217 +724,217 @@ <context> <name>MapManager::Manager</name> <message> - <location filename="../src/mapmanager.cpp" line="70"/> + <location filename="../src/mapmanager.cpp" line="76"/> <source>Could not allocate Map Manager features</source> <translation>Nie można przydzielić funkcji Map Manager'a</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="116"/> + <location filename="../src/mapmanager.cpp" line="122"/> <source>Storage folder changed to %1</source> <translation>Katalog przechowywania zmieniony na %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="123"/> + <location filename="../src/mapmanager.cpp" line="129"/> <source>Maps storage folder does not exist: %1</source> <translation>Katalog przechowywania map nie istnieje: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="126"/> + <location filename="../src/mapmanager.cpp" line="132"/> <source>Maps storage folder path does not point to a directory: %1</source> <translation>Ścieżka katalogu przechowywania map nie wskazuje katalogu: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="132"/> + <location filename="../src/mapmanager.cpp" line="138"/> <source>Maps storage folder is not writable, please adjust permissions for %1</source> <translation>Katalog przechowywania map nie ma uprawnień do zapisu, zmień jego uprawnienia na %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="185"/> - <location filename="../src/mapmanager.cpp" line="187"/> + <location filename="../src/mapmanager.cpp" line="191"/> + <location filename="../src/mapmanager.cpp" line="193"/> <source>Failed to open the database for tracking downloaded files</source> <translation>Niepowodzenie przy otwieraniu bazy danych śledzenia ściągniętych plików</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="188"/> + <location filename="../src/mapmanager.cpp" line="194"/> <source>Map Manager functionality would be disturbed</source> <translation>Funkcjonalność Managera Map może być zakłócona</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="250"/> + <location filename="../src/mapmanager.cpp" line="256"/> <source>Cannot create directory without any name</source> <translation>Nie można utworzyć katalogu bez nazwy</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="257"/> + <location filename="../src/mapmanager.cpp" line="263"/> <source>Error creating directory %1</source> <translation>Błąd podczas tworzenia katalogu %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="304"/> + <location filename="../src/mapmanager.cpp" line="310"/> <source>Address parsing language support</source> <translation>Wsparcie parsowanie adresu języka</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="337"/> - <location filename="../src/mapmanager.cpp" line="808"/> - <location filename="../src/mapmanager.cpp" line="937"/> + <location filename="../src/mapmanager.cpp" line="343"/> + <location filename="../src/mapmanager.cpp" line="814"/> + <location filename="../src/mapmanager.cpp" line="943"/> <source>Maps storage folder does not exist: </source> <translation>Katalog z mapami nie istnieje</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="346"/> - <location filename="../src/mapmanager.cpp" line="815"/> + <location filename="../src/mapmanager.cpp" line="352"/> + <location filename="../src/mapmanager.cpp" line="821"/> <source>No maps were requested</source> <translation>Nie wybrano map</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="367"/> + <location filename="../src/mapmanager.cpp" line="373"/> <source>No maps loaded: %1</source> <translation>Brak załadowanych map: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="842"/> + <location filename="../src/mapmanager.cpp" line="848"/> <source>%1: version of dataset for %2 is not supported</source> <translation>%1: wersja zbioru danych dla %2 jest nie wspierana</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="393"/> + <location filename="../src/mapmanager.cpp" line="399"/> <source>Missing dataset for %1: %2</source> <translation>Brakujący zbiór danych dla %1: %2</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="306"/> + <location filename="../src/mapmanager.cpp" line="312"/> <source>Mapnik World coastlines</source> <translation>Wybrzeża świata Mapnik</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="308"/> + <location filename="../src/mapmanager.cpp" line="314"/> <source>Mapbox GL World overlay</source> <translation>Nakładka Mapbox GL World</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="310"/> + <location filename="../src/mapmanager.cpp" line="316"/> <source>Mapbox GL fonts</source> <translation>Czcionki Mapbox GL</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="440"/> + <location filename="../src/mapmanager.cpp" line="446"/> <source>Available country or territory: </source> <translation>Dostępne państwa lub terytoria:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="641"/> + <location filename="../src/mapmanager.cpp" line="647"/> <source>World</source> <translation>Świat</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="705"/> + <location filename="../src/mapmanager.cpp" line="711"/> <source>Removing country from requested list: </source> <translation>Usuwanie państwa z listy żądanych:</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="863"/> + <location filename="../src/mapmanager.cpp" line="869"/>
[-] [+]	Changed	_service:tar_git:harbour-osmscout-server-1.15.5.tar.bz2/translations/harbour-osmscout-server-ru.ts ^
@@ -26,7 +26,7 @@ <message> <location filename="../qml/AboutPage.qml" line="44"/> <source>Banner photo by %1 (%2 licanse).</source> - <translation type="unfinished"></translation> + <translation>Фото на баннере от %1 (лицензия %2).</translation> </message> <message> <location filename="../qml/AboutPage.qml" line="46"/> @@ -97,25 +97,55 @@ <context> <name>AppSettings</name> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mph</source> <translation>миль/ч</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mi.</source> <translation>миль</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km/h</source> <translation>км/ч</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km</source> <translation>км</translation> </message> + <message> + <location filename="../src/appsettings.cpp" line="385"/> + <source>Default</source> + <translation>По умолчанию</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="386"/> + <source>Recommended for raster tiles maps</source> + <translation>Рекомендовано для растровых карт</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="387"/> + <source>Recommended for vector and raster tiles maps</source> + <translation>Рекомендовано для карт с векторными и растровыми тайлами</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="388"/> + <source><i>libosmscout</i> with <i>Geocoder-NLP</i></source> + <translation><i>libosmscout</i> и <i>Geocoder-NLP</i></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="389"/> + <source><i>libosmscout</i></source> + <translation><i>libosmscout</i></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="390"/> + <source>Custom</source> + <translation>Пользовательский</translation> + </message> </context> <context> <name>CountryDetailsPage</name> @@ -694,217 +724,217 @@ <context> <name>MapManager::Manager</name> <message> - <location filename="../src/mapmanager.cpp" line="70"/> + <location filename="../src/mapmanager.cpp" line="76"/> <source>Could not allocate Map Manager features</source> <translation>Невозможно назначить параметры Диспетчера Карт</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="116"/> + <location filename="../src/mapmanager.cpp" line="122"/> <source>Storage folder changed to %1</source> <translation>Папка хранения изменена на %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="123"/> + <location filename="../src/mapmanager.cpp" line="129"/> <source>Maps storage folder does not exist: %1</source> <translation>Нет папки для хранения карт: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="126"/> + <location filename="../src/mapmanager.cpp" line="132"/> <source>Maps storage folder path does not point to a directory: %1</source> <translation>Путь папки хранения карт не указывает на каталог: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="132"/> + <location filename="../src/mapmanager.cpp" line="138"/> <source>Maps storage folder is not writable, please adjust permissions for %1</source> <translation>Папка хранения карт недоступна для записи. Необходимо изменить разрешения для %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="185"/> - <location filename="../src/mapmanager.cpp" line="187"/> + <location filename="../src/mapmanager.cpp" line="191"/> + <location filename="../src/mapmanager.cpp" line="193"/> <source>Failed to open the database for tracking downloaded files</source> <translation>Невозможно открыть базу данных для отслеживания загруженных файлов</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="188"/> + <location filename="../src/mapmanager.cpp" line="194"/> <source>Map Manager functionality would be disturbed</source> <translation>Функциональность Диспетчера Карт возможно нарушена</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="250"/> + <location filename="../src/mapmanager.cpp" line="256"/> <source>Cannot create directory without any name</source> <translation>Невозможно создать каталог без имени</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="257"/> + <location filename="../src/mapmanager.cpp" line="263"/> <source>Error creating directory %1</source> <translation>Ошибка создания каталога %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="304"/> + <location filename="../src/mapmanager.cpp" line="310"/> <source>Address parsing language support</source> <translation>Поддержка языка анализа адреса</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="337"/> - <location filename="../src/mapmanager.cpp" line="808"/> - <location filename="../src/mapmanager.cpp" line="937"/> + <location filename="../src/mapmanager.cpp" line="343"/> + <location filename="../src/mapmanager.cpp" line="814"/> + <location filename="../src/mapmanager.cpp" line="943"/> <source>Maps storage folder does not exist: </source> <translation>Папка хранения карт отсутствует</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="346"/> - <location filename="../src/mapmanager.cpp" line="815"/> + <location filename="../src/mapmanager.cpp" line="352"/> + <location filename="../src/mapmanager.cpp" line="821"/> <source>No maps were requested</source> <translation>Карты не были запрошены</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="367"/> + <location filename="../src/mapmanager.cpp" line="373"/> <source>No maps loaded: %1</source> <translation>Карты не загружены: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="842"/> + <location filename="../src/mapmanager.cpp" line="848"/> <source>%1: version of dataset for %2 is not supported</source> <translation>%1: версия набора данных для %2 не поддерживается</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="393"/> + <location filename="../src/mapmanager.cpp" line="399"/> <source>Missing dataset for %1: %2</source> <translation>Отсутствует набор данных для %1: %2</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="306"/> + <location filename="../src/mapmanager.cpp" line="312"/> <source>Mapnik World coastlines</source> <translation>Береговые линии земного шара от Mapnik</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="308"/> + <location filename="../src/mapmanager.cpp" line="314"/> <source>Mapbox GL World overlay</source> <translation>Наложение по земному шару от Mapbox GL</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="310"/> + <location filename="../src/mapmanager.cpp" line="316"/> <source>Mapbox GL fonts</source> <translation>Шрифты Mapbox GL</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="440"/> + <location filename="../src/mapmanager.cpp" line="446"/> <source>Available country or territory: </source> <translation>Доступна страна или территория</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="641"/> + <location filename="../src/mapmanager.cpp" line="647"/> <source>World</source> <translation>Планета</translation> </message>
[-] [+]	Changed	_service:tar_git:harbour-osmscout-server-1.15.5.tar.bz2/translations/harbour-osmscout-server-sv.ts ^
@@ -26,7 +26,7 @@ <message> <location filename="../qml/AboutPage.qml" line="44"/> <source>Banner photo by %1 (%2 licanse).</source> - <translation type="unfinished"></translation> + <translation>Banderollfoto av %1 (%2-licens).</translation> </message> <message> <location filename="../qml/AboutPage.qml" line="46"/> @@ -97,25 +97,55 @@ <context> <name>AppSettings</name> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mph</source> <translation>mph</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mi.</source> <translation>mi.</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km/h</source> <translation>km/h</translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km</source> <translation>km</translation> </message> + <message> + <location filename="../src/appsettings.cpp" line="385"/> + <source>Default</source> + <translation>Standard</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="386"/> + <source>Recommended for raster tiles maps</source> + <translation>Rekommenderas för rasterkartor</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="387"/> + <source>Recommended for vector and raster tiles maps</source> + <translation>Rekommenderas för vektor- och rasterbaserade kartrutor</translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="388"/> + <source><i>libosmscout</i> with <i>Geocoder-NLP</i></source> + <translation><i>libosmscout</i> med <i>Geocoder-NLP</i></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="389"/> + <source><i>libosmscout</i></source> + <translation><i>libosmscout</i></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="390"/> + <source>Custom</source> + <translation>Anpassad</translation> + </message> </context> <context> <name>CountryDetailsPage</name> @@ -694,217 +724,217 @@ <context> <name>MapManager::Manager</name> <message> - <location filename="../src/mapmanager.cpp" line="70"/> + <location filename="../src/mapmanager.cpp" line="76"/> <source>Could not allocate Map Manager features</source> <translation>Kunde inte allokera karthanteringsfunktioner</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="116"/> + <location filename="../src/mapmanager.cpp" line="122"/> <source>Storage folder changed to %1</source> <translation>Lagringsmappen ändrad till %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="123"/> + <location filename="../src/mapmanager.cpp" line="129"/> <source>Maps storage folder does not exist: %1</source> <translation>Kartlagringsmappen finns inte: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="126"/> + <location filename="../src/mapmanager.cpp" line="132"/> <source>Maps storage folder path does not point to a directory: %1</source> <translation>Sökvägen för kartlagring pekar inte mot någon mapp: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="132"/> + <location filename="../src/mapmanager.cpp" line="138"/> <source>Maps storage folder is not writable, please adjust permissions for %1</source> <translation>Kartlagringsmappen är inte skrivbar, justera rättigheterna för %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="185"/> - <location filename="../src/mapmanager.cpp" line="187"/> + <location filename="../src/mapmanager.cpp" line="191"/> + <location filename="../src/mapmanager.cpp" line="193"/> <source>Failed to open the database for tracking downloaded files</source> <translation>Kunde inte öppna databasen för att spåra nerladdade filer</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="188"/> + <location filename="../src/mapmanager.cpp" line="194"/> <source>Map Manager functionality would be disturbed</source> <translation>Karthanteringsfunktioner kommer att störas</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="250"/> + <location filename="../src/mapmanager.cpp" line="256"/> <source>Cannot create directory without any name</source> <translation>Kan inte skapa en mapp utan namn</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="257"/> + <location filename="../src/mapmanager.cpp" line="263"/> <source>Error creating directory %1</source> <translation>Kunde inte skapa mappen %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="304"/> + <location filename="../src/mapmanager.cpp" line="310"/> <source>Address parsing language support</source> <translation>Språkstöd för adresstolkning</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="337"/> - <location filename="../src/mapmanager.cpp" line="808"/> - <location filename="../src/mapmanager.cpp" line="937"/> + <location filename="../src/mapmanager.cpp" line="343"/> + <location filename="../src/mapmanager.cpp" line="814"/> + <location filename="../src/mapmanager.cpp" line="943"/> <source>Maps storage folder does not exist: </source> <translation>Kartlagringsmappen finns inte: </translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="346"/> - <location filename="../src/mapmanager.cpp" line="815"/> + <location filename="../src/mapmanager.cpp" line="352"/> + <location filename="../src/mapmanager.cpp" line="821"/> <source>No maps were requested</source> <translation>Inga kartor efterfrågades</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="367"/> + <location filename="../src/mapmanager.cpp" line="373"/> <source>No maps loaded: %1</source> <translation>Inga kartor inlästa: %1</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="842"/> + <location filename="../src/mapmanager.cpp" line="848"/> <source>%1: version of dataset for %2 is not supported</source> <translation>%1: Dataupssättningsversionen för %2 stöds inte</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="393"/> + <location filename="../src/mapmanager.cpp" line="399"/> <source>Missing dataset for %1: %2</source> <translation>Saknad datamängd för %1: %2</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="306"/> + <location filename="../src/mapmanager.cpp" line="312"/> <source>Mapnik World coastlines</source> <translation>Mapnik World kustlinjer</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="308"/> + <location filename="../src/mapmanager.cpp" line="314"/> <source>Mapbox GL World overlay</source> <translation>Mapbox GL World överlager</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="310"/> + <location filename="../src/mapmanager.cpp" line="316"/> <source>Mapbox GL fonts</source> <translation>Mapbox GL teckensnitt</translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="440"/> + <location filename="../src/mapmanager.cpp" line="446"/> <source>Available country or territory: </source> <translation>Tillgängligt land eller område: </translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="641"/> + <location filename="../src/mapmanager.cpp" line="647"/> <source>World</source> <translation>Världen</translation> </message>
[-] [+]	Changed	_service:tar_git:harbour-osmscout-server-1.15.5.tar.bz2/translations/harbour-osmscout-server.ts ^
@@ -97,25 +97,55 @@ <context> <name>AppSettings</name> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mph</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/appsettings.cpp" line="317"/> + <location filename="../src/appsettings.cpp" line="348"/> <source>mi.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km/h</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/appsettings.cpp" line="319"/> + <location filename="../src/appsettings.cpp" line="350"/> <source>km</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/appsettings.cpp" line="385"/> + <source>Default</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="386"/> + <source>Recommended for raster tiles maps</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="387"/> + <source>Recommended for vector and raster tiles maps</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="388"/> + <source><i>libosmscout</i> with <i>Geocoder-NLP</i></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="389"/> + <source><i>libosmscout</i></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/appsettings.cpp" line="390"/> + <source>Custom</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CountryDetailsPage</name> @@ -694,217 +724,217 @@ <context> <name>MapManager::Manager</name> <message> - <location filename="../src/mapmanager.cpp" line="70"/> + <location filename="../src/mapmanager.cpp" line="76"/> <source>Could not allocate Map Manager features</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="116"/> + <location filename="../src/mapmanager.cpp" line="122"/> <source>Storage folder changed to %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="123"/> + <location filename="../src/mapmanager.cpp" line="129"/> <source>Maps storage folder does not exist: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="126"/> + <location filename="../src/mapmanager.cpp" line="132"/> <source>Maps storage folder path does not point to a directory: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="132"/> + <location filename="../src/mapmanager.cpp" line="138"/> <source>Maps storage folder is not writable, please adjust permissions for %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="185"/> - <location filename="../src/mapmanager.cpp" line="187"/> + <location filename="../src/mapmanager.cpp" line="191"/> + <location filename="../src/mapmanager.cpp" line="193"/> <source>Failed to open the database for tracking downloaded files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="188"/> + <location filename="../src/mapmanager.cpp" line="194"/> <source>Map Manager functionality would be disturbed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="250"/> + <location filename="../src/mapmanager.cpp" line="256"/> <source>Cannot create directory without any name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="257"/> + <location filename="../src/mapmanager.cpp" line="263"/> <source>Error creating directory %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="304"/> + <location filename="../src/mapmanager.cpp" line="310"/> <source>Address parsing language support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="337"/> - <location filename="../src/mapmanager.cpp" line="808"/> - <location filename="../src/mapmanager.cpp" line="937"/> + <location filename="../src/mapmanager.cpp" line="343"/> + <location filename="../src/mapmanager.cpp" line="814"/> + <location filename="../src/mapmanager.cpp" line="943"/> <source>Maps storage folder does not exist: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="346"/> - <location filename="../src/mapmanager.cpp" line="815"/> + <location filename="../src/mapmanager.cpp" line="352"/> + <location filename="../src/mapmanager.cpp" line="821"/> <source>No maps were requested</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="367"/> + <location filename="../src/mapmanager.cpp" line="373"/> <source>No maps loaded: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="842"/> + <location filename="../src/mapmanager.cpp" line="848"/> <source>%1: version of dataset for %2 is not supported</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="393"/> + <location filename="../src/mapmanager.cpp" line="399"/> <source>Missing dataset for %1: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="306"/> + <location filename="../src/mapmanager.cpp" line="312"/> <source>Mapnik World coastlines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="308"/> + <location filename="../src/mapmanager.cpp" line="314"/> <source>Mapbox GL World overlay</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="310"/> + <location filename="../src/mapmanager.cpp" line="316"/> <source>Mapbox GL fonts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="440"/> + <location filename="../src/mapmanager.cpp" line="446"/> <source>Available country or territory: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="641"/> + <location filename="../src/mapmanager.cpp" line="647"/> <source>World</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="705"/> + <location filename="../src/mapmanager.cpp" line="711"/> <source>Removing country from requested list: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mapmanager.cpp" line="863"/> + <location filename="../src/mapmanager.cpp" line="869"/>
[-] [+]	Changed	_service:tar_git:harbour-osmscout-server.yaml ^
@@ -1,7 +1,7 @@ Name: harbour-osmscout-server Summary: OSM Scout Server # don't forget to set the version in osmscout-server.pro as well -Version: 1.15.0 +Version: 1.15.5 Release: 1 # The contents of the Group field should be one of the groups listed here: # http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS

Changes of Revision d1c0588e73efa1277c61fe8d13f70082