From 31c9535d5066f9d611f34fc09acd804c48650062 Mon Sep 17 00:00:00 2001 From: Pierre Grandin Date: Fri, 27 Oct 2017 10:45:15 -0700 Subject: Always build 'release' package for android --- ci/build_android.sh | 7 ++----- ci/build_android_x86.sh | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/ci/build_android.sh b/ci/build_android.sh index ad42c78c2..e94e156b5 100644 --- a/ci/build_android.sh +++ b/ci/build_android.sh @@ -30,11 +30,8 @@ cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain/arm-eabi.cmake -DCACHE_SIZE='(20*1024* make -j $(nproc --all) -if [[ "${CIRCLE_BRANCH}" == "master" ]]; then - make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk || exit 1 -else - make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk || exit 1 -fi +make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk +make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk echo echo "Build leftovers :" diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh index 6e84bc4e1..69a761b26 100644 --- a/ci/build_android_x86.sh +++ b/ci/build_android_x86.sh @@ -30,11 +30,8 @@ android list targets cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain/i686-android.cmake -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=25 -DANDROID_NDK_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 .. make -j $(nproc --all) -if [[ "${CIRCLE_BRANCH}" == "master" ]]; then - make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk || exit 1 -else - make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk || exit 1 -fi +make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk +make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk echo echo "Build leftovers :" -- cgit v1.2.1 From 13bc8d08f12bcac4e7e0f4bcd50a376dd5997d02 Mon Sep 17 00:00:00 2001 From: Pierre Grandin Date: Fri, 27 Oct 2017 10:58:33 -0700 Subject: Fix:android:Ensures that we capture all build errors --- ci/build_android.sh | 4 ++-- ci/build_android_x86.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/build_android.sh b/ci/build_android.sh index e94e156b5..f03d4bbe8 100644 --- a/ci/build_android.sh +++ b/ci/build_android.sh @@ -30,8 +30,8 @@ cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain/arm-eabi.cmake -DCACHE_SIZE='(20*1024* make -j $(nproc --all) -make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk -make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk +make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk || exit -1 +make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk || exit -1 echo echo "Build leftovers :" diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh index 69a761b26..cc51cfeee 100644 --- a/ci/build_android_x86.sh +++ b/ci/build_android_x86.sh @@ -30,8 +30,8 @@ android list targets cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain/i686-android.cmake -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=25 -DANDROID_NDK_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 .. make -j $(nproc --all) -make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk -make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk +make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk || exit -1 +make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk || exit -1 echo echo "Build leftovers :" -- cgit v1.2.1 From 23426cc1146ce872f16abd888444a88fc2dfb23f Mon Sep 17 00:00:00 2001 From: Pierre Grandin Date: Fri, 27 Oct 2017 11:04:45 -0700 Subject: Revert "Fix:android:Ensures that we capture all build errors" This reverts commit 13bc8d08f12bcac4e7e0f4bcd50a376dd5997d02. --- ci/build_android.sh | 4 ++-- ci/build_android_x86.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/build_android.sh b/ci/build_android.sh index f03d4bbe8..e94e156b5 100644 --- a/ci/build_android.sh +++ b/ci/build_android.sh @@ -30,8 +30,8 @@ cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain/arm-eabi.cmake -DCACHE_SIZE='(20*1024* make -j $(nproc --all) -make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk || exit -1 -make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk || exit -1 +make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk +make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk echo echo "Build leftovers :" diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh index cc51cfeee..69a761b26 100644 --- a/ci/build_android_x86.sh +++ b/ci/build_android_x86.sh @@ -30,8 +30,8 @@ android list targets cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain/i686-android.cmake -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=25 -DANDROID_NDK_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 .. make -j $(nproc --all) -make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk || exit -1 -make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk || exit -1 +make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk +make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk echo echo "Build leftovers :" -- cgit v1.2.1 From 01788f4fef79db0c26fd8a45caeb69c81b99d691 Mon Sep 17 00:00:00 2001 From: Pierre Grandin Date: Fri, 27 Oct 2017 11:04:57 -0700 Subject: Revert "Always build 'release' package for android" This reverts commit 31c9535d5066f9d611f34fc09acd804c48650062. --- ci/build_android.sh | 7 +++++-- ci/build_android_x86.sh | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ci/build_android.sh b/ci/build_android.sh index e94e156b5..ad42c78c2 100644 --- a/ci/build_android.sh +++ b/ci/build_android.sh @@ -30,8 +30,11 @@ cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain/arm-eabi.cmake -DCACHE_SIZE='(20*1024* make -j $(nproc --all) -make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk -make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk +if [[ "${CIRCLE_BRANCH}" == "master" ]]; then + make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk || exit 1 +else + make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk || exit 1 +fi echo echo "Build leftovers :" diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh index 69a761b26..6e84bc4e1 100644 --- a/ci/build_android_x86.sh +++ b/ci/build_android_x86.sh @@ -30,8 +30,11 @@ android list targets cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain/i686-android.cmake -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=25 -DANDROID_NDK_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 .. make -j $(nproc --all) -make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk -make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk +if [[ "${CIRCLE_BRANCH}" == "master" ]]; then + make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk || exit 1 +else + make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk || exit 1 +fi echo echo "Build leftovers :" -- cgit v1.2.1 From fd6226ed544241ed2a4aab23e4a0103857a2d2f9 Mon Sep 17 00:00:00 2001 From: mvglasow Date: Fri, 27 Oct 2017 22:38:26 +0300 Subject: Refactor:route:Add documentation Signed-off-by: mvglasow --- navit/route.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/navit/route.c b/navit/route.c index e367c3855..294f17d5b 100644 --- a/navit/route.c +++ b/navit/route.c @@ -94,7 +94,9 @@ struct route_graph_point { * least costs */ struct fibheap_el *el; /**< When this point is put on a Fibonacci heap, this is a pointer * to this point's heap-element */ - int value; /**< The cost at which one can reach the destination from this point on */ + int value; /**< The cost at which one can reach the destination from this point on. + * {@code INT_MAX} indicates that the destination is unreachable from this + * point, or that this point has not yet been examined. */ struct coord c; /**< Coordinates of this point */ int flags; /**< Flags for this point (eg traffic distortion) */ }; @@ -1165,8 +1167,9 @@ route_clear_destinations(struct route *this_) * and updates the route. * * @param this The route to set the destination for - * @param dst Coordinates to set as destination - * @param count Number of destinations (last one is final) + * @param dst Points to an array of coordinates to set as destinations, which will be visited in the + * order in which they appear in the array (the last one is the final destination) + * @param count Number of items in {@code dst}, 0 to clear all destinations * @param async If set, do routing asynchronously */ @@ -2932,6 +2935,15 @@ route_graph_process_restrictions(struct route_graph *this) } } +/** + * @brief Releases all resources needed to build the route graph. + * + * If {@code cancel} is false, this function will start processing restrictions and ultimately call + * the route graph's {@code done_cb} callback. + * + * @param rg Points to the route graph + * @param cancel True if the process was aborted before completing, false if it completed normally + */ static void route_graph_build_done(struct route_graph *rg, int cancel) { -- cgit v1.2.1 From 1f3675da69177429d9fad1cb77dcb8b7bc068e01 Mon Sep 17 00:00:00 2001 From: mvglasow Date: Sat, 28 Oct 2017 01:45:02 +0300 Subject: Refactor:route:Add documentation Signed-off-by: mvglasow --- navit/route.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/navit/route.c b/navit/route.c index 294f17d5b..1eef9107c 100644 --- a/navit/route.c +++ b/navit/route.c @@ -217,7 +217,8 @@ struct route_info { /** * @brief A complete route path * - * This structure describes a whole routing path + * A route path is an ordered set of segments describing the route from the current position (or previous + * destination) to the next destination. */ struct route_path { int in_use; /**< The path is in use and can not be updated */ @@ -265,7 +266,8 @@ struct route { /** * @brief A complete route graph * - * This structure describes a whole routing graph + * The route graph holds all routable segments along with the connections between them and the cost of + * each segment. */ struct route_graph { int busy; /**< The graph is being built */ -- cgit v1.2.1 From 30a5237105557eccc659efd8eba7e21dd32e60f7 Mon Sep 17 00:00:00 2001 From: mvglasow Date: Sat, 28 Oct 2017 23:32:15 +0300 Subject: Refactor:route:Add documentation Signed-off-by: mvglasow --- navit/route.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/navit/route.c b/navit/route.c index 1eef9107c..364bd390c 100644 --- a/navit/route.c +++ b/navit/route.c @@ -114,7 +114,7 @@ struct route_graph_point { struct route_segment_data { struct item item; /**< The item (e.g. street) that this segment represents. */ int flags; - int len; /**< Length of this segment */ + int len; /**< Length of this segment, in meters */ /*NOTE: After a segment, various fields may follow, depending on what flags are set. Order of fields: 1.) maxspeed Maximum allowed speed on this segment. Present if AF_SPEED_LIMIT is set. 2.) offset If the item is segmented (i.e. represented by more than one segment), this -- cgit v1.2.1 From 1db96358ed229dfc6fb2d8500542cde23fd7faa2 Mon Sep 17 00:00:00 2001 From: Joseph Herlant Date: Sun, 29 Oct 2017 18:10:13 -0700 Subject: update:doc:Build doxygen doc and push the result to a gh-pages branch (#354) Result visible at http://navit-gps.github.io/navit/ --- .circleci/config.yml | 34 ++++++++++++++++++++++++++++++++++ navit/Doxyfile | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4f8a82d39..7535a0076 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,6 +13,34 @@ jobs: command: | bash ci/setup_common_requirements.sh bash ci/build_linux.sh + run_doxygen: + <<: *defaults + steps: + - checkout + - run: + name: Install doxygen + command: apt-get update && apt-get -y install doxygen ca-certificates git + - run: + name: Run doxygen + command: cd navit && doxygen + - run: + name: Update results to Github + command: | + mkdir /root/.ssh + chmod 0600 /root/.ssh + echo 'github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==' >> ~/.ssh/known_hosts + git clone -b gh-pages git@github.com:navit-gps/navit.git /root/navit-doc + cd /root/navit-doc + git config --global push.default simple + git config user.name "Circle CI" + git config user.email "circleci@navit-project.org" + rsync -vrtza --exclude '.git' --delete /root/project/doc/html/ /root/navit-doc/ + echo "" > .nojekyll + git add . + git commit -am "update:doc:Doxygen update for commit ${CIRCLE_SHA1} [ci skip]" || true + git push + - store_artifacts: + path: /root/project/doc build_android_arm: <<: *defaults steps: @@ -102,6 +130,12 @@ jobs: workflows: version: 2 + doxygen: + jobs: + - run_doxygen: + filters: + branches: + only: /^trunk$/ build_all: jobs: - build_linux diff --git a/navit/Doxyfile b/navit/Doxyfile index b7e049301..0b2cb9e1c 100644 --- a/navit/Doxyfile +++ b/navit/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = navit # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 0.0 +PROJECT_NUMBER = 0.5.1-trunk # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a -- cgit v1.2.1 From c13c61a834bce1ec5f89417e633c1c4b7321a275 Mon Sep 17 00:00:00 2001 From: Pierre GRANDIN Date: Sun, 29 Oct 2017 18:10:51 -0700 Subject: =?UTF-8?q?Update:i18n:Updated=20=C4=8Ce=C5=A1tina=20translation?= =?UTF-8?q?=20from=20launchpad=20(#351)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- po/cs.po.in | 57 ++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/po/cs.po.in b/po/cs.po.in index ab05a9c48..28a3ec959 100644 --- a/po/cs.po.in +++ b/po/cs.po.in @@ -1,11 +1,12 @@ # Čeština translations for navit -# Copyright (C) 2006-2016 The Navit Team +# Copyright (C) 2006-2017 The Navit Team # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # 72ka https://launchpad.net/~2hp # Aleš Janda https://launchpad.net/~kyblicek # Ivan Kološ https://launchpad.net/~ivan-kolos # Jakuje https://launchpad.net/~jakuje +# Jiří Holubčík https://launchpad.net/~jery # MMlosh https://launchpad.net/~mmlosh # Marc0 https://launchpad.net/~z-ubuntuone-y # Mike Crash https://launchpad.net/~mike-mikecrash @@ -22,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2016-07-12 16:13+0000\n" +"PO-Revision-Date: 2017-09-24 10:28+0000\n" "Last-Translator: Pavel Borecki \n" "Language-Team: Čeština\n" "MIME-Version: 1.0\n" @@ -33,7 +34,7 @@ msgstr "" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" -msgstr "Běží ze zdrojového adresáře\n" +msgstr "Spuštěné ze zdrojové složky\n" #, c-format msgid "setting '%s' to '%s'\n" @@ -203,7 +204,7 @@ msgstr "Až to bude možné, otočte se" #. TRANSLATORS: the argument is the destination to follow #, c-format msgid "towards %s" -msgstr "" +msgstr "směrem na %s" #, c-format msgid "Follow the road for the next %s" @@ -215,7 +216,7 @@ msgstr "Brzy najeďte na kruhový objezd" #. TRANSLATORS: %s is the distance to the roundabout #, c-format msgid "Enter the roundabout %s" -msgstr "" +msgstr "Vjeďte na kruhový objezd po %s" msgid "then enter the roundabout" msgstr "poté vjeďte na kruhový objezd" @@ -272,7 +273,7 @@ msgstr "Opusťte komunikaci na sjezdu %1$s %2$s%3$s" #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" msgid "at interchange" -msgstr "" +msgstr "sjeďte" msgid "at exit" msgstr "na konci" @@ -285,7 +286,7 @@ msgstr "poté pokračujte přímo %1$s" #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format msgid "Continue straight %1$s%2$s%3$s" -msgstr "" +msgstr "Pokračujte rovně %1$s%2$s%3$s" #. TRANSLATORS: the arg. is where to do the maneuver #, c-format @@ -295,7 +296,7 @@ msgstr "poté se držte vpravo%1$s" #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format msgid "Keep right %1$s%2$s%3$s" -msgstr "" +msgstr "Držte se vpravo %1$s%2$s%3$s" #. TRANSLATORS: the arg. is where to do the maneuver #, c-format @@ -305,7 +306,7 @@ msgstr "poté se držte vlevo%1$s" #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format msgid "Keep left %1$s%2$s%3$s" -msgstr "" +msgstr "Držte se vlevo %1$s%2$s%3$s" #. TRANSLATORS: "right" as in "turn right" msgid "right" @@ -371,7 +372,7 @@ msgstr "Otočte se %1$s" #. * #. msgid "follow" -msgstr "" +msgstr "následujte" msgid "then you have reached your destination." msgstr "pak budete v cíli." @@ -383,7 +384,7 @@ msgstr "%s dorazíte do cíle" #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" msgid "Interchange" -msgstr "" +msgstr "Sjezd" msgid "Exit" msgstr "Ukončit" @@ -1592,7 +1593,7 @@ msgid "Opens address search dialog" msgstr "Otevře vyhledávání adres" msgid "_POI search" -msgstr "" +msgstr "_POI hledat" msgid "Opens POI search dialog" msgstr "Otevře dialog vyhledávání POI" @@ -1689,7 +1690,7 @@ msgstr "Vzdálenost od středu mapy (km)" #, c-format msgid "POI %s. %s" -msgstr "" +msgstr "POI %s. %s" #, c-format msgid "Set destination to %ld, %ld \n" @@ -1983,7 +1984,7 @@ msgid "Height Profile" msgstr "Výškový profil" msgid "please install a map *.heightlines.bin to provide elevationdata" -msgstr "" +msgstr "pro výškové údaje nainstalujte mapu *.heightlines.bin" msgid "The route must cross at least 2 heightlines" msgstr "" @@ -1994,6 +1995,9 @@ msgstr "Popis trasy" msgid "Show Locale" msgstr "Zobrazit jazyk" +msgid "Network info" +msgstr "Informace o síti" + msgid "Former Destinations" msgstr "Minulé cíle" @@ -2448,7 +2452,7 @@ msgid "ready" msgstr "mapa připravena" msgid "Media selected for map storage is not available" -msgstr "" +msgstr "Médium zvolené pro uchovávání map není k dispozici" #. Android resource: @strings/map_download_not_enough_free_space msgid "Not enough free space" @@ -2528,8 +2532,17 @@ msgstr "Celá obrazovka" msgid "Window Mode" msgstr "V okně" +msgid "Auto zoom" +msgstr "Automatické přiblížení" + +msgid "Manual zoom" +msgstr "Ruční přiblížení" + msgid "Layers" -msgstr "" +msgstr "Vrstvy" + +msgid "Zoom to route" +msgstr "Přiblížit trasu" msgid "Description" msgstr "Popis" @@ -2641,7 +2654,7 @@ msgstr "Zálohovat / Obnovit" #. Android resource: @strings/optionsmenu_set_map_location msgid "Set map location" -msgstr "" +msgstr "Nastavit umístění mapy" #. Android resource: @strings/map_delete msgid "Delete this map?" @@ -2782,6 +2795,16 @@ msgid "" "Should we ask the system to show voice download dialog?" msgstr "" +#. Android resource: @strings/permissions_not_granted +msgid "" +"Navit needs permission to access GPS and read the map.\n" +"If you change your mind please restart Navit and grant the permissions" +msgstr "" + +#. Android resource: @strings/permissions_info_box_title +msgid "One or more ungranted permissions" +msgstr "Chybí přinejmenším jedno oprávnění" + #, c-format #~ msgid "then leave the roundabout at the %1$s %2$s" #~ msgstr "pak sjeďte na %1$s %2$s" -- cgit v1.2.1 From 8cd0c19adf290cdf45edc9a993c7168990b74094 Mon Sep 17 00:00:00 2001 From: Pierre GRANDIN Date: Sun, 29 Oct 2017 18:11:07 -0700 Subject: Update:i18n:Updated Spanish translation from launchpad (#352) --- po/es.po.in | 56 +++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 47 insertions(+), 9 deletions(-) diff --git a/po/es.po.in b/po/es.po.in index 4946a6233..bbd11a961 100644 --- a/po/es.po.in +++ b/po/es.po.in @@ -1,5 +1,5 @@ # Spanish translations for navit -# Copyright (C) 2006-2016 The Navit Team +# Copyright (C) 2006-2017 The Navit Team # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # Benjamín Valero Espinosa https://launchpad.net/~benjavalero @@ -8,6 +8,7 @@ # Emilio Gomez Fernandez https://launchpad.net/~egofer # Feder Sáiz https://launchpad.net/~federsaiz-deactivatedaccount # Inaki Saez https://launchpad.net/~inaki-saez +# Iñigo Huguet https://launchpad.net/~inigohuguet # Jonay https://launchpad.net/~jonay-santana # KaZeR https://launchpad.net/~kazer # Kenneth Belitzky https://launchpad.net/~r-kenny @@ -26,8 +27,8 @@ msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2016-06-21 22:51+0000\n" -"Last-Translator: Kenneth Belitzky \n" +"PO-Revision-Date: 2017-09-26 07:01+0000\n" +"Last-Translator: Iñigo Huguet \n" "Language-Team: Chris Eubank \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -174,7 +175,7 @@ msgstr "en el carril de entrada" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format msgid "%sinto %s%s%s" -msgstr "%sen la calle %s%s%s" +msgstr "%sen %s%s%s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format @@ -189,7 +190,7 @@ msgstr "%sen la %s%s%s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|neuter form" -msgstr "%sen la calle %s%s%s" +msgstr "%sen %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format @@ -214,10 +215,10 @@ msgstr "Entre en la próxima rotonda" #. TRANSLATORS: %s is the distance to the roundabout #, c-format msgid "Enter the roundabout %s" -msgstr "Entrar en la rotonda de %s" +msgstr "Entre en la rotonda %s" msgid "then enter the roundabout" -msgstr "luego entrar en la rotonda" +msgstr "luego entre en la rotonda" #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format @@ -1453,6 +1454,16 @@ msgid "" "\t-h: print this usage info and exit.\n" "\t-v: print the version and exit.\n" msgstr "" +"uso de navit:\n" +"navit [opciones][archivo config]\n" +"\t-c : usa como archivo de configuración en lugar del " +"archivo por defecto.\n" +"\t-d : fija el nivel global de salida de debug a (0=error, 1=warning, " +"2=info, 3=debug).\n" +"\tLas configuraciones del archivo de configuración aún tendrán efecto donde " +"fijen un nivel mayor.\n" +"\t-h: muestra este mensaje de ayuda y termina.\n" +"\t-v: muestra la versión y termina.\n" #. We have not found an existing config file from all possibilities msgid "No config file navit.xml, navit.xml.local found\n" @@ -1470,6 +1481,7 @@ msgstr "Usando el fichero de configuración '%s'\n" #, c-format msgid "Error: No configuration found in config file '%s'\n" msgstr "" +"Error: No se encontró la configuración en el archivo de configuración '%s'\n" msgid "" "Internal initialization failed, exiting. Check previous error messages.\n" @@ -1716,7 +1728,7 @@ msgid "Select a POI" msgstr "Seleccionar un POI" msgid " " -msgstr "" +msgstr " " msgid "Category" msgstr "Categoría" @@ -1984,9 +1996,11 @@ msgstr "Perfil de altura" msgid "please install a map *.heightlines.bin to provide elevationdata" msgstr "" +"por favor, instale un mapa *.heightlines.bin para suministrar información de " +"altimetría." msgid "The route must cross at least 2 heightlines" -msgstr "" +msgstr "La ruta cruza al menos 2 curvas de nivel" msgid "Route Description" msgstr "Descripción de ruta" @@ -1994,6 +2008,9 @@ msgstr "Descripción de ruta" msgid "Show Locale" msgstr "Mostrar locale" +msgid "Network info" +msgstr "Info. de red" + msgid "Former Destinations" msgstr "Destinos anteriores" @@ -2535,9 +2552,18 @@ msgstr "Pantalla completa" msgid "Window Mode" msgstr "Modo ventana" +msgid "Auto zoom" +msgstr "Zoom automático" + +msgid "Manual zoom" +msgstr "Zoom manual" + msgid "Layers" msgstr "" +msgid "Zoom to route" +msgstr "Zoom a ruta" + msgid "Description" msgstr "Descripción" @@ -2789,6 +2815,18 @@ msgid "" "Should we ask the system to show voice download dialog?" msgstr "" +#. Android resource: @strings/permissions_not_granted +msgid "" +"Navit needs permission to access GPS and read the map.\n" +"If you change your mind please restart Navit and grant the permissions" +msgstr "" +"Navit necesita permiso para acceder al GPS y abrir el mapa.\n" +"Si cambia de opinión, por favor reinicie Navit y conceda los permisos." + +#. Android resource: @strings/permissions_info_box_title +msgid "One or more ungranted permissions" +msgstr "Uno o más permisos rechazados" + #, c-format #~ msgid "then leave the roundabout at the %1$s %2$s" #~ msgstr "después salga de la rotonda por la %1$s %2$s" -- cgit v1.2.1 From 1198e632fe73a9116ce995035a7e6be5c50acdad Mon Sep 17 00:00:00 2001 From: Pierre GRANDIN Date: Sun, 29 Oct 2017 18:11:25 -0700 Subject: Update:i18n:Updated French (fr) translation from launchpad (#353) --- po/fr.po.in | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/po/fr.po.in b/po/fr.po.in index 5300b85d2..17c40e85c 100644 --- a/po/fr.po.in +++ b/po/fr.po.in @@ -1,11 +1,12 @@ # French (fr) translations for navit -# Copyright (C) 2006-2016 The Navit Team +# Copyright (C) 2006-2017 The Navit Team # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # Arnaud https://launchpad.net/~arnaud-lemeur # Breizh_Punisher https://launchpad.net/~lemeura # Deuchnord https://launchpad.net/~jerome-logiciels-id # Elodie https://launchpad.net/~elodie +# Francois.Mocq https://launchpad.net/~francois-mocq # Fred https://launchpad.net/~frederi1 # Fred https://launchpad.net/~jelk # Gaël Ecorchard https://launchpad.net/~galou-breizh @@ -31,8 +32,8 @@ msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2016-09-29 12:45+0000\n" -"Last-Translator: Fred \n" +"PO-Revision-Date: 2017-10-08 23:54+0000\n" +"Last-Translator: KaZeR \n" "Language-Team: KaZeR \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2013,6 +2014,9 @@ msgstr "Description de la route" msgid "Show Locale" msgstr "Afficher la locale" +msgid "Network info" +msgstr "" + msgid "Former Destinations" msgstr "Destinations précédentes" @@ -2484,7 +2488,7 @@ msgid "Error writing map!" msgstr "Erreur d'écriture de carte !" msgid "Map download aborted!" -msgstr "Téléchargement de carte abondonné !" +msgstr "Téléchargement de la carte abandonné!" #. Android resource: @strings/map_download_eta msgid "ETA" @@ -2492,7 +2496,7 @@ msgstr "Temps restant" #. Android resource: @strings/map_download_title msgid "Map download" -msgstr "Carte téléchargement" +msgstr "Télécharger la carte" msgid "Vehicle Position" msgstr "Position du véhicule" @@ -2551,9 +2555,18 @@ msgstr "Plein écran" msgid "Window Mode" msgstr "Mode fenêtré" +msgid "Auto zoom" +msgstr "" + +msgid "Manual zoom" +msgstr "" + msgid "Layers" msgstr "Couches" +msgid "Zoom to route" +msgstr "" + msgid "Description" msgstr "Description" @@ -2656,7 +2669,7 @@ msgstr "Basculer POIs" #. Android resource: @strings/optionsmenu_exit_navit msgid "Exit Navit" -msgstr "Quittez Navit" +msgstr "Quitter Navit" #. Android resource: @strings/optionsmenu_backup_restore msgid "Backup / Restore" @@ -2680,7 +2693,7 @@ msgstr "Erreur de téléchargement carte" #. Android resource: @strings/map_download_download_aborted msgid "Map download aborted" -msgstr "Carte télécharger avortée" +msgstr "Téléchargement de la carte abandonné" #. Android resource: @strings/map_no_fix msgid "No location. Reopen after location fix." @@ -2809,6 +2822,16 @@ msgstr "" "parler dans votre langue. Devons nous demander au système d'afficher le menu " "de téléchargement des voix?" +#. Android resource: @strings/permissions_not_granted +msgid "" +"Navit needs permission to access GPS and read the map.\n" +"If you change your mind please restart Navit and grant the permissions" +msgstr "" + +#. Android resource: @strings/permissions_info_box_title +msgid "One or more ungranted permissions" +msgstr "" + #, c-format #~ msgid "then leave the roundabout at the %1$s %2$s" #~ msgstr "puis sortez du rond-point à la %1$s %2$s" -- cgit v1.2.1 From d2c9578378ab0c6e25b80771b43513b48832aabd Mon Sep 17 00:00:00 2001 From: jkoan Date: Tue, 31 Oct 2017 19:22:59 +0100 Subject: fix:android:Add workaround for android platform tools (#357) --- ci/setup_android.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ci/setup_android.sh b/ci/setup_android.sh index 64e250635..f3ae96900 100644 --- a/ci/setup_android.sh +++ b/ci/setup_android.sh @@ -13,6 +13,14 @@ cd /opt && rm -f android-sdk.tgz export PATH=${PATH}:${ANDROID_SDK_HOME}/tools:${ANDROID_SDK_HOME}/platform-tools:/opt/tools echo y | android update sdk --no-ui --all --filter platform-tools | grep 'package installed' + +# This is only an workaround to make sure the platform tools are installed +if [ ! -d ${ANDROID_SDK_HOME}/platform-tools ] && [ -f ${ANDROID_SDK_HOME}/temp/platform-tools_r26.0.2-linux.zip ]; then + if [ "$(md5sum ${ANDROID_SDK_HOME}/temp/platform-tools_r26.0.2-linux.zip | cut -d" " -f1)" == "ef952bb31497f7535e061ad0e712bed8" ]; then + cd ${ANDROID_SDK_HOME} && unzip ${ANDROID_SDK_HOME}/temp/platform-tools_r26.0.2-linux.zip + fi +fi + #RUN echo y | android update sdk --no-ui --all --filter extra-android-support | grep 'package installed' echo y | android update sdk --no-ui --all --filter android-25 | grep 'package installed' -- cgit v1.2.1