|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-server.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-server.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/.gitignore
^
|
| @@ -18,3 +18,8 @@
/osmscout-server_qtcontrols.pro*
*~
+
+# Clickable build, temporary source and config dirs
+/build/
+/libs/
+/.clickable/
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/RELEASING.md
^
|
| @@ -0,0 +1,36 @@
+# Releasing new version
+
+Update translations on desktop:
+
+```
+lupdate osmscout-server.pro -ts translations/osmscout-server.ts
+```
+
+Push source changes to Transifex and pull new translations
+
+```
+tx push -s
+tx pull -a --minimum-perc=60
+```
+
+Commit all translations
+
+```
+git add translations/*ts
+git status
+git commit -m "update translations"
+```
+
+Bump version and write changelog
+
+```
+emacs rpm/harbour-osmscout-server.spec rpm/harbour-osmscout-server.yaml rpm/harbour-osmscout-server.changes
+emacs osmscout-server.pro packaging/osmscout-server.appdata.xml packaging/ubports/manifest.json
+```
+
+Commit version changes
+```
+git add osmscout-server.pro packaging/osmscout-server.appdata.xml rpm/harbour-osmscout-server.changes rpm/harbour-osmscout-server.spec rpm/harbour-osmscout-server.yaml
+git status
+git commit -m "bump version"
+```
\ No newline at end of file
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/osmscout-server.pro
^
|
| @@ -11,7 +11,7 @@
# set version
isEmpty(VERSION) {
- VERSION = 1.15.6
+ VERSION = 1.16.0
}
# Find out flavor and add it to CONFIG for simple testing
@@ -21,6 +21,8 @@
CONFIG += scout_kirigami
} else:equals(SCOUT_FLAVOR, "qtcontrols") {
CONFIG += scout_qtcontrols
+} else:equals(SCOUT_FLAVOR, "ubports") {
+ CONFIG += scout_ubports
} else {
CONFIG += scout_console
}
@@ -68,8 +70,8 @@
!scout_console|use_map_qt {
QT += gui
}
-scout_kirigami|scout_qtcontrols {
- QT += quick qml widgets
+scout_kirigami|scout_qtcontrols|scout_ubports {
+ QT += quick qml widgets quickcontrols2
}
# Overall CONFIG
@@ -88,6 +90,12 @@
}
}
+# PREFIX_RUNNING
+isEmpty(PREFIX_RUNNING) {
+ PREFIX_RUNNING = $$PREFIX
+}
+
+
# installs
styles.files = styles
styles.path = $$PREFIX/share/$${TARGET}
@@ -114,18 +122,18 @@
INSTALLS += extra_icons
}
-scout_kirigami|scout_qtcontrols {
+scout_kirigami|scout_qtcontrols|scout_ubports {
icons108.path = $$PREFIX/share/icons/hicolor/108x108/apps
- icons108.extra = cp $$PWD/icons/108x108/harbour-osmscout-server.png $(INSTALL_ROOT)$$PREFIX/share/icons/hicolor/108x108/apps/$${TARGET}.png
+ icons108.extra = mkdir -p $(INSTALL_ROOT)/$$PREFIX/share/icons/hicolor/108x108/apps && cp $$PWD/icons/108x108/harbour-osmscout-server.png $(INSTALL_ROOT)/$$PREFIX/share/icons/hicolor/108x108/apps/$${TARGET}.png
INSTALLS += icons108
icons128.path = $$PREFIX/share/icons/hicolor/128x128/apps
- icons128.extra = cp $$PWD/icons/128x128/harbour-osmscout-server.png $(INSTALL_ROOT)$$PREFIX/share/icons/hicolor/128x128/apps/$${TARGET}.png
+ icons128.extra = mkdir -p $(INSTALL_ROOT)/$$PREFIX/share/icons/hicolor/128x128/apps && cp $$PWD/icons/128x128/harbour-osmscout-server.png $(INSTALL_ROOT)/$$PREFIX/share/icons/hicolor/128x128/apps/$${TARGET}.png
INSTALLS += icons128
icons256.path = $$PREFIX/share/icons/hicolor/256x256/apps
- icons256.extra = cp $$PWD/icons/256x256/harbour-osmscout-server.png $(INSTALL_ROOT)$$PREFIX/share/icons/hicolor/256x256/apps/$${TARGET}.png
+ icons256.extra = mkdir -p $(INSTALL_ROOT)/$$PREFIX/share/icons/hicolor/256x256/apps && cp $$PWD/icons/256x256/harbour-osmscout-server.png $(INSTALL_ROOT)/$$PREFIX/share/icons/hicolor/256x256/apps/$${TARGET}.png
INSTALLS += icons256
icons86.path = $$PREFIX/share/icons/hicolor/86x86/apps
- icons86.extra = cp $$PWD/icons/86x86/harbour-osmscout-server.png $(INSTALL_ROOT)$$PREFIX/share/icons/hicolor/86x86/apps/$${TARGET}.png
+ icons86.extra = mkdir -p $(INSTALL_ROOT)/$$PREFIX/share/icons/hicolor/86x86/apps && cp $$PWD/icons/86x86/harbour-osmscout-server.png $(INSTALL_ROOT)/$$PREFIX/share/icons/hicolor/86x86/apps/$${TARGET}.png
INSTALLS += icons86
appdata.path =$$PREFIX/share/metainfo
@@ -138,14 +146,18 @@
DEFINES += APP_VERSION=\\\"$$VERSION\\\"
scout_silica {
DEFINES += IS_SAILFISH_OS
-} else:scout_qtcontrols|scout_kirigami {
+} else:scout_qtcontrols|scout_kirigami|scout_ubports {
DEFINES += IS_QTCONTROLS_QT
} else {
DEFINES += IS_CONSOLE_QT
}
+scout_ubports {
+ DEFINES += DEFAULT_FALLBACK_STYLE=\\\"suru\\\"
+}
+
# default prefix for data
-DEFINES += DEFAULT_DATA_PREFIX=\\\"$${PREFIX}/share/$${TARGET}/\\\"
+DEFINES += DEFAULT_DATA_PREFIX=\\\"$${PREFIX_RUNNING}/share/$${TARGET}/\\\"
# The following define makes your compiler emit warnings if you use
# any feature of Qt which as been marked deprecated (the exact warnings
@@ -218,6 +230,7 @@
OTHER_FILES += qml/*.qml
OTHER_FILES += qml/platform.qtcontrols/*.qml
OTHER_FILES += qml/platform.kirigami/*.qml
+OTHER_FILES += qml/platform.ubports/*.qml
OTHER_FILES += qml/platform.silica/*.qml
# includes
@@ -251,10 +264,10 @@
}
# geocoder-nlp is enabled always
-DEFINES += GEOCODERNLP_ALIASFILE=\\\"$${PREFIX}/share/$${TARGET}/data/geocoder-npl-tag-aliases.json\\\"
+DEFINES += GEOCODERNLP_ALIASFILE=\\\"$${PREFIX_RUNNING}/share/$${TARGET}/data/geocoder-npl-tag-aliases.json\\\"
# mapbox gl is enabled always
-DEFINES += MAPBOXGL_STYLEDIR=\\\"$${PREFIX}/share/$${TARGET}/styles/mapboxgl\\\"
+DEFINES += MAPBOXGL_STYLEDIR=\\\"$${PREFIX_RUNNING}/share/$${TARGET}/styles/mapboxgl\\\"
use_mapnik {
DEFINES += USE_MAPNIK
@@ -263,7 +276,7 @@
DEFINES += MAPNIK_FONTS_DIR=\\\"/usr/share/harbour-osmscout-server-module-fonts/fonts\\\"
DEFINES += MAPNIK_INPUT_PLUGINS_DIR=\\\"/usr/share/$${TARGET}/lib/mapnik/input\\\"
} else {
- DEFINES += MAPNIK_FONTS_DIR=\\\"$${PREFIX}/share/osmscout-server-fonts/fonts\\\"
+ DEFINES += MAPNIK_FONTS_DIR=\\\"$${PREFIX_RUNNING}/share/osmscout-server-fonts/fonts\\\"
DEFINES += MAPNIK_INPUT_PLUGINS_DIR=\\\"$$system(mapnik-config --input-plugins)\\\"
}
LIBS += -lmapnik -licuuc
@@ -271,7 +284,7 @@
use_valhalla {
DEFINES += USE_VALHALLA
- DEFINES += VALHALLA_CONFIG_TEMPLATE=\\\"$${PREFIX}/share/$${TARGET}/data/valhalla.json\\\"
+ DEFINES += VALHALLA_CONFIG_TEMPLATE=\\\"$${PREFIX_RUNNING}/share/$${TARGET}/data/valhalla.json\\\"
PKGCONFIG += libvalhalla
}
@@ -306,7 +319,13 @@
translations/$${TARGET}-ru.ts \
translations/$${TARGET}-sv.ts \
translations/$${TARGET}-nl_BE.ts \
- translations/$${TARGET}-it_IT.ts
+ translations/$${TARGET}-it_IT.ts \
+ translations/$${TARGET}-pt_BR.ts
+
+scout_kirigami|scout_qtcontrols|scout_ubports {
+ CONFIG += lrelease embed_translations
+}
+
DISTFILES += $${TARGET}.desktop
@@ -317,13 +336,13 @@
rpm/$${TARGET}.spec
}
-scout_kirigami|scout_qtcontrols {
+scout_kirigami|scout_qtcontrols|scout_ubports {
RESOURCES += qml_main.qrc
RESOURCES += icons.qrc
}
scout_kirigami: RESOURCES += qml_kirigami.qrc
scout_qtcontrols: RESOURCES += qml_qtcontrols.qrc
-
+scout_ubports: RESOURCES += qml_ubports.qrc
# misc options
scout_silica {
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/packaging/osmscout-server.appdata.xml
^
|
| @@ -39,6 +39,16 @@
</screenshots>
<metadata_license>CC-BY-SA-3.0</metadata_license>
<releases>
+ <release version="1.16.0" date="2020-01-22">
+ <description>
+ <ul>
+ <li>Add Ubuntu Touch support [jonnius]</li>
+ <li>Fix loading of translations for desktop and Ubuntu Touch</li>
+ <li>Update translations</li>
+ <li>Bugfixes</li>
+ </ul>
+ </description>
+ </release>
<release version="1.15.6" date="2019-11-30">
<description>
<ul>
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/packaging/ubports/README.md
^
|
| @@ -0,0 +1,48 @@
+# Ubuntu Touch Packaging
+
+## Preparations
+
+Install [Clickable](http://clickable.bhdouglass.com/en/latest/install.html)
+which is used to build and publish click packages.
+
+You may want to create a symlink to the config file to omit the `-c` flag in
+all clickable calls:
+
+ ln -s packaging/ubports/clickable.json clickable.json
+
+Otherwise you'll have to append `-c packaging/ubports/clickable.json` to all
+clickable commands.
+
+## Dependencies
+
+**WARNING**: Dependencies may take hours to build.
+
+Run the following command to download and compile the app dependencies:
+
+ clickable prepare-deps
+ clickable build-libs --arch armhf # for armhf devices
+ clickable build-libs --arch arm64 # for arm64 devices
+ clickable build-libs --arch amd64 # for desktop mode
+
+## Building
+
+Build the app by running
+
+ clickable build --arch armhf # for armhf devices
+ clickable build --arch arm64 # for arm64 devices
+ clickable build --arch amd64 # for desktop mode
+
+## Debugging
+
+To debug on a Ubuntu Touch device simply run
+
+ clickable # implies a clean build run, installing on device and launching
+ clickable logs # to watch logs
+
+To debug on the desktop run of these:
+
+ clickable desktop # implies a clean build run
+ clickable desktop --dirty # avoid clean before build
+ clickable desktop --skip-build # start app without building
+
+See [Clickable docs](http://clickable.bhdouglass.com/en/latest/) for details.
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/packaging/ubports/build-libpostal.sh
^
|
| @@ -0,0 +1,22 @@
+#!/bin/bash
+set -Eeuo pipefail
+
+cp -r "${SRC_DIR}"/libpostal/* .
+
+CFLAGS="-fPIC -lstdc++"
+CXXFLAGS="-fPIC"
+./bootstrap.sh
+
+SCANNER_FLAGS=""
+case ${ARCH_TRIPLET} in
+"arm-linux-gnueabihf" )
+ SCANNER_FLAGS="--with-cflags-scanner-extra=-marm"
+ ;;
+"aarch64-linux-gnu" )
+ CFLAGS="${CFLAGS} -mmarch64"
+ ;;
+esac
+
+./configure "${SCANNER_FLAGS}" --disable-sse2 --datadir="/usr/local/libpostal/data" --disable-data-download --enable-static --disable-shared --host="${ARCH_TRIPLET}"
+make -j$(nproc)
+make install DESTDIR="${INSTALL_DIR}"
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/packaging/ubports/clickable.json
^
|
| @@ -0,0 +1,128 @@
+{
+ "clickable_minimum_required": "6.8.2",
+ "template": "qmake",
+ "build_args": [
+ "SCOUT_FLAVOR=ubports",
+ "CONFIG+=disable_systemd",
+ "CONFIG+=disable_mapnik",
+ "LIBS+=-L$libosmscout_LIB_INSTALL_DIR/lib",
+ "INCLUDEPATH+=$libosmscout_LIB_INSTALL_DIR/include",
+ "LIBS+=-L$libpostal_LIB_INSTALL_DIR/usr/local/lib",
+ "INCLUDEPATH+=$libpostal_LIB_INSTALL_DIR/usr/local/include",
+ "LIBS+=-L$valhalla_LIB_INSTALL_DIR/lib",
+ "LIBS+=-L$valhalla_LIB_INSTALL_DIR/lib/$ARCH_TRIPLET",
+ "INCLUDEPATH+=$valhalla_LIB_INSTALL_DIR/include",
+ "PREFIX=/usr",
+ "PREFIX_RUNNING=usr"
+ ],
+ "env_vars": {
+ "PKG_CONFIG_PATH": "$valhalla_LIB_INSTALL_DIR/lib/pkgconfig:$valhalla_LIB_INSTALL_DIR/lib/$ARCH_TRIPLET/pkgconfig"
+ },
+ "dependencies_target": [
+ "libmicrohttpd-dev",
+ "libmarisa-dev",
+ "libicu-dev",
+ "zlib1g-dev",
+ "libcurl4-gnutls-dev",
+ "libkyotocabinet-dev",
+ "libprotobuf-dev",
+ "libboost-date-time-dev",
+ "libboost-filesystem-dev",
+ "libboost-iostreams-dev",
+ "libboost-regex-dev",
+ "libboost-system-dev",
+ "libboost-chrono-dev",
+ "liblz4-dev",
+ "qttools5-dev",
+ "libsqlite3-dev"
+ ],
+ "dependencies_build": [
+ "gcc-opt",
+ "desktop-file-utils"
+ ],
+ "postbuild": "mv $INSTALL_DIR/usr/bin/* $INSTALL_DIR",
+ "install_data": {
+ "$ROOT/icons/osmscout-server.svg": "$INSTALL_DIR",
+ "$ROOT/packaging/ubports/osmscout-server.desktop": "$INSTALL_DIR",
+ "$ROOT/packaging/ubports/osmscout-server.apparmor": "$INSTALL_DIR",
+ "$ROOT/packaging/ubports/manifest.json": "$INSTALL_DIR"
+ },
+ "install_lib": [
+ "/usr/lib/$ARCH_TRIPLET/libmicrohttpd.so*",
+ "/usr/lib/$ARCH_TRIPLET/libkyotocabinet.so*",
+ "/usr/lib/$ARCH_TRIPLET/libmarisa.so*"
+ ],
+ "scripts": {
+ "prepare-deps": "git submodule update --recursive --init && $ROOT/packaging/ubports/prepare-deps.sh"
+ },
+ "libraries": {
+ "libosmscout": {
+ "template": "cmake",
+ "build_args": [
+ "-DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_DIR/usr",
+ "-DBUILD_SHARED_LIBS=false",
+ "-DBUILD_WITH_OPENMP=OFF",
+ "-DOSMSCOUT_BUILD_MAP_OPENGL=OFF",
+ "-DOSMSCOUT_BUILD_IMPORT=OFF",
+ "-DOSMSCOUT_BUILD_MAP_AGG=OFF",
+ "-DOSMSCOUT_BUILD_MAP_CAIRO=OFF",
+ "-DOSMSCOUT_BUILD_MAP_SVG=OFF",
+ "-DOSMSCOUT_BUILD_MAP_IOSX=OFF",
+ "-DOSMSCOUT_BUILD_TESTS=OFF",
+ "-DOSMSCOUT_BUILD_DEMOS=OFF",
+ "-DOSMSCOUT_BUILD_BINDING_JAVA=OFF",
+ "-DOSMSCOUT_BUILD_BINDING_CSHARP=OFF",
+ "-DOSMSCOUT_BUILD_DOC_API=OFF",
+ "-DOSMSCOUT_BUILD_CLIENT_QT=ON",
+ "-DOSMSCOUT_BUILD_TOOL_OSMSCOUT2=OFF",
+ "-DOSMSCOUT_BUILD_TOOL_STYLEEDITOR=OFF",
+ "-DGPERFTOOLS_USAGE=OFF",
+ "-DOSMSCOUT_BUILD_TOOL_IMPORT=OFF",
+ "-DOSMSCOUT_BUILD_TOOL_DUMPDATA=OFF"
+ ],
+ "dependencies_target": [
+ "libxml2-dev",
+ "libmarisa-dev"
+ ]
+ },
+ "libpostal": {
+ "template": "custom",
+ "build": "$ROOT/packaging/ubports/build-libpostal.sh",
+ "dependencies_build": [
+ "libtool"
+ ]
+ },
+ "valhalla": {
+ "template": "cmake",
+ "src_dir": "libs/valhalla/valhalla",
+ "build_args": [
+ "-DTHREADS_PTHREAD_ARG=0",
+ "-DCMAKE_INSTALL_PREFIX:PATH=/usr",
+ "-DBUILD_SHARED_LIBS=OFF",
+ "-DENABLE_DATA_TOOLS=OFF",
+ "-DENABLE_PYTHON_BINDINGS=OFF",
+ "-DENABLE_NODE_BINDINGS=OFF",
+ "-DENABLE_SERVICES=OFF"
+ ],
+ "dependencies_target": [
+ "liblua5.3-dev",
+ "libprotobuf-dev",
+ "libcurl4-gnutls-dev",
+ "libboost-date-time-dev",
+ "libboost-filesystem-dev",
+ "libboost-iostreams-dev",
+ "libboost-regex-dev",
+ "libboost-system-dev",
+ "libboost-program-options-dev",
+ "liblz4-dev",
+ "zlib1g-dev"
+ ],
+ "dependencies_build": [
+ "libtool",
+ "gcc-opt",
+ "jq",
+ "protobuf-compiler"
+ ]
+ }
+ }
+}
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/packaging/ubports/manifest.json
^
|
| @@ -0,0 +1,15 @@
+{
+ "name": "osmscout-server.jonnius",
+ "description": "Local server providing offline map tiles, search, and routing",
+ "architecture": "@CLICK_ARCH@",
+ "title": "OSM Scout Server",
+ "hooks": {
+ "osmscout-server": {
+ "apparmor": "osmscout-server.apparmor",
+ "desktop": "osmscout-server.desktop"
+ }
+ },
+ "version": "1.16.0",
+ "maintainer": "Jonatan Hatakeyama Zeidler <jonatan_zeidler@gmx.de>",
+ "framework" : "ubuntu-sdk-16.04"
+}
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/packaging/ubports/osmscout-server.apparmor
^
|
| @@ -0,0 +1,5 @@
+{
+ "template": "unconfined",
+ "policy_groups": [],
+ "policy_version": 16.04
+}
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/packaging/ubports/osmscout-server.desktop
^
|
| @@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=OSM Scout Server
+Exec=osmscout-server %u
+Icon=osmscout-server.svg
+Type=Application
+X-Ubuntu-Touch=true
+
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/packaging/ubports/prepare-deps.sh
^
|
| @@ -0,0 +1,14 @@
+#!/bin/bash
+set -Eeuo pipefail
+
+LIBOSMSCOUT_SRC_DIR="${ROOT}/libs/libosmscout"
+LIBPOSTAL_SRC_DIR="${ROOT}/libs/libpostal"
+VALHALLA_SRC_DIR="${ROOT}/libs/valhalla"
+
+# Remove old downloads
+rm -rf "${LIBOSMSCOUT_SRC_DIR}" "${LIBPOSTAL_SRC_DIR}" "${VALHALLA_SRC_DIR}"
+
+# Download sources
+git clone --recursive --shallow-submodules --depth 1 https://github.com/rinigus/libosmscout.git "${LIBOSMSCOUT_SRC_DIR}"
+git clone --recursive --shallow-submodules -b devel https://github.com/rinigus/pkg-libpostal.git "${LIBPOSTAL_SRC_DIR}"
+git clone --recursive -b master https://github.com/rinigus/pkg-valhalla-lite.git "${VALHALLA_SRC_DIR}"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml/platform.qtcontrols/IconButtonPL.qml
^
|
| @@ -29,6 +29,7 @@
property bool iconColorize: true
property int iconHeight: 0
property alias iconName: iconimage.name
+ property real iconOpacity: 1.0
property real iconRotation
property alias iconSource: image.source
property int iconWidth: 0
@@ -41,7 +42,9 @@
id: iconimage
anchors.centerIn: parent
color: iconColorize ? styler.themeHighlightColor : "transparent"
+ opacity: iconOpacity
rotation: iconRotation
+ smooth: false
sourceSize.height: iconHeight
sourceSize.width: iconWidth
visible: name
@@ -51,6 +54,7 @@
id: image
anchors.centerIn: parent
fillMode: Image.PreserveAspectFit
+ opacity: iconOpacity
rotation: iconRotation
sourceSize.height: iconHeight
sourceSize.width: iconWidth
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml/platform.qtcontrols/LabelPL.qml
^
|
| @@ -26,6 +26,7 @@
return Text.ElideNone;
}
font.pixelSize: styler.themeFontSizeMedium
+ wrapMode: Text.NoWrap
property int truncMode: truncModes.none
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml/platform.qtcontrols/ListItemPL.qml
^
|
| @@ -50,7 +50,7 @@
acceptedButtons: Qt.RightButton
propagateComposedEvents: true
onClicked: {
- if (!menu) return
+ if (!menu || !menu.enabled) return
menu.x = mouse.x
menu.y = mouse.y
menu.visibleChanged.connect(function (){
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml/platform.qtcontrols/StylerPL.qml
^
|
| @@ -33,17 +33,17 @@
// colors
// block background (navigation, poi panel, bubble)
- property color blockBg: "#F2F2F2"
+ property color blockBg: palette.window
// variant of navigation icons
- property string navigationIconsVariant: "black"
+ property string navigationIconsVariant: darkTheme ? "white" : "black"
// descriptive items
- property color themeHighlightColor: "black"
+ property color themeHighlightColor: palette.windowText
// navigation items (to be clicked)
- property color themePrimaryColor: "#020280"
+ property color themePrimaryColor: palette.text
// navigation items, secondary
- property color themeSecondaryColor: "#4E4EFF"
+ property color themeSecondaryColor: inactivePalette.text
// descriptive items, secondary
- property color themeSecondaryHighlightColor: "#3E3E3E"
+ property color themeSecondaryHighlightColor: inactivePalette.text
// button sizes
property real themeButtonWidthLarge: 256
@@ -114,4 +114,25 @@
property real themePaddingSmall: 0.25*themeFontSizeSmall
property real themePixelRatio: Screen.devicePixelRatio
+
+ property bool darkTheme: (blockBg.r + blockBg.g + blockBg.b) <
+ (themePrimaryColor.r + themePrimaryColor.g +
+ themePrimaryColor.b)
+
+ property list<QtObject> children: [
+ SystemPalette {
+ id: palette
+ colorGroup: SystemPalette.Active
+ },
+
+ SystemPalette {
+ id: disabledPalette
+ colorGroup: SystemPalette.Disabled
+ },
+
+ SystemPalette {
+ id: inactivePalette
+ colorGroup: SystemPalette.Inactive
+ }
+ ]
}
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml/platform.ubports/ApplicationWindowPL.qml
^
|
| @@ -0,0 +1,88 @@
+/* -*- coding: utf-8-unix -*-
+ *
+ * Copyright (C) 2018 Rinigus
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.9
+import QtQuick.Controls 2.2
+import Qt.labs.settings 1.0
+import QtSystemInfo 5.5
+import "."
+
+ApplicationWindow {
+ id: appWindow
+ width: 640
+ height: 480
+ visible: true
+
+ property var drawer
+ property alias initialPage: pageStack.initialItem
+ property string menuPageUrl
+ property var pages: StackPL { }
+ property bool running: Qt.application.state === Qt.ApplicationActive
+ property int screenHeight: height
+ property bool screenLarge: false
+ property int screenWidth: width
+ property bool keepAlive: false
+
+ StackView {
+ id: pageStack
+ initialItem: appWindow.initialPage
+ anchors.fill: parent
+ }
+
+ Settings {
+ property alias x: appWindow.x
+ property alias y: appWindow.y
+ property alias width: appWindow.width
+ property alias height: appWindow.height
+ }
+
+ Component.onCompleted: {
+ pages.ps = pageStack;
+ updateOrientation();
+
+ // add drawer
+ drawer = app.createObject(menuPageUrl);
+ appWindow.data.push(drawer);
+ }
+
+ function activate() {
+ appWindow.raise();
+ }
+
+ function clearPages() {
+ // not used in the platforms with menu shown
+ // as a page in a stack
+ }
+
+ function initPages() {
+ }
+
+ function sendSms(text) {
+ var link = "message:///?text=%1".arg(text)
+ Qt.openUrlExternally(link);
+ return [0];
+ }
+
+ function showMainMenu() {
+ drawer.open();
+ }
+
+ function updateOrientation() {
+ // blank - desktop is not expected to be changing screen orientation
+ }
+}
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml/platform.ubports/BusyIndicatorPL.qml
^
|
| +(symlink to ../platform.qtcontrols/BusyIndicatorPL.qml)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml/platform.ubports/ButtonPL.qml
^
|
| +(symlink to ../platform.qtcontrols/ButtonPL.qml)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml/platform.ubports/ClipboardPL.qml
^
|
| @@ -0,0 +1,26 @@
+/* -*- coding: utf-8-unix -*-
+ *
+ * Copyright (C) 2018 Rinigus
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.3
+
+QtObject {
+ function copy(t) {
+ Clipboard.push(t);
+ }
+}
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml/platform.ubports/ComboBoxPL.qml
^
|
| +(symlink to ../platform.qtcontrols/ComboBoxPL.qml)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml/platform.ubports/DatePickerDialogPL.qml
^
|
| @@ -0,0 +1,28 @@
+/* -*- coding: utf-8-unix -*-
+ *
+ * Copyright (C) 2019 Rinigus, 2019 Purism SPC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.9
+import "."
+
+DialogPL {
+ id: dialog
+
+ property var date
+
+ Component.onCompleted: console.log("DatePickerDialog is not implemented for UBPorts")
+}
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml/platform.ubports/DialogPL.qml
^
|
| +(symlink to ../platform.qtcontrols/DialogPL.qml)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml/platform.ubports/FileSelectorPL.qml
^
|
| @@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2016-2019 Rinigus https://github.com/rinigus
+ * 2019 Purism SPC
+ *
+ * This file is part of Pure Maps.
+ *
+ * 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/>.
+ */
+
+import QtQuick 2.0
+
+Item {
+ id: fs
+
+ property string selectedFilepath
+ property var nameFilters
+ signal selected
+
+ Component.onCompleted: console.log('UBPorts implementation is missing FileSelector')
+
+ // todo: if open function is not needed, drop special consideration of
+ // of FileSelectorPL in platform's StackPL
+}
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml/platform.ubports/FormLayoutPL.qml
^
|
| +(symlink to ../platform.qtcontrols/FormLayoutPL.qml)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml/platform.ubports/IconButtonPL.qml
^
|
| @@ -0,0 +1,58 @@
+/* -*- coding: utf-8-unix -*-
+ *
+ * Copyright (C) 2018 Rinigus
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.3
+import "."
+
+Item {
+ id: item
+ height: image.height*(1 + padding)
+ width: image.width*(1 + padding)
+
+ property alias iconColorize: image.iconColorize
+ property alias iconHeight: image.iconHeight
+ property alias iconName: image.iconName
+ property real iconOpacity: 1.0
+ property real iconRotation
+ property alias iconSource: image.iconSource
+ property alias iconWidth: image.iconWidth
+ property real padding: 0.5
+ property alias pressed: mouse.pressed
+
+ signal clicked
+
+ IconPL {
+ id: image
+ anchors.centerIn: parent
+ opacity: iconOpacity
+ rotation: iconRotation
+ }
+
+ Rectangle {
+ anchors.fill: parent
+ color: mouse.pressed ? styler.themePrimaryColor : "transparent"
+ opacity: 0.2
+ }
+
+ MouseArea {
+ id: mouse
+ anchors.fill: parent
+ onClicked: item.clicked()
+ }
+}
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml/platform.ubports/IconPL.qml
^
|
| @@ -0,0 +1,38 @@
+/* -*- coding: utf-8-unix -*-
+ *
+ * Copyright (C) 2018-2019 Rinigus, 2019 Purism SPC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.3
+
+Icon {
+ id: image
+ height: iconHeight ? iconHeight : undefined
+ source: iconName ? iconName : iconSource
+ width: iconWidth ? iconWidth : undefined
+
+ property var fillMode // unused, kept for compatibility
+ property bool iconColorize: true
+ property int iconHeight: 0
+ property string iconName
+ property string iconSource
+ property int iconWidth: 0
+
+ Component.onCompleted: {
+ if (iconColorize) color = styler.themeHighlightColor;
+ }
+}
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml/platform.ubports/LabelPL.qml
^
|
| +(symlink to ../platform.qtcontrols/LabelPL.qml)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml/platform.ubports/ListItemPL.qml
^
|
| +(symlink to ../platform.qtcontrols/ListItemPL.qml)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml/platform.ubports/PageEmptyPL.qml
^
|
| +(symlink to ../platform.qtcontrols/PageEmptyPL.qml)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml/platform.ubports/PageListPL.qml
^
|
| +(symlink to ../platform.qtcontrols/PageListPL.qml)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml/platform.ubports/PagePL.qml
^
|
| +(symlink to ../platform.qtcontrols/PagePL.qml)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml/platform.ubports/README.md
^
|
| @@ -0,0 +1,20 @@
+UBPorts implementation. Its currently based on Ubuntu Components and
+QtControls platform.
+
+Recommended imports are
+
+```
+import QtQuick 2.9
+import QtQuick.Controls 2.2
+import QtQuick.Layouts 1.2
+import Ubuntu.Components 1.3
+import "."
+```
+
+Some files import
+
+```
+import QtQuick.Dialogs 1.2
+import QtQuick.Window 2.2
+```
+
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml/platform.ubports/StackPL.qml
^
|
| +(symlink to ../platform.qtcontrols/StackPL.qml)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml/platform.ubports/StylerPL.qml
^
|
| @@ -0,0 +1,125 @@
+/* -*- coding: utf-8-unix -*-
+ *
+ * Copyright (C) 2018 Rinigus
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtQuick.Window 2.2
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Themes 1.3
+
+QtObject {
+ // font sizes and family
+ property string themeFontFamily: Qt.application.font.family
+ property string themeFontFamilyHeading: Qt.application.font.family
+ property int themeFontSizeHuge: themeFontSizeExtraLarge*1.2
+ property int themeFontSizeExtraLarge: FontUtils.sizeToPixels("x-large")
+ property int themeFontSizeLarge: FontUtils.sizeToPixels("large")
+ property int themeFontSizeMedium: FontUtils.sizeToPixels("medium")
+ property int themeFontSizeSmall: FontUtils.sizeToPixels("small")
+ property int themeFontSizeExtraSmall: FontUtils.sizeToPixels("x-small")
+ property real themeFontSizeOnMap: themeFontSizeSmall
+
+ // colors
+ // block background (navigation, poi panel, bubble)
+ property color blockBg: theme.palette.normal.background
+ // variant of navigation icons
+ property string navigationIconsVariant: darkTheme ? "white" : "black"
+ // descriptive items
+ property color themeHighlightColor: theme.palette.normal.backgroundText
+ // navigation items (to be clicked)
+ property color themePrimaryColor: theme.palette.normal.baseText
+ // navigation items, secondary
+ property color themeSecondaryColor: theme.palette.normal.baseText
+ // descriptive items, secondary
+ property color themeSecondaryHighlightColor: theme.palette.normal.backgroundSecondaryText
+
+ // button sizes
+ property real themeButtonWidthLarge: units.gridUnit*32
+ property real themeButtonWidthMedium: units.gridUnit*22
+
+ // icon sizes
+ property real themeIconSizeLarge: units.gridUnit*7
+ property real themeIconSizeMedium: units.gridUnit*5
+ property real themeIconSizeSmall: units.gridUnit*4
+
+ // used icons
+ property string iconCountryAvailable: "qrc:/icons/fallback/country-on-device.svg"
+ property string iconCountryRequested: "qrc:/icons/fallback/country-download.svg"
+ property string iconFolder: "qrc:/icons/fallback/folder-symbolic.svg"
+ property string iconIncompatibleVersion: "qrc:/icons/fallback/incompatible-version.svg"
+ property string iconMapnikGlobal: "qrc:/icons/fallback/globe.svg"
+ property string iconPostalGlobal: "qrc:/icons/fallback/language.svg"
+ property string iconRegion: "qrc:/icons/fallback/country-available.svg"
+
+ // used icons
+ property string iconBack: "image://theme/back" //Qt.resolvedUrl("../../icons/go-previous-symbolic.svg")
+ property string iconEditClear: "image://theme/edit-clear" //Qt.resolvedUrl("../../icons/edit-clear-symbolic.svg")
+ property string iconForward: "image://theme/next" //Qt.resolvedUrl("../../icons/go-next-symbolic.svg")
+ property string iconMenu: "image://theme/navigation-menu" //Qt.resolvedUrl("../../icons/open-menu-symbolic.svg")
+
+// property string iconAbout: "image://theme/info" //Qt.resolvedUrl("../../icons/help-about-symbolic.svg")
+// property string iconBack: "image://theme/back" //Qt.resolvedUrl("../../icons/go-previous-symbolic.svg")
+// property string iconClear: "image://theme/edit-delete" //Qt.resolvedUrl("../../icons/edit-clear-all-symbolic.svg")
+// property string iconClose: "image://theme/close" //Qt.resolvedUrl("../../icons/window-close-symbolic.svg")
+// property string iconDelete: "image://theme/delete" //Qt.resolvedUrl("../../icons/edit-delete-symbolic.svg")
+// property string iconDot: "image://theme/gps" //Qt.resolvedUrl("../../icons/find-location-symbolic.svg")
+// property string iconDown: "image://theme/down" //Qt.resolvedUrl("../../icons/go-down-symbolic.svg")
+// property string iconEdit: "image://theme/edit" //Qt.resolvedUrl("../../icons/document-edit-symbolic.svg")
+// property string iconEditClear: "image://theme/edit-clear" //Qt.resolvedUrl("../../icons/edit-clear-symbolic.svg")
+// property string iconFavorite: Qt.resolvedUrl("../icons/ubports/bookmark-new-symbolic.svg")
+// property string iconFavoriteSelected: Qt.resolvedUrl("../icons/ubports/user-bookmarks-symbolic.svg")
+// property string iconForward: "image://theme/next" //Qt.resolvedUrl("../../icons/go-next-symbolic.svg")
+// property string iconManeuvers: "image://theme/media-playlist-shuffle" //Qt.resolvedUrl("../../icons/maneuvers-symbolic.svg")
+// property string iconMaps: Qt.resolvedUrl("../icons/ubports/map-layers-symbolic.svg")
+// property string iconMenu: "image://theme/navigation-menu" //Qt.resolvedUrl("../../icons/open-menu-symbolic.svg")
+// property string iconNavigate: Qt.resolvedUrl("../icons/ubports/route-to.svg")
+// property string iconNavigateTo: iconNavigate
+// property string iconNavigateFrom: Qt.resolvedUrl("../icons/ubports/route-from.svg")
+// property string iconNearby: Qt.resolvedUrl("../icons/ubports/nearby-search.svg")
+// property string iconPause: "image://theme/media-playback-pause" //Qt.resolvedUrl("../../icons/media-playback-pause-symbolic.svg")
+// property string iconPhone: "image://theme/call-start" //Qt.resolvedUrl("../../icons/call-start-symbolic.svg")
+// property string iconPreferences: "image://theme/settings" //Qt.resolvedUrl("../../icons/preferences-system-symbolic.svg")
+// property string iconProfileMixed: Qt.resolvedUrl("../icons/ubports/profile-mixed.svg")
+// property string iconProfileOffline: Qt.resolvedUrl("../icons/ubports/profile-offline.svg")
+// property string iconProfileOnline: Qt.resolvedUrl("../icons/ubports/profile-online.svg")
+// property string iconRefresh: "image://theme/view-refresh" //Qt.resolvedUrl("../../icons/view-refresh-symbolic.svg")
+// property string iconSave: "image://theme/save" //Qt.resolvedUrl("../../icons/document-save-symbolic.svg")
+// property string iconSearch: "image://theme/find" //Qt.resolvedUrl("../../icons/edit-find-symbolic.svg")
+// property string iconShare: "image://theme/share" //Qt.resolvedUrl("../../icons/emblem-shared-symbolic.svg")
+// property string iconShortlisted: "image://theme/select-none" //Qt.resolvedUrl("../../icons/shortlist-add-symbolic.svg")
+// property string iconShortlistedSelected: "image://theme/select" //Qt.resolvedUrl("../../icons/shortlist-selected-symbolic.svg")
+// property string iconStart: "image://theme/media-playback-start" //Qt.resolvedUrl("../../icons/media-playback-start-symbolic.svg")
+// property string iconStop: "image://theme/media-playback-stop" //Qt.resolvedUrl("../../icons/media-playback-stop-symbolic.svg")
+// property string iconWebLink: "image://theme/stock_website" //Qt.resolvedUrl("../../icons/web-browser-symbolic.svg")
+
+ // item sizes
+ property real themeItemSizeLarge: themeFontSizeLarge * 3
+ property real themeItemSizeSmall: themeFontSizeMedium * 3
+ property real themeItemSizeExtraSmall: themeFontSizeSmall * 3
+
+ // paddings and page margins
+ property real themeHorizontalPageMargin: units.gridUnit*2
+ property real themePaddingLarge: units.gridUnit*2
+ property real themePaddingMedium: units.gridUnit*1
+ property real themePaddingSmall: units.gridUnit*0.8
+
+ property real themePixelRatio: units.gridUnit / 8.0
+
+ property bool darkTheme: (blockBg.r + blockBg.g + blockBg.b) <
+ (themePrimaryColor.r + themePrimaryColor.g +
+ themePrimaryColor.b)
+}
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml/platform.ubports/TextAreaPL.qml
^
|
| @@ -0,0 +1,28 @@
+/* -*- coding: utf-8-unix -*-
+ *
+ * Copyright (C) 2018 Rinigus
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.9
+import Ubuntu.Components 1.3 as UC
+
+UC.TextArea {
+ anchors.left: parent.left
+ anchors.leftMargin: styler.themeHorizontalPageMargin
+ anchors.right: parent.right
+ anchors.rightMargin: styler.themeHorizontalPageMargin
+ wrapMode: TextEdit.Wrap
+}
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml/platform.ubports/TextFieldPL.qml
^
|
| @@ -0,0 +1,68 @@
+/* -*- coding: utf-8-unix -*-
+ *
+ * Copyright (C) 2018 Rinigus
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.9
+import QtQuick.Controls 2.2
+import Ubuntu.Components 1.3 as UC
+
+Item {
+ id: row
+
+ height: childrenRect.height
+ width: parent.width
+
+ property alias acceptableInput: entry.acceptableInput
+ property alias description: desc.text
+ property alias inputMethodHints: entry.inputMethodHints
+ property alias label: lab.text
+ property alias placeholderText: entry.placeholderText
+ property alias text: entry.text
+ property alias validator: entry.validator
+
+ signal enter
+
+ Label {
+ id: lab
+ anchors.left: parent.left
+ anchors.leftMargin: styler.themeHorizontalPageMargin
+ anchors.verticalCenter: entry.verticalCenter
+ }
+
+ UC.TextField {
+ id: entry
+ anchors.left: lab.right
+ anchors.leftMargin: styler.themePaddingMedium
+ anchors.right: parent.right
+ anchors.rightMargin: styler.themeHorizontalPageMargin
+ Keys.onReturnPressed: row.enter()
+ }
+
+ Label {
+ id: desc
+ anchors.left: lab.right
+ anchors.leftMargin: styler.themePaddingMedium
+ anchors.right: parent.right
+ anchors.rightMargin: styler.themeHorizontalPageMargin
+ anchors.top: entry.bottom
+ anchors.topMargin: text ? styler.themePaddingSmall : 0
+ font.pixelSize: styler.themeFontSizeSmall
+ height: text ? implicitHeight : 0
+ visible: text
+ wrapMode: Text.WordWrap
+ }
+}
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml/platform.ubports/TextSwitchPL.qml
^
|
| +(symlink to ../platform.qtcontrols/TextSwitchPL.qml)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/qml_ubports.qrc
^
|
| @@ -0,0 +1,27 @@
+<RCC>
+ <qresource prefix="/">
+ <file alias="qml/platform/ApplicationWindowPL.qml">qml/platform.ubports/ApplicationWindowPL.qml</file>
+ <file alias="qml/platform/BusyIndicatorPL.qml">qml/platform.ubports/BusyIndicatorPL.qml</file>
+ <file alias="qml/platform/ButtonPL.qml">qml/platform.ubports/ButtonPL.qml</file>
+ <file alias="qml/platform/ComboBoxPL.qml">qml/platform.ubports/ComboBoxPL.qml</file>
+ <file alias="qml/platform/DialogPL.qml">qml/platform.ubports/DialogPL.qml</file>
+ <file alias="qml/platform/FileSelectorPL.qml">qml/platform.ubports/FileSelectorPL.qml</file>
+ <file alias="qml/platform/FormLayoutPL.qml">qml/platform.ubports/FormLayoutPL.qml</file>
+ <file alias="qml/platform/HeaderBarImpl.qml">qml/platform.ubports/HeaderBarImpl.qml</file>
+ <file alias="qml/platform/IconButtonPL.qml">qml/platform.ubports/IconButtonPL.qml</file>
+ <file alias="qml/platform/IconPL.qml">qml/platform.ubports/IconPL.qml</file>
+ <file alias="qml/platform/LabelPL.qml">qml/platform.ubports/LabelPL.qml</file>
+ <file alias="qml/platform/ListItemPL.qml">qml/platform.ubports/ListItemPL.qml</file>
+ <file alias="qml/platform/MenuDrawerItemPL.qml">qml/platform.ubports/MenuDrawerItemPL.qml</file>
+ <file alias="qml/platform/MenuDrawerPL.qml">qml/platform.ubports/MenuDrawerPL.qml</file>
+ <file alias="qml/platform/PageEmptyPL.qml">qml/platform.ubports/PageEmptyPL.qml</file>
+ <file alias="qml/platform/PageListPL.qml">qml/platform.ubports/PageListPL.qml</file>
+ <file alias="qml/platform/PagePL.qml">qml/platform.ubports/PagePL.qml</file>
+ <file alias="qml/platform/RemorsePopupPL.qml">qml/platform.ubports/RemorsePopupPL.qml</file>
+ <file alias="qml/platform/SectionHeaderPL.qml">qml/platform.ubports/SectionHeaderPL.qml</file>
+ <file alias="qml/platform/StackPL.qml">qml/platform.ubports/StackPL.qml</file>
+ <file alias="qml/platform/StylerPL.qml">qml/platform.ubports/StylerPL.qml</file>
+ <file alias="qml/platform/TextFieldPL.qml">qml/platform.ubports/TextFieldPL.qml</file>
+ <file alias="qml/platform/TextSwitchPL.qml">qml/platform.ubports/TextSwitchPL.qml</file>
+ </qresource>
+</RCC>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/src/main.cpp
^
|
| @@ -74,6 +74,9 @@
#include <QCommandLineParser>
#include <QDBusConnection>
#include <QTranslator>
+#ifdef IS_QTCONTROLS_QT
+#include <QQuickStyle>
+#endif
#include <QDebug>
@@ -117,6 +120,13 @@
#endif
#endif
+#ifdef IS_QTCONTROLS_QT
+#ifdef DEFAULT_FALLBACK_STYLE
+ if (QQuickStyle::name().isEmpty())
+ QQuickStyle::setStyle(DEFAULT_FALLBACK_STYLE);
+#endif
+#endif
+
#ifdef IS_SAILFISH_OS
QScopedPointer<QGuiApplication> app(SailfishApp::application(argc, argv));
#endif
@@ -142,12 +152,22 @@
#ifdef IS_SAILFISH_OS
tr_path = SailfishApp::pathTo(QString("translations")).toLocalFile();
#endif
+#ifdef IS_QTCONTROLS_QT
+ tr_path = ":/i18n";
+#endif
+
if ( !tr_path.isEmpty() )
{
QString locale = QLocale::system().name();
QTranslator *translator = new QTranslator();
- if ( !translator->load(QLocale(), APP_NAME, "-",
+ if ( !translator->load(QLocale(),
+ #ifdef IS_QTCONTROLS_QT
+ "osmscout-server",
+ #else
+ APP_NAME,
+ #endif
+ "-",
tr_path) )
qWarning() << "Failed to load translation for " << locale
<< " " << tr_path;
@@ -157,9 +177,11 @@
}
// set fallback icons for platforms that need it
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
#ifdef IS_QTCONTROLS_QT
QIcon::setFallbackSearchPaths(QIcon::fallbackSearchPaths() << ":/icons/fallback");
#endif
+#endif
// deal with command line options
QCommandLineParser parser;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/harbour-osmscout-server-cs.ts
^
|
| @@ -24,11 +24,6 @@
<translation>Ikony od %1.</translation>
</message>
<message>
- <location filename="../qml/AboutPage.qml" line="44"/>
- <source>Banner photo by %1 (%2 licanse).</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../qml/AboutPage.qml" line="46"/>
<source>Translations</source>
<translation>Překlady</translation>
@@ -79,6 +74,11 @@
<translation>Licence: GPLv3</translation>
</message>
<message>
+ <location filename="../qml/AboutPage.qml" line="44"/>
+ <source>Banner photo by %1 (%2 license).</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../qml/AboutPage.qml" line="133"/>
<source>version</source>
<translation>verze</translation>
@@ -357,6 +357,7 @@
<message>
<location filename="../qml/platform.kirigami/DialogPL.qml" line="26"/>
<location filename="../qml/platform.qtcontrols/DialogPL.qml" line="33"/>
+ <location filename="../qml/platform.ubports/DialogPL.qml" line="33"/>
<source>Accept</source>
<translation>Přijmout</translation>
</message>
@@ -1685,7 +1686,7 @@
<message>
<location filename="../qml/ProfilesPage.qml" line="92"/>
<source>Please note that some profiles maybe missing due to the packaging of OSM Scout Server.</source>
- <translation type="unfinished"></translation>
+ <translation>Vezměte prosím na vědomí, že kvůli balíčkování OSM Scout Serveru některé profily pravděpodobně chybí.</translation>
</message>
<message>
<location filename="../qml/ProfilesPage.qml" line="56"/>
@@ -2513,68 +2514,68 @@
<context>
<name>main</name>
<message>
- <location filename="../src/main.cpp" line="164"/>
+ <location filename="../src/main.cpp" line="188"/>
<source>OSM Scout Server</source>
<translation>OSM Scout Server</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="169"/>
+ <location filename="../src/main.cpp" line="193"/>
<source>Run the server without GUI as a console application</source>
<translation>Spusťte server bez GUI jako konzolovou aplikaci</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="173"/>
+ <location filename="../src/main.cpp" line="197"/>
<source>Do not output logs when running in console mode</source>
<translation>Při spuštění v režimu konzoly nevypínejte protokoly</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="178"/>
+ <location filename="../src/main.cpp" line="202"/>
<source>Run the server in SystemD socket-activated mode</source>
<translation>Spustit server v režimu aktivovaném socketem SystemD</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="184"/>
+ <location filename="../src/main.cpp" line="208"/>
<source>Start download of the maps</source>
<translation>Začít stahovat mapy</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="188"/>
+ <location filename="../src/main.cpp" line="212"/>
<source>Update list of available maps</source>
<translation>Aktualizovat seznam dostupných map</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="192"/>
+ <location filename="../src/main.cpp" line="216"/>
<source>List maps available on device</source>
<translation>Zobrazit mapy dostupné na zařízení</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="196"/>
+ <location filename="../src/main.cpp" line="220"/>
<source>List subscribed maps</source>
<translation>Zobrazit odebírané mapy</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="200"/>
+ <location filename="../src/main.cpp" line="224"/>
<source>List maps provided for download</source>
<translation>Zobrazit mapy poskytované ke stažení</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="204"/>
+ <location filename="../src/main.cpp" line="228"/>
<source>List missing maps</source>
<translation>Zobrazit chybějící mapy</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="208"/>
+ <location filename="../src/main.cpp" line="232"/>
<source>Subscribe to a <country> dataset</source>
<translation>Přihlaste se k <country> datové sadě</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="209"/>
- <location filename="../src/main.cpp" line="214"/>
+ <location filename="../src/main.cpp" line="233"/>
+ <location filename="../src/main.cpp" line="238"/>
<source>country-id</source>
<translation>country-id</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="213"/>
+ <location filename="../src/main.cpp" line="237"/>
<source>Unsubscribe <country> dataset</source>
<translation>Zrušit odběr <country> datové sady</translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/harbour-osmscout-server-de.ts
^
|
| @@ -24,11 +24,6 @@
<translation>Symbole von %1.</translation>
</message>
<message>
- <location filename="../qml/AboutPage.qml" line="44"/>
- <source>Banner photo by %1 (%2 licanse).</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../qml/AboutPage.qml" line="46"/>
<source>Translations</source>
<translation>Übersetzungen</translation>
@@ -79,6 +74,11 @@
<translation>Lizenz: GPLv3</translation>
</message>
<message>
+ <location filename="../qml/AboutPage.qml" line="44"/>
+ <source>Banner photo by %1 (%2 license).</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../qml/AboutPage.qml" line="133"/>
<source>version</source>
<translation>version</translation>
@@ -259,7 +259,7 @@
<message>
<location filename="../src/dbmaster.cpp" line="103"/>
<source>Opened OSM Scout database: %1</source>
- <translation>Geöffnete OSM Scout Datenbank: %1</translation>
+ <translation>Geöffnete OSM Scout Datenbank: %1</translation>
</message>
<message>
<location filename="../src/dbmaster.cpp" line="105"/>
@@ -357,6 +357,7 @@
<message>
<location filename="../qml/platform.kirigami/DialogPL.qml" line="26"/>
<location filename="../qml/platform.qtcontrols/DialogPL.qml" line="33"/>
+ <location filename="../qml/platform.ubports/DialogPL.qml" line="33"/>
<source>Accept</source>
<translation>Akzeptieren</translation>
</message>
@@ -2517,68 +2518,68 @@
<context>
<name>main</name>
<message>
- <location filename="../src/main.cpp" line="164"/>
+ <location filename="../src/main.cpp" line="188"/>
<source>OSM Scout Server</source>
<translation>OSM Scout Server</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="169"/>
+ <location filename="../src/main.cpp" line="193"/>
<source>Run the server without GUI as a console application</source>
<translation>Starte den Server ohne Oberfläche als Applikation in der Konsole</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="173"/>
+ <location filename="../src/main.cpp" line="197"/>
<source>Do not output logs when running in console mode</source>
<translation>Kein Ausgabe Logs wenn der Server im Konsolenmodus läuft</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="178"/>
+ <location filename="../src/main.cpp" line="202"/>
<source>Run the server in SystemD socket-activated mode</source>
<translation>Führen den Server im SystemD-Socket-aktivierten Modus aus</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="184"/>
+ <location filename="../src/main.cpp" line="208"/>
<source>Start download of the maps</source>
<translation>Starte die Übertragung der Karten</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="188"/>
+ <location filename="../src/main.cpp" line="212"/>
<source>Update list of available maps</source>
<translation>Aktualisiere die Liste der vorhandenen Karten</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="192"/>
+ <location filename="../src/main.cpp" line="216"/>
<source>List maps available on device</source>
<translation>Karten auf dem Gerät auflisten</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="196"/>
+ <location filename="../src/main.cpp" line="220"/>
<source>List subscribed maps</source>
<translation>Zeige abonnierte Karten</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="200"/>
+ <location filename="../src/main.cpp" line="224"/>
<source>List maps provided for download</source>
<translation>Zeige Karten, die zum Herunterladen zur Verfügung stehen</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="204"/>
+ <location filename="../src/main.cpp" line="228"/>
<source>List missing maps</source>
<translation>Zeige fehlende Karten</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="208"/>
+ <location filename="../src/main.cpp" line="232"/>
<source>Subscribe to a <country> dataset</source>
<translation>Abonnieren des <country> Datensatzes</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="209"/>
- <location filename="../src/main.cpp" line="214"/>
+ <location filename="../src/main.cpp" line="233"/>
+ <location filename="../src/main.cpp" line="238"/>
<source>country-id</source>
<translation>country-id</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="213"/>
+ <location filename="../src/main.cpp" line="237"/>
<source>Unsubscribe <country> dataset</source>
<translation>Datensatz für <country> abbestellen </translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/harbour-osmscout-server-es.ts
^
|
| @@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="es" sourcelanguage="en" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="es" sourcelanguage="en">
<context>
<name>AboutPage</name>
<message>
@@ -22,11 +24,6 @@
<translation>Iconos de %1.</translation>
</message>
<message>
- <location filename="../qml/AboutPage.qml" line="44"/>
- <source>Banner photo by %1 (%2 licanse).</source>
- <translation>Foto de banner de %1 (licencia %2)</translation>
- </message>
- <message>
<location filename="../qml/AboutPage.qml" line="46"/>
<source>Translations</source>
<translation>Traducciones</translation>
@@ -77,6 +74,11 @@
<translation>Licencia: GPLv3</translation>
</message>
<message>
+ <location filename="../qml/AboutPage.qml" line="44"/>
+ <source>Banner photo by %1 (%2 license).</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../qml/AboutPage.qml" line="133"/>
<source>version</source>
<translation>versión</translation>
@@ -355,6 +357,7 @@
<message>
<location filename="../qml/platform.kirigami/DialogPL.qml" line="26"/>
<location filename="../qml/platform.qtcontrols/DialogPL.qml" line="33"/>
+ <location filename="../qml/platform.ubports/DialogPL.qml" line="33"/>
<source>Accept</source>
<translation>Aceptar</translation>
</message>
@@ -2511,68 +2514,68 @@
<context>
<name>main</name>
<message>
- <location filename="../src/main.cpp" line="164"/>
+ <location filename="../src/main.cpp" line="188"/>
<source>OSM Scout Server</source>
<translation>OSM Scout Server</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="169"/>
+ <location filename="../src/main.cpp" line="193"/>
<source>Run the server without GUI as a console application</source>
<translation>Ejecutar el servidor sin GUI como una aplicación de consola</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="173"/>
+ <location filename="../src/main.cpp" line="197"/>
<source>Do not output logs when running in console mode</source>
<translation>No generar registros cuando se está ejecutándo en modo consola</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="178"/>
+ <location filename="../src/main.cpp" line="202"/>
<source>Run the server in SystemD socket-activated mode</source>
<translation>Ejecutar el servidor en modo SystemD socket-activado</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="184"/>
+ <location filename="../src/main.cpp" line="208"/>
<source>Start download of the maps</source>
<translation>Iniciar la descarga de mapas</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="188"/>
+ <location filename="../src/main.cpp" line="212"/>
<source>Update list of available maps</source>
<translation>Actualizar lista de mapas disponibles</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="192"/>
+ <location filename="../src/main.cpp" line="216"/>
<source>List maps available on device</source>
<translation>Lista de mapas disponibles en el dispositivo</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="196"/>
+ <location filename="../src/main.cpp" line="220"/>
<source>List subscribed maps</source>
<translation>Lista de mapas suscritos</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="200"/>
+ <location filename="../src/main.cpp" line="224"/>
<source>List maps provided for download</source>
<translation>Lista de mapas provistos para descargar</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="204"/>
+ <location filename="../src/main.cpp" line="228"/>
<source>List missing maps</source>
<translation>Lista de mapas que faltan</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="208"/>
+ <location filename="../src/main.cpp" line="232"/>
<source>Subscribe to a <country> dataset</source>
<translation>Suscribirse al conjunto de datos de <country></translation>
</message>
<message>
- <location filename="../src/main.cpp" line="209"/>
- <location filename="../src/main.cpp" line="214"/>
+ <location filename="../src/main.cpp" line="233"/>
+ <location filename="../src/main.cpp" line="238"/>
<source>country-id</source>
<translation>id-pais</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="213"/>
+ <location filename="../src/main.cpp" line="237"/>
<source>Unsubscribe <country> dataset</source>
<translation>Anular suscripción del conjunto de datos de <counrty></translation>
</message>
@@ -2590,4 +2593,4 @@
<translation>OSM Scout Server</translation>
</message>
</context>
-</TS>
\ No newline at end of file
+</TS>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/harbour-osmscout-server-fi.ts
^
|
| @@ -24,11 +24,6 @@
<translation>Kuvakkeet: %1.</translation>
</message>
<message>
- <location filename="../qml/AboutPage.qml" line="44"/>
- <source>Banner photo by %1 (%2 licanse).</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../qml/AboutPage.qml" line="46"/>
<source>Translations</source>
<translation>Käännökset</translation>
@@ -79,6 +74,11 @@
<translation>Lisenssi: GPLv3</translation>
</message>
<message>
+ <location filename="../qml/AboutPage.qml" line="44"/>
+ <source>Banner photo by %1 (%2 license).</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../qml/AboutPage.qml" line="133"/>
<source>version</source>
<translation>versio</translation>
@@ -357,6 +357,7 @@
<message>
<location filename="../qml/platform.kirigami/DialogPL.qml" line="26"/>
<location filename="../qml/platform.qtcontrols/DialogPL.qml" line="33"/>
+ <location filename="../qml/platform.ubports/DialogPL.qml" line="33"/>
<source>Accept</source>
<translation>Hyväksy</translation>
</message>
@@ -2513,68 +2514,68 @@
<context>
<name>main</name>
<message>
- <location filename="../src/main.cpp" line="164"/>
+ <location filename="../src/main.cpp" line="188"/>
<source>OSM Scout Server</source>
<translation>OSM Scout Server</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="169"/>
+ <location filename="../src/main.cpp" line="193"/>
<source>Run the server without GUI as a console application</source>
<translation>Aja palvelin ilman käyttöliittymää konsoliohjelmana.</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="173"/>
+ <location filename="../src/main.cpp" line="197"/>
<source>Do not output logs when running in console mode</source>
<translation>Älä tulosta lokeja ajetaessa konsolitilassa.</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="178"/>
+ <location filename="../src/main.cpp" line="202"/>
<source>Run the server in SystemD socket-activated mode</source>
<translation>Aja palvelin SystemD socket-aktivoidussa tilassa</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="184"/>
+ <location filename="../src/main.cpp" line="208"/>
<source>Start download of the maps</source>
<translation>Aloitta karttojen lataus</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="188"/>
+ <location filename="../src/main.cpp" line="212"/>
<source>Update list of available maps</source>
<translation>Päivitä saatavilla olevien karttojen lista</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="192"/>
+ <location filename="../src/main.cpp" line="216"/>
<source>List maps available on device</source>
<translation>Listaa laitteessa olevat kartat</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="196"/>
+ <location filename="../src/main.cpp" line="220"/>
<source>List subscribed maps</source>
<translation>Listaa tilatut kartat</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="200"/>
+ <location filename="../src/main.cpp" line="224"/>
<source>List maps provided for download</source>
<translation>Listaa ladattavissa olevat kartat</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="204"/>
+ <location filename="../src/main.cpp" line="228"/>
<source>List missing maps</source>
<translation>Listaa puuttuvat kartat</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="208"/>
+ <location filename="../src/main.cpp" line="232"/>
<source>Subscribe to a <country> dataset</source>
<translation>Tilaa <country> datasetti</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="209"/>
- <location filename="../src/main.cpp" line="214"/>
+ <location filename="../src/main.cpp" line="233"/>
+ <location filename="../src/main.cpp" line="238"/>
<source>country-id</source>
<translation>maa-id</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="213"/>
+ <location filename="../src/main.cpp" line="237"/>
<source>Unsubscribe <country> dataset</source>
<translation>Peruuta <country> datasetin tilaus</translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/harbour-osmscout-server-fr.ts
^
|
| @@ -24,11 +24,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/AboutPage.qml" line="44"/>
- <source>Banner photo by %1 (%2 licanse).</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../qml/AboutPage.qml" line="46"/>
<source>Translations</source>
<translation>Traductions</translation>
@@ -79,6 +74,11 @@
<translation>License : GPLv3</translation>
</message>
<message>
+ <location filename="../qml/AboutPage.qml" line="44"/>
+ <source>Banner photo by %1 (%2 license).</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../qml/AboutPage.qml" line="133"/>
<source>version</source>
<translation>version</translation>
@@ -357,6 +357,7 @@
<message>
<location filename="../qml/platform.kirigami/DialogPL.qml" line="26"/>
<location filename="../qml/platform.qtcontrols/DialogPL.qml" line="33"/>
+ <location filename="../qml/platform.ubports/DialogPL.qml" line="33"/>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
@@ -2513,68 +2514,68 @@
<context>
<name>main</name>
<message>
- <location filename="../src/main.cpp" line="164"/>
+ <location filename="../src/main.cpp" line="188"/>
<source>OSM Scout Server</source>
<translation>OSM Scout Server</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="169"/>
+ <location filename="../src/main.cpp" line="193"/>
<source>Run the server without GUI as a console application</source>
<translation>Exécutez le serveur sans interface graphique comme application de console</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="173"/>
+ <location filename="../src/main.cpp" line="197"/>
<source>Do not output logs when running in console mode</source>
<translation>Ne pas afficher les logs en mode console</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="178"/>
+ <location filename="../src/main.cpp" line="202"/>
<source>Run the server in SystemD socket-activated mode</source>
<translation>Exécuter le serveur en mode SystemD socket</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="184"/>
+ <location filename="../src/main.cpp" line="208"/>
<source>Start download of the maps</source>
<translation>Démarrer le téléchargement des cartes</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="188"/>
+ <location filename="../src/main.cpp" line="212"/>
<source>Update list of available maps</source>
<translation>Mettre à jour la liste des cartes disponibles</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="192"/>
+ <location filename="../src/main.cpp" line="216"/>
<source>List maps available on device</source>
<translation>Lister les cartes disponibles sur l'appareil</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="196"/>
+ <location filename="../src/main.cpp" line="220"/>
<source>List subscribed maps</source>
<translation>Lister les cartes souscrites</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="200"/>
+ <location filename="../src/main.cpp" line="224"/>
<source>List maps provided for download</source>
<translation>Listes les cartes disponibles au téléchargement</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="204"/>
+ <location filename="../src/main.cpp" line="228"/>
<source>List missing maps</source>
<translation>Lister les cartes manquantes</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="208"/>
+ <location filename="../src/main.cpp" line="232"/>
<source>Subscribe to a <country> dataset</source>
<translation>S'abonner à <country> jeu de données</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="209"/>
- <location filename="../src/main.cpp" line="214"/>
+ <location filename="../src/main.cpp" line="233"/>
+ <location filename="../src/main.cpp" line="238"/>
<source>country-id</source>
<translation>id du pays</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="213"/>
+ <location filename="../src/main.cpp" line="237"/>
<source>Unsubscribe <country> dataset</source>
<translation>Se désabonner du <country> jeu de données</translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/harbour-osmscout-server-it_IT.ts
^
|
| @@ -24,11 +24,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/AboutPage.qml" line="44"/>
- <source>Banner photo by %1 (%2 licanse).</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../qml/AboutPage.qml" line="46"/>
<source>Translations</source>
<translation>Traduzioni</translation>
@@ -79,6 +74,11 @@
<translation>Licenza: GPLv3</translation>
</message>
<message>
+ <location filename="../qml/AboutPage.qml" line="44"/>
+ <source>Banner photo by %1 (%2 license).</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../qml/AboutPage.qml" line="133"/>
<source>version</source>
<translation>versione</translation>
@@ -357,6 +357,7 @@
<message>
<location filename="../qml/platform.kirigami/DialogPL.qml" line="26"/>
<location filename="../qml/platform.qtcontrols/DialogPL.qml" line="33"/>
+ <location filename="../qml/platform.ubports/DialogPL.qml" line="33"/>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
@@ -2513,68 +2514,68 @@
<context>
<name>main</name>
<message>
- <location filename="../src/main.cpp" line="164"/>
+ <location filename="../src/main.cpp" line="188"/>
<source>OSM Scout Server</source>
<translation>OSM Scout Server</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="169"/>
+ <location filename="../src/main.cpp" line="193"/>
<source>Run the server without GUI as a console application</source>
<translation>Avvia il server senza GUI come un'applicazione per terminale</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="173"/>
+ <location filename="../src/main.cpp" line="197"/>
<source>Do not output logs when running in console mode</source>
<translation>Non produrre registri durante l'esecuzione in modalità terminale</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="178"/>
+ <location filename="../src/main.cpp" line="202"/>
<source>Run the server in SystemD socket-activated mode</source>
<translation>Avvia il server nella modalità socket-activated di SystemD</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="184"/>
+ <location filename="../src/main.cpp" line="208"/>
<source>Start download of the maps</source>
<translation>Avvia il download delle mappe</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="188"/>
+ <location filename="../src/main.cpp" line="212"/>
<source>Update list of available maps</source>
<translation>Aggiorna la lista delle mappe disponibili</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="192"/>
+ <location filename="../src/main.cpp" line="216"/>
<source>List maps available on device</source>
<translation>Lista delle mappe disponibili sul dispositivo</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="196"/>
+ <location filename="../src/main.cpp" line="220"/>
<source>List subscribed maps</source>
<translation>Lista delle mappe installate</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="200"/>
+ <location filename="../src/main.cpp" line="224"/>
<source>List maps provided for download</source>
<translation>Lista delle mappe disponibili al download</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="204"/>
+ <location filename="../src/main.cpp" line="228"/>
<source>List missing maps</source>
<translation>Lista delle mappe mancanti</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="208"/>
+ <location filename="../src/main.cpp" line="232"/>
<source>Subscribe to a <country> dataset</source>
<translation>Iscriviti a un <country> set di dati</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="209"/>
- <location filename="../src/main.cpp" line="214"/>
+ <location filename="../src/main.cpp" line="233"/>
+ <location filename="../src/main.cpp" line="238"/>
<source>country-id</source>
<translation>country-id</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="213"/>
+ <location filename="../src/main.cpp" line="237"/>
<source>Unsubscribe <country> dataset</source>
<translation>Disiscriviti da <country> dataset</translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/harbour-osmscout-server-nb.ts
^
|
| @@ -24,11 +24,6 @@
<translation>Ikoner ved %1.</translation>
</message>
<message>
- <location filename="../qml/AboutPage.qml" line="44"/>
- <source>Banner photo by %1 (%2 licanse).</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../qml/AboutPage.qml" line="46"/>
<source>Translations</source>
<translation>Oversettinger</translation>
@@ -79,6 +74,11 @@
<translation>Lisens: GPLv3</translation>
</message>
<message>
+ <location filename="../qml/AboutPage.qml" line="44"/>
+ <source>Banner photo by %1 (%2 license).</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../qml/AboutPage.qml" line="133"/>
<source>version</source>
<translation>versjon</translation>
@@ -357,6 +357,7 @@
<message>
<location filename="../qml/platform.kirigami/DialogPL.qml" line="26"/>
<location filename="../qml/platform.qtcontrols/DialogPL.qml" line="33"/>
+ <location filename="../qml/platform.ubports/DialogPL.qml" line="33"/>
<source>Accept</source>
<translation>Godta</translation>
</message>
@@ -2513,68 +2514,68 @@
<context>
<name>main</name>
<message>
- <location filename="../src/main.cpp" line="164"/>
+ <location filename="../src/main.cpp" line="188"/>
<source>OSM Scout Server</source>
<translation>OSM Scout Server</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="169"/>
+ <location filename="../src/main.cpp" line="193"/>
<source>Run the server without GUI as a console application</source>
<translation>Kjør serveren uten brukergrensesnitt som et konsollprogram</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="173"/>
+ <location filename="../src/main.cpp" line="197"/>
<source>Do not output logs when running in console mode</source>
<translation>Ikke skriv ut logger når du kjører i konsollmodus</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="178"/>
+ <location filename="../src/main.cpp" line="202"/>
<source>Run the server in SystemD socket-activated mode</source>
<translation>Kjør serveren i SystemD socket-aktivert modus</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="184"/>
+ <location filename="../src/main.cpp" line="208"/>
<source>Start download of the maps</source>
<translation>Start nedlasting av kartene</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="188"/>
+ <location filename="../src/main.cpp" line="212"/>
<source>Update list of available maps</source>
<translation>Oppdater liste over tilgjengelige kart</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="192"/>
+ <location filename="../src/main.cpp" line="216"/>
<source>List maps available on device</source>
<translation>List kart som er tilgjengelig på enheten</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="196"/>
+ <location filename="../src/main.cpp" line="220"/>
<source>List subscribed maps</source>
<translation>List abbonerte kart</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="200"/>
+ <location filename="../src/main.cpp" line="224"/>
<source>List maps provided for download</source>
<translation>List kart som er klare for nedlasting</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="204"/>
+ <location filename="../src/main.cpp" line="228"/>
<source>List missing maps</source>
<translation>Liste manglende kart</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="208"/>
+ <location filename="../src/main.cpp" line="232"/>
<source>Subscribe to a <country> dataset</source>
<translation>Abboner på <country> datasett</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="209"/>
- <location filename="../src/main.cpp" line="214"/>
+ <location filename="../src/main.cpp" line="233"/>
+ <location filename="../src/main.cpp" line="238"/>
<source>country-id</source>
<translation>land-id</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="213"/>
+ <location filename="../src/main.cpp" line="237"/>
<source>Unsubscribe <country> dataset</source>
<translation>Avslutt abbonent på <country> datasett</translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/harbour-osmscout-server-nl.ts
^
|
| @@ -24,11 +24,6 @@
<translation>Pictogrammen door %1.</translation>
</message>
<message>
- <location filename="../qml/AboutPage.qml" line="44"/>
- <source>Banner photo by %1 (%2 licanse).</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../qml/AboutPage.qml" line="46"/>
<source>Translations</source>
<translation>Vertalingen</translation>
@@ -79,6 +74,11 @@
<translation>Licentie: GPLv3</translation>
</message>
<message>
+ <location filename="../qml/AboutPage.qml" line="44"/>
+ <source>Banner photo by %1 (%2 license).</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../qml/AboutPage.qml" line="133"/>
<source>version</source>
<translation>versie</translation>
@@ -357,6 +357,7 @@
<message>
<location filename="../qml/platform.kirigami/DialogPL.qml" line="26"/>
<location filename="../qml/platform.qtcontrols/DialogPL.qml" line="33"/>
+ <location filename="../qml/platform.ubports/DialogPL.qml" line="33"/>
<source>Accept</source>
<translation>Accepteren</translation>
</message>
@@ -2162,7 +2163,7 @@
<message>
<location filename="../qml/SettingsPage.qml" line="225"/>
<source>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.</source>
- <translation>Let op! Als je <i>Geocoder-NLP</i> selecteert, specificeer dan hieronder in de back-endinstellingen de talen die moeten worden gebruikt voor het verwerken van adressen. Zo niet kan het zijn dat de server grote hoeveelheden RAM gebruikt. </translation>
+ <translation>Let op! Als je <i>Geocoder-NLP</i> selecteert, specificeer dan hieronder in de back-endinstellingen de talen die moeten worden gebruikt voor het verwerken van adressen. Zo niet kan het zijn dat de server grote hoeveelheden RAM gebruikt. </translation>
</message>
<message>
<location filename="../qml/SettingsPage.qml" line="237"/>
@@ -2513,68 +2514,68 @@
<context>
<name>main</name>
<message>
- <location filename="../src/main.cpp" line="164"/>
+ <location filename="../src/main.cpp" line="188"/>
<source>OSM Scout Server</source>
<translation>OSM Scout Server</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="169"/>
+ <location filename="../src/main.cpp" line="193"/>
<source>Run the server without GUI as a console application</source>
<translation>Server uitvoeren zonder gebruikersinterface, als consoletoepassing</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="173"/>
+ <location filename="../src/main.cpp" line="197"/>
<source>Do not output logs when running in console mode</source>
<translation>Logs niet aanmaken in consolemodus</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="178"/>
+ <location filename="../src/main.cpp" line="202"/>
<source>Run the server in SystemD socket-activated mode</source>
<translation>Server uitvoeren in SystemD-socket-geactiveerde modus</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="184"/>
+ <location filename="../src/main.cpp" line="208"/>
<source>Start download of the maps</source>
<translation>Download van kaarten starten</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="188"/>
+ <location filename="../src/main.cpp" line="212"/>
<source>Update list of available maps</source>
<translation>Lijst van beschikbare kaarten bijwerken</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="192"/>
+ <location filename="../src/main.cpp" line="216"/>
<source>List maps available on device</source>
<translation>Lijst van op apparaat beschikbare kaarten</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="196"/>
+ <location filename="../src/main.cpp" line="220"/>
<source>List subscribed maps</source>
<translation>Lijst van kaarten waarop je bent geabonneerd</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="200"/>
+ <location filename="../src/main.cpp" line="224"/>
<source>List maps provided for download</source>
<translation>Lijst van voor download aangeboden kaarten</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="204"/>
+ <location filename="../src/main.cpp" line="228"/>
<source>List missing maps</source>
<translation>Lijst van ontbrekende kaarten</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="208"/>
+ <location filename="../src/main.cpp" line="232"/>
<source>Subscribe to a <country> dataset</source>
<translation>Abonneren op een <country>-gegevensset</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="209"/>
- <location filename="../src/main.cpp" line="214"/>
+ <location filename="../src/main.cpp" line="233"/>
+ <location filename="../src/main.cpp" line="238"/>
<source>country-id</source>
<translation>land-id</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="213"/>
+ <location filename="../src/main.cpp" line="237"/>
<source>Unsubscribe <country> dataset</source>
<translation>Abonnement op <country>-gegevensset opzeggen</translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/harbour-osmscout-server-nl_BE.ts
^
|
| @@ -24,11 +24,6 @@
<translation>Pictogrammen door %1.</translation>
</message>
<message>
- <location filename="../qml/AboutPage.qml" line="44"/>
- <source>Banner photo by %1 (%2 licanse).</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../qml/AboutPage.qml" line="46"/>
<source>Translations</source>
<translation>Vertalingen</translation>
@@ -79,6 +74,11 @@
<translation>Licentie: GPLv3</translation>
</message>
<message>
+ <location filename="../qml/AboutPage.qml" line="44"/>
+ <source>Banner photo by %1 (%2 license).</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../qml/AboutPage.qml" line="133"/>
<source>version</source>
<translation>versie</translation>
@@ -357,6 +357,7 @@
<message>
<location filename="../qml/platform.kirigami/DialogPL.qml" line="26"/>
<location filename="../qml/platform.qtcontrols/DialogPL.qml" line="33"/>
+ <location filename="../qml/platform.ubports/DialogPL.qml" line="33"/>
<source>Accept</source>
<translation>Aanvaarden</translation>
</message>
@@ -2513,68 +2514,68 @@
<context>
<name>main</name>
<message>
- <location filename="../src/main.cpp" line="164"/>
+ <location filename="../src/main.cpp" line="188"/>
<source>OSM Scout Server</source>
<translation>OSM Scout Server</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="169"/>
+ <location filename="../src/main.cpp" line="193"/>
<source>Run the server without GUI as a console application</source>
<translation>Server uitvoeren zonder gebruikersinterface, als consoletoepassing</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="173"/>
+ <location filename="../src/main.cpp" line="197"/>
<source>Do not output logs when running in console mode</source>
<translation>Logboeken niet aanmaken in consolemodus</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="178"/>
+ <location filename="../src/main.cpp" line="202"/>
<source>Run the server in SystemD socket-activated mode</source>
<translation>Server uitvoeren in SystemD-socket-geactiveerde modus</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="184"/>
+ <location filename="../src/main.cpp" line="208"/>
<source>Start download of the maps</source>
<translation>Download van kaarten starten</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="188"/>
+ <location filename="../src/main.cpp" line="212"/>
<source>Update list of available maps</source>
<translation>Lijst van beschikbare kaarten bijwerken</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="192"/>
+ <location filename="../src/main.cpp" line="216"/>
<source>List maps available on device</source>
<translation>Lijst van op toestel beschikbare kaarten</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="196"/>
+ <location filename="../src/main.cpp" line="220"/>
<source>List subscribed maps</source>
<translation>Lijst van kaarten waarop dat ge geabonneerd zijt</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="200"/>
+ <location filename="../src/main.cpp" line="224"/>
<source>List maps provided for download</source>
<translation>Lijst van voor download aangeboden kaarten</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="204"/>
+ <location filename="../src/main.cpp" line="228"/>
<source>List missing maps</source>
<translation>Lijst van ontbrekende kaarten</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="208"/>
+ <location filename="../src/main.cpp" line="232"/>
<source>Subscribe to a <country> dataset</source>
<translation>Abonneren op ne <country>-gegevensset</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="209"/>
- <location filename="../src/main.cpp" line="214"/>
+ <location filename="../src/main.cpp" line="233"/>
+ <location filename="../src/main.cpp" line="238"/>
<source>country-id</source>
<translation>land-id</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="213"/>
+ <location filename="../src/main.cpp" line="237"/>
<source>Unsubscribe <country> dataset</source>
<translation>Abonnement op <country>-gegevensset opzeggen</translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/harbour-osmscout-server-pl.ts
^
|
| @@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl" sourcelanguage="en" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="pl" sourcelanguage="en">
<context>
<name>AboutPage</name>
<message>
@@ -22,11 +24,6 @@
<translation>Ikony stworzone przez %1.</translation>
</message>
<message>
- <location filename="../qml/AboutPage.qml" line="44"/>
- <source>Banner photo by %1 (%2 licanse).</source>
- <translation>Zdjecie zrobione przez %1(%2 licencja).</translation>
- </message>
- <message>
<location filename="../qml/AboutPage.qml" line="46"/>
<source>Translations</source>
<translation>Tłumaczenia</translation>
@@ -77,6 +74,11 @@
<translation>Licencja: GPLv3</translation>
</message>
<message>
+ <location filename="../qml/AboutPage.qml" line="44"/>
+ <source>Banner photo by %1 (%2 license).</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../qml/AboutPage.qml" line="133"/>
<source>version</source>
<translation>wersja</translation>
@@ -355,6 +357,7 @@
<message>
<location filename="../qml/platform.kirigami/DialogPL.qml" line="26"/>
<location filename="../qml/platform.qtcontrols/DialogPL.qml" line="33"/>
+ <location filename="../qml/platform.ubports/DialogPL.qml" line="33"/>
<source>Accept</source>
<translation>Akceptuj</translation>
</message>
@@ -1573,7 +1576,7 @@
<message>
<location filename="../qml/OSMSpeedPage.qml" line="99"/>
<source>motorway link</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/OSMSpeedPage.qml" line="107"/>
@@ -1593,7 +1596,7 @@
<message>
<location filename="../qml/OSMSpeedPage.qml" line="131"/>
<source>primary link</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/OSMSpeedPage.qml" line="139"/>
@@ -1618,7 +1621,7 @@
<message>
<location filename="../qml/OSMSpeedPage.qml" line="171"/>
<source>secondary link</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/OSMSpeedPage.qml" line="179"/>
@@ -1633,7 +1636,7 @@
<message>
<location filename="../qml/OSMSpeedPage.qml" line="195"/>
<source>tertiary link</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/OSMSpeedPage.qml" line="203"/>
@@ -1643,7 +1646,7 @@
<message>
<location filename="../qml/OSMSpeedPage.qml" line="211"/>
<source>trunk link</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/OSMSpeedPage.qml" line="219"/>
@@ -2512,68 +2515,68 @@
<context>
<name>main</name>
<message>
- <location filename="../src/main.cpp" line="164"/>
+ <location filename="../src/main.cpp" line="188"/>
<source>OSM Scout Server</source>
<translation>OSM Scout Server</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="169"/>
+ <location filename="../src/main.cpp" line="193"/>
<source>Run the server without GUI as a console application</source>
<translation>Uruchom serwer bez GUI jako aplikację konsolową</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="173"/>
+ <location filename="../src/main.cpp" line="197"/>
<source>Do not output logs when running in console mode</source>
<translation>Nie pokazuj logów kiedy uruchomione w trybie konsolowym</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="178"/>
+ <location filename="../src/main.cpp" line="202"/>
<source>Run the server in SystemD socket-activated mode</source>
<translation>Uruchom serwer w trybie aktywacji gniazda SystemD</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="184"/>
+ <location filename="../src/main.cpp" line="208"/>
<source>Start download of the maps</source>
<translation>Uruchom ściąganie map</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="188"/>
+ <location filename="../src/main.cpp" line="212"/>
<source>Update list of available maps</source>
<translation>Zaktualizuj listę dostępnych map</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="192"/>
+ <location filename="../src/main.cpp" line="216"/>
<source>List maps available on device</source>
<translation>Lista map dostępnych na urządzeniu</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="196"/>
+ <location filename="../src/main.cpp" line="220"/>
<source>List subscribed maps</source>
<translation>Lista subskrybowanych map</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="200"/>
+ <location filename="../src/main.cpp" line="224"/>
<source>List maps provided for download</source>
<translation>Lista map przeznaczonych do ściągnięcia</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="204"/>
+ <location filename="../src/main.cpp" line="228"/>
<source>List missing maps</source>
<translation>Lista brakujących map</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="208"/>
+ <location filename="../src/main.cpp" line="232"/>
<source>Subscribe to a <country> dataset</source>
<translation>Subskrybuj zbiór danych dla <country></translation>
</message>
<message>
- <location filename="../src/main.cpp" line="209"/>
- <location filename="../src/main.cpp" line="214"/>
+ <location filename="../src/main.cpp" line="233"/>
+ <location filename="../src/main.cpp" line="238"/>
<source>country-id</source>
<translation>id-państwa</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="213"/>
+ <location filename="../src/main.cpp" line="237"/>
<source>Unsubscribe <country> dataset</source>
<translation>Wypisz zbiór danych dla <country> </translation>
</message>
@@ -2591,4 +2594,4 @@
<translation>OSM Scout Server</translation>
</message>
</context>
-</TS>
\ No newline at end of file
+</TS>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/harbour-osmscout-server-pt_BR.ts
^
|
| @@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" sourcelanguage="en" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="pt_BR" sourcelanguage="en">
<context>
<name>AboutPage</name>
<message>
@@ -14,50 +16,50 @@
<message>
<location filename="../qml/AboutPage.qml" line="42"/>
<source>Artwork</source>
- <translation type="unfinished"/>
+ <translation>Arte</translation>
</message>
<message>
<location filename="../qml/AboutPage.qml" line="43"/>
<source>Icons by %1.</source>
- <translation type="unfinished"/>
+ <translation>Ícones por %1.</translation>
</message>
<message>
- <location filename="../qml/AboutPage.qml" line="45"/>
+ <location filename="../qml/AboutPage.qml" line="46"/>
<source>Translations</source>
<translation>Traduções</translation>
</message>
<message>
- <location filename="../qml/AboutPage.qml" line="58"/>
+ <location filename="../qml/AboutPage.qml" line="59"/>
<source>Maps</source>
<translation>Mapas</translation>
</message>
<message>
- <location filename="../qml/AboutPage.qml" line="60"/>
+ <location filename="../qml/AboutPage.qml" line="61"/>
<source>Maps are hosted by Natural Language Processing Centre (Faculty of Informatics, Masaryk University, Brno, Czech Republic) through modRana.org data repository.</source>
<translation>Os mapas são hospedados pelo Centro de Processamento de Linguagem Natural (Faculdade de Informática, Universidade de Masaryk, Brno, República Tcheca) por meio do repositório de dados do modRana.org.</translation>
</message>
<message>
- <location filename="../qml/AboutPage.qml" line="65"/>
+ <location filename="../qml/AboutPage.qml" line="66"/>
<source>Map data from OpenStreetMap, Open Database License 1.0. Maps are converted to a suitable format from downloaded extracts and/or using polygons as provided by Geofabrik GmbH.</source>
<translation>Os dados de mapas são provenientes do OpenStreetMap, mapas licenciados por Open Database License 1.0 serão convertidos para um formato apropriado a partir de extratos baixados e/ou usando polígonos fornecidos pela Geofabrik GmbH.</translation>
</message>
<message>
- <location filename="../qml/AboutPage.qml" line="69"/>
+ <location filename="../qml/AboutPage.qml" line="70"/>
<source>UK postal codes downloaded from <a href='https://www.freemaptools.com/download-uk-postcode-lat-lng.htm'>FreeMapTools</a>. These data contain: Ordnance Survey data © Crown copyright and database right 2017; Royal Mail data © Royal Mail copyright and database right 2017; National Statistics data © Crown copyright and database right 2017.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/AboutPage.qml" line="76"/>
+ <location filename="../qml/AboutPage.qml" line="77"/>
<source>Libpostal</source>
<translation>Libpostal</translation>
</message>
<message>
- <location filename="../qml/AboutPage.qml" line="78"/>
+ <location filename="../qml/AboutPage.qml" line="79"/>
<source>Please note that <i>libpostal</i> is developed to be used with the fine tuned model covering the World. The country-based models were developed to use <i>libpostal</i> on mobile devices and have not been specifically tuned. Please submit the issues with libpostal performance on country-based models to <i>OSM Scout Server</i> or <i>geocoder-nlp</i> github projects.</source>
<translation>Por favor, note que o <i>libpostal</i> foi desenvolvido para ser utilizado com o modelo finamente ajustado para cobrir todo o Mundo. Os modelos baseados em países foram desenvolvidos para usar o <i>libpostal</i>em dispositivos móveis e não foram especificamente ajustados. Por favor, envie os problemas com o desempenho do libpostal em modelos baseados em países para os projetos no GitHub do <i>OSM Scout Server</i>ou <i>geocoder-nlp</i>.</translation>
</message>
<message>
- <location filename="../qml/AboutPage.qml" line="85"/>
+ <location filename="../qml/AboutPage.qml" line="86"/>
<source>Acknowledgments</source>
<translation>Reconhecimentos</translation>
</message>
@@ -72,17 +74,22 @@
<translation>Licença: GPLv3</translation>
</message>
<message>
- <location filename="../qml/AboutPage.qml" line="109"/>
+ <location filename="../qml/AboutPage.qml" line="44"/>
+ <source>Banner photo by %1 (%2 license).</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/AboutPage.qml" line="133"/>
<source>version</source>
<translation>versão</translation>
</message>
<message>
- <location filename="../qml/AboutPage.qml" line="115"/>
+ <location filename="../qml/AboutPage.qml" line="139"/>
<source>is a server that provides offline map services</source>
<translation>é um servidor que fornece serviços de mapas offline</translation>
</message>
<message>
- <location filename="../qml/AboutPage.qml" line="119"/>
+ <location filename="../qml/AboutPage.qml" line="143"/>
<source>User's guide is available <a href='https://rinigus.github.io/osmscout-server'>online</a></source>
<translation>O guia do usuário está disponível <a href='https://rinigus.github.io/osmscout-server'>online</a></translation>
</message>
@@ -90,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>Padrão</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>Personalizado</translation>
+ </message>
</context>
<context>
<name>CountryDetailsPage</name>
@@ -320,8 +357,9 @@
<message>
<location filename="../qml/platform.kirigami/DialogPL.qml" line="26"/>
<location filename="../qml/platform.qtcontrols/DialogPL.qml" line="33"/>
+ <location filename="../qml/platform.ubports/DialogPL.qml" line="33"/>
<source>Accept</source>
- <translation type="unfinished"/>
+ <translation>Aceitar</translation>
</message>
</context>
<context>
@@ -630,7 +668,7 @@
<message>
<location filename="../qml/MainMenu.qml" line="49"/>
<source>About OSM Scout Server</source>
- <translation type="unfinished"/>
+ <translation>Sobre o OSM Scout Server</translation>
</message>
</context>
<context>
@@ -638,7 +676,7 @@
<message>
<location filename="../qml/MainMenuReversed.qml" line="33"/>
<source>About OSM Scout Server</source>
- <translation type="unfinished"/>
+ <translation>Sobre o OSM Scout Server</translation>
</message>
<message>
<location filename="../qml/MainMenuReversed.qml" line="38"/>
@@ -687,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>Não foi possível designar funcionalidades do Gerenciador 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>Pasta de armazenamento alterada para %1</translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/harbour-osmscout-server-ru.ts
^
|
| @@ -24,11 +24,6 @@
<translation>Иконки по %1</translation>
</message>
<message>
- <location filename="../qml/AboutPage.qml" line="44"/>
- <source>Banner photo by %1 (%2 licanse).</source>
- <translation>Фото на баннере от %1 (лицензия %2).</translation>
- </message>
- <message>
<location filename="../qml/AboutPage.qml" line="46"/>
<source>Translations</source>
<translation>Переводы</translation>
@@ -51,7 +46,7 @@
<message>
<location filename="../qml/AboutPage.qml" line="70"/>
<source>UK postal codes downloaded from <a href='https://www.freemaptools.com/download-uk-postcode-lat-lng.htm'>FreeMapTools</a>. These data contain: Ordnance Survey data © Crown copyright and database right 2017; Royal Mail data © Royal Mail copyright and database right 2017; National Statistics data © Crown copyright and database right 2017.</source>
- <translation>Почтовые индексы Великобритании загружаются с <a href='https://www.freemaptools.com/download-uk-postcode-lat-lng.htm'>FreeMapTools</a>. Эти данные содержат: данные Государственной топографической службы © копирайт государства и права на базу данных 2017; данные Royal Mail © копирайт Royal Mail и права на базу данных 2017; Национальные статистические данные © копирайт государства и права на базу данных 2017.</translation>
+ <translation>Почтовые индексы Великобритании загружаются с <a href='https://www.freemaptools.com/download-uk-postcode-lat-lng.htm'>FreeMapTools</a>. Эти данные содержат: данные Государственной топографической службы © копирайт государства и права на базу данных 2017; данные Royal Mail © копирайт Royal Mail и права на базу данных 2017; Национальные статистические данные © копирайт государства и права на базу данных 2017.</translation>
</message>
<message>
<location filename="../qml/AboutPage.qml" line="77"/>
@@ -79,6 +74,11 @@
<translation>Лицензия: GPLv3</translation>
</message>
<message>
+ <location filename="../qml/AboutPage.qml" line="44"/>
+ <source>Banner photo by %1 (%2 license).</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../qml/AboutPage.qml" line="133"/>
<source>version</source>
<translation>версия</translation>
@@ -357,6 +357,7 @@
<message>
<location filename="../qml/platform.kirigami/DialogPL.qml" line="26"/>
<location filename="../qml/platform.qtcontrols/DialogPL.qml" line="33"/>
+ <location filename="../qml/platform.ubports/DialogPL.qml" line="33"/>
<source>Accept</source>
<translation>Принять</translation>
</message>
@@ -2513,68 +2514,68 @@
<context>
<name>main</name>
<message>
- <location filename="../src/main.cpp" line="164"/>
+ <location filename="../src/main.cpp" line="188"/>
<source>OSM Scout Server</source>
<translation>OSM Scout Server</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="169"/>
+ <location filename="../src/main.cpp" line="193"/>
<source>Run the server without GUI as a console application</source>
<translation>Запустить сервер без графического пользовательского интерфейса как консольное приложение</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="173"/>
+ <location filename="../src/main.cpp" line="197"/>
<source>Do not output logs when running in console mode</source>
<translation>Не выводить логи при запуске в консольном режиме</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="178"/>
+ <location filename="../src/main.cpp" line="202"/>
<source>Run the server in SystemD socket-activated mode</source>
<translation>Запустить сервер в SystemD socket активированном режиме</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="184"/>
+ <location filename="../src/main.cpp" line="208"/>
<source>Start download of the maps</source>
<translation>Начать загрузку карт</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="188"/>
+ <location filename="../src/main.cpp" line="212"/>
<source>Update list of available maps</source>
<translation>Обновить список доступных карт</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="192"/>
+ <location filename="../src/main.cpp" line="216"/>
<source>List maps available on device</source>
<translation>Список доступных на устройстве карт</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="196"/>
+ <location filename="../src/main.cpp" line="220"/>
<source>List subscribed maps</source>
<translation>Список выбранных карт</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="200"/>
+ <location filename="../src/main.cpp" line="224"/>
<source>List maps provided for download</source>
<translation>Список карт для загрузки</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="204"/>
+ <location filename="../src/main.cpp" line="228"/>
<source>List missing maps</source>
<translation>Список недостающих карт</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="208"/>
+ <location filename="../src/main.cpp" line="232"/>
<source>Subscribe to a <country> dataset</source>
<translation>Выбрать набор данных для <country></translation>
</message>
<message>
- <location filename="../src/main.cpp" line="209"/>
- <location filename="../src/main.cpp" line="214"/>
+ <location filename="../src/main.cpp" line="233"/>
+ <location filename="../src/main.cpp" line="238"/>
<source>country-id</source>
<translation>идентификатор страны</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="213"/>
+ <location filename="../src/main.cpp" line="237"/>
<source>Unsubscribe <country> dataset</source>
<translation>Отказаться от набора данных для <country></translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/harbour-osmscout-server-sv.ts
^
|
| @@ -24,11 +24,6 @@
<translation>Ikoner av %1.</translation>
</message>
<message>
- <location filename="../qml/AboutPage.qml" line="44"/>
- <source>Banner photo by %1 (%2 licanse).</source>
- <translation>Banderollfoto av %1 (%2-licens).</translation>
- </message>
- <message>
<location filename="../qml/AboutPage.qml" line="46"/>
<source>Translations</source>
<translation>Översättningar</translation>
@@ -79,6 +74,11 @@
<translation>Licens: GPLv3</translation>
</message>
<message>
+ <location filename="../qml/AboutPage.qml" line="44"/>
+ <source>Banner photo by %1 (%2 license).</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../qml/AboutPage.qml" line="133"/>
<source>version</source>
<translation>version</translation>
@@ -357,6 +357,7 @@
<message>
<location filename="../qml/platform.kirigami/DialogPL.qml" line="26"/>
<location filename="../qml/platform.qtcontrols/DialogPL.qml" line="33"/>
+ <location filename="../qml/platform.ubports/DialogPL.qml" line="33"/>
<source>Accept</source>
<translation>Acceptera</translation>
</message>
@@ -2513,68 +2514,68 @@
<context>
<name>main</name>
<message>
- <location filename="../src/main.cpp" line="164"/>
+ <location filename="../src/main.cpp" line="188"/>
<source>OSM Scout Server</source>
<translation>OSM Scout Server</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="169"/>
+ <location filename="../src/main.cpp" line="193"/>
<source>Run the server without GUI as a console application</source>
<translation>Kör servern som konsolprogram, utan GUI</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="173"/>
+ <location filename="../src/main.cpp" line="197"/>
<source>Do not output logs when running in console mode</source>
<translation>Visa inte utdata från loggar, vid körning i konsolläge</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="178"/>
+ <location filename="../src/main.cpp" line="202"/>
<source>Run the server in SystemD socket-activated mode</source>
<translation>Kör servern i systemd, socket-aktiverat läge</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="184"/>
+ <location filename="../src/main.cpp" line="208"/>
<source>Start download of the maps</source>
<translation>Starta nerladdning av kartorna</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="188"/>
+ <location filename="../src/main.cpp" line="212"/>
<source>Update list of available maps</source>
<translation>Uppdatera listan över tillgängliga kartor</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="192"/>
+ <location filename="../src/main.cpp" line="216"/>
<source>List maps available on device</source>
<translation>Lista kartor, tillgängliga på enheten</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="196"/>
+ <location filename="../src/main.cpp" line="220"/>
<source>List subscribed maps</source>
<translation>Lista prenumererade kartor</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="200"/>
+ <location filename="../src/main.cpp" line="224"/>
<source>List maps provided for download</source>
<translation>Lista kartor, tillhandahållna för nerladdning</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="204"/>
+ <location filename="../src/main.cpp" line="228"/>
<source>List missing maps</source>
<translation>Lista saknade kartor</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="208"/>
+ <location filename="../src/main.cpp" line="232"/>
<source>Subscribe to a <country> dataset</source>
<translation>Prenumerera på en <country> datamängd</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="209"/>
- <location filename="../src/main.cpp" line="214"/>
+ <location filename="../src/main.cpp" line="233"/>
+ <location filename="../src/main.cpp" line="238"/>
<source>country-id</source>
<translation>lands-ID</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="213"/>
+ <location filename="../src/main.cpp" line="237"/>
<source>Unsubscribe <country> dataset</source>
<translation>Sluta prenumerera på <country> datamängd</translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/harbour-osmscout-server.ts
^
|
| @@ -24,11 +24,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/AboutPage.qml" line="44"/>
- <source>Banner photo by %1 (%2 licanse).</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../qml/AboutPage.qml" line="46"/>
<source>Translations</source>
<translation type="unfinished"></translation>
@@ -79,6 +74,11 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../qml/AboutPage.qml" line="44"/>
+ <source>Banner photo by %1 (%2 license).</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../qml/AboutPage.qml" line="133"/>
<source>version</source>
<translation type="unfinished"></translation>
@@ -357,6 +357,7 @@
<message>
<location filename="../qml/platform.kirigami/DialogPL.qml" line="26"/>
<location filename="../qml/platform.qtcontrols/DialogPL.qml" line="33"/>
+ <location filename="../qml/platform.ubports/DialogPL.qml" line="33"/>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
@@ -2513,68 +2514,68 @@
<context>
<name>main</name>
<message>
- <location filename="../src/main.cpp" line="164"/>
+ <location filename="../src/main.cpp" line="188"/>
<source>OSM Scout Server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/main.cpp" line="169"/>
+ <location filename="../src/main.cpp" line="193"/>
<source>Run the server without GUI as a console application</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/main.cpp" line="173"/>
+ <location filename="../src/main.cpp" line="197"/>
<source>Do not output logs when running in console mode</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/main.cpp" line="178"/>
+ <location filename="../src/main.cpp" line="202"/>
<source>Run the server in SystemD socket-activated mode</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/main.cpp" line="184"/>
+ <location filename="../src/main.cpp" line="208"/>
<source>Start download of the maps</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/main.cpp" line="188"/>
+ <location filename="../src/main.cpp" line="212"/>
<source>Update list of available maps</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/main.cpp" line="192"/>
+ <location filename="../src/main.cpp" line="216"/>
<source>List maps available on device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/main.cpp" line="196"/>
+ <location filename="../src/main.cpp" line="220"/>
<source>List subscribed maps</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/main.cpp" line="200"/>
+ <location filename="../src/main.cpp" line="224"/>
<source>List maps provided for download</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/main.cpp" line="204"/>
+ <location filename="../src/main.cpp" line="228"/>
<source>List missing maps</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/main.cpp" line="208"/>
+ <location filename="../src/main.cpp" line="232"/>
<source>Subscribe to a <country> dataset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/main.cpp" line="209"/>
- <location filename="../src/main.cpp" line="214"/>
+ <location filename="../src/main.cpp" line="233"/>
+ <location filename="../src/main.cpp" line="238"/>
<source>country-id</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/main.cpp" line="213"/>
+ <location filename="../src/main.cpp" line="237"/>
<source>Unsubscribe <country> dataset</source>
<translation type="unfinished"></translation>
</message>
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/osmscout-server-cs.ts
^
|
| +(symlink to harbour-osmscout-server-cs.ts)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/osmscout-server-de.ts
^
|
| +(symlink to harbour-osmscout-server-de.ts)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/osmscout-server-es.ts
^
|
| +(symlink to harbour-osmscout-server-es.ts)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/osmscout-server-fi.ts
^
|
| +(symlink to harbour-osmscout-server-fi.ts)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/osmscout-server-fr.ts
^
|
| +(symlink to harbour-osmscout-server-fr.ts)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/osmscout-server-it_IT.ts
^
|
| +(symlink to harbour-osmscout-server-it_IT.ts)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/osmscout-server-nb.ts
^
|
| +(symlink to harbour-osmscout-server-nb.ts)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/osmscout-server-nl.ts
^
|
| +(symlink to harbour-osmscout-server-nl.ts)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/osmscout-server-nl_BE.ts
^
|
| +(symlink to harbour-osmscout-server-nl_BE.ts)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/osmscout-server-pl.ts
^
|
| +(symlink to harbour-osmscout-server-pl.ts)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/osmscout-server-pt_BR.ts
^
|
| +(symlink to harbour-osmscout-server-pt_BR.ts)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/osmscout-server-ru.ts
^
|
| +(symlink to harbour-osmscout-server-ru.ts)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/osmscout-server-sv.ts
^
|
| +(symlink to harbour-osmscout-server-sv.ts)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-server-1.16.0.tar.bz2/translations/osmscout-server.ts
^
|
| +(symlink to harbour-osmscout-server.ts)
|
|
[-]
[+]
|
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.6
+Version: 1.16.0
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
|
