Menu
▾
▴
navit-cvs-commit — CVS commit mailing list
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(4) |
Aug
(59) |
Sep
(43) |
Oct
(95) |
Nov
(135) |
Dec
(108) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(229) |
Feb
(141) |
Mar
(59) |
Apr
(70) |
May
(64) |
Jun
(87) |
Jul
(57) |
Aug
(108) |
Sep
(74) |
Oct
(203) |
Nov
(141) |
Dec
(108) |
| 2009 |
Jan
(114) |
Feb
(91) |
Mar
(101) |
Apr
(69) |
May
(54) |
Jun
(82) |
Jul
(49) |
Aug
(109) |
Sep
(81) |
Oct
(93) |
Nov
(100) |
Dec
(79) |
| 2010 |
Jan
(46) |
Feb
(36) |
Mar
(135) |
Apr
(103) |
May
(116) |
Jun
(130) |
Jul
(52) |
Aug
(31) |
Sep
(46) |
Oct
(48) |
Nov
(98) |
Dec
(110) |
| 2011 |
Jan
(234) |
Feb
(184) |
Mar
(150) |
Apr
(43) |
May
(53) |
Jun
(52) |
Jul
(112) |
Aug
(72) |
Sep
(79) |
Oct
(23) |
Nov
(6) |
Dec
(30) |
| 2012 |
Jan
(39) |
Feb
(37) |
Mar
(49) |
Apr
(60) |
May
(63) |
Jun
(38) |
Jul
(33) |
Aug
(24) |
Sep
(20) |
Oct
(14) |
Nov
(23) |
Dec
(50) |
| 2013 |
Jan
(30) |
Feb
(32) |
Mar
(27) |
Apr
(41) |
May
(59) |
Jun
(21) |
Jul
(10) |
Aug
(73) |
Sep
(23) |
Oct
(60) |
Nov
(14) |
Dec
(15) |
| 2014 |
Jan
(4) |
Feb
(8) |
Mar
(11) |
Apr
(6) |
May
(27) |
Jun
(4) |
Jul
(29) |
Aug
(62) |
Sep
(11) |
Oct
(17) |
Nov
(58) |
Dec
(9) |
| 2015 |
Jan
(23) |
Feb
(3) |
Mar
(26) |
Apr
(47) |
May
(8) |
Jun
(28) |
Jul
(10) |
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <md...@us...> - 2015-04-07 20:43:17
|
Revision: 6061
http://sourceforge.net/p/navit/code/6061
Author: mdankov
Date: 2015-04-07 20:43:10 +0000 (Tue, 07 Apr 2015)
Log Message:
-----------
Fix:port_android:Do not crash when attempting to dismiss map download dialog.
Modified Paths:
--------------
trunk/navit/navit/android/src/org/navitproject/navit/NavitDialogs.java
Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitDialogs.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitDialogs.java 2015-04-07 20:25:22 UTC (rev 6060)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitDialogs.java 2015-04-07 20:43:10 UTC (rev 6061)
@@ -141,7 +141,8 @@
public void onDismiss(DialogInterface dialog)
{
Log.e("Navit", "onDismiss: mapdownloader_dialog");
- mapdownloader.stop_thread();
+ if(mapdownloader!=null)
+ mapdownloader.stop_thread();
}
};
mapdownloader_dialog.setOnDismissListener(onDismissListener);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2015-04-07 20:25:24
|
Revision: 6060
http://sourceforge.net/p/navit/code/6060
Author: mdankov
Date: 2015-04-07 20:25:22 +0000 (Tue, 07 Apr 2015)
Log Message:
-----------
Add:port_android:Allow running "Set map location" dialog from internal gui. Mostly for devices without hardware menu button.
Modified Paths:
--------------
trunk/navit/navit/graphics/android/graphics_android.c
trunk/navit/navit/xslt/android.xslt
Modified: trunk/navit/navit/graphics/android/graphics_android.c
===================================================================
--- trunk/navit/navit/graphics/android/graphics_android.c 2015-04-07 18:43:09 UTC (rev 6059)
+++ trunk/navit/navit/graphics/android/graphics_android.c 2015-04-07 20:25:22 UTC (rev 6060)
@@ -684,12 +684,15 @@
ncmd=3;
} else if(!strcmp(function,"backup_restore_dialog")) {
ncmd=7;
+ } else if(!strcmp(function,"set_map_location")) {
+ ncmd=10;
}
(*jnienv)->CallVoidMethod(jnienv, android_activity, Navit_runOptionsItem, ncmd);
}
static struct command_table commands[] = {
{"map_download_dialog",command_cast(graphics_android_cmd_runMenuItem)},
+ {"set_map_location",command_cast(graphics_android_cmd_runMenuItem)},
{"backup_restore_dialog",command_cast(graphics_android_cmd_runMenuItem)},
};
Modified: trunk/navit/navit/xslt/android.xslt
===================================================================
--- trunk/navit/navit/xslt/android.xslt 2015-04-07 18:43:09 UTC (rev 6059)
+++ trunk/navit/navit/xslt/android.xslt 2015-04-07 20:25:22 UTC (rev 6060)
@@ -39,6 +39,7 @@
<xsl:value-of select="replace(/config/navit/gui[2]/text(),
'<a name=''Tools''><text>Tools</text>','<a name=''Tools''><text>Tools</text>
<img src=''gui_maps'' onclick=''navit.graphics.map_download_dialog();''><text>Map download</text></img>
+ <img src=''gui_rules'' onclick=''navit.graphics.set_map_location();''><text>Set map location</text></img>
<img src=''gui_rules'' onclick=''navit.graphics.backup_restore_dialog();''><text>Backup / Restore</text></img>')"/>
</xsl:template>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-07 18:43:16
|
Revision: 6059
http://sourceforge.net/p/navit/code/6059
Author: kazer_
Date: 2015-04-07 18:43:09 +0000 (Tue, 07 Apr 2015)
Log Message:
-----------
Update:CI:Bumping minimal version to Android 2.3.3 ( was Android 2.3.1)
Modified Paths:
--------------
trunk/navit/ci/build_android.sh
Modified: trunk/navit/ci/build_android.sh
===================================================================
--- trunk/navit/ci/build_android.sh 2015-04-07 18:17:29 UTC (rev 6058)
+++ trunk/navit/ci/build_android.sh 2015-04-07 18:43:09 UTC (rev 6059)
@@ -129,7 +129,7 @@
cd $BUILD_PATH
export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_TOOLS:$ANDROID_SDK_PLATFORM_TOOLS:$PATH
android list targets
-cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DANDROID_API_VERSION=9 $SOURCE_PATH
+cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DANDROID_API_VERSION=10 $SOURCE_PATH
make && make apkg || exit 1
mv navit/android/bin/Navit-debug.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug.apk
mv navit/android/bin/Navit-debug-unaligned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug-unaligned.apk
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-07 18:17:36
|
Revision: 6058
http://sourceforge.net/p/navit/code/6058
Author: kazer_
Date: 2015-04-07 18:17:29 +0000 (Tue, 07 Apr 2015)
Log Message:
-----------
Update:CI:Simplifying the android build script
Modified Paths:
--------------
trunk/navit/ci/build_android.sh
Modified: trunk/navit/ci/build_android.sh
===================================================================
--- trunk/navit/ci/build_android.sh 2015-04-07 18:06:06 UTC (rev 6057)
+++ trunk/navit/ci/build_android.sh 2015-04-07 18:17:29 UTC (rev 6058)
@@ -128,6 +128,7 @@
mkdir -p $BUILD_PATH
cd $BUILD_PATH
export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_TOOLS:$ANDROID_SDK_PLATFORM_TOOLS:$PATH
+android list targets
cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DANDROID_API_VERSION=9 $SOURCE_PATH
make && make apkg || exit 1
mv navit/android/bin/Navit-debug.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug.apk
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-07 18:06:13
|
Revision: 6057
http://sourceforge.net/p/navit/code/6057
Author: kazer_
Date: 2015-04-07 18:06:06 +0000 (Tue, 07 Apr 2015)
Log Message:
-----------
Update:CI:Fixed a wrong path in android build script
Modified Paths:
--------------
trunk/navit/ci/build_android.sh
Modified: trunk/navit/ci/build_android.sh
===================================================================
--- trunk/navit/ci/build_android.sh 2015-04-07 00:08:53 UTC (rev 6056)
+++ trunk/navit/ci/build_android.sh 2015-04-07 18:06:06 UTC (rev 6057)
@@ -9,12 +9,10 @@
export SOURCE_PATH=$START_PATH"/"${CIRCLE_PROJECT_REPONAME}"/"
export CMAKE_FILE=$SOURCE_PATH"/Toolchain/arm-eabi.cmake"
-export NDK_SUFFIX="r10d"
-export ANDROID_NDK=$ANDROID_HOME"/android-ndk-"$NDK_SUFFIX
+export ANDROID_NDK="/usr/local/android-ndk/"
export ANDROID_NDK_BIN=$ANDROID_NDK"/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin"
-export ANDROID_SDK=$ANDROID_HOME"/android-sdk-linux"
-export ANDROID_SDK_TOOLS=$ANDROID_SDK"/tools"
+export ANDROID_SDK="/usr/local/android-sdk-linux/"
export ANDROID_SDK_PLATFORM_TOOLS=$ANDROID_SDK"/platform-tools"
export ANDROID_TOOLS_CHECK=$ANDROID_SDK"/tools"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-07 00:08:56
|
Revision: 6056
http://sourceforge.net/p/navit/code/6056
Author: kazer_
Date: 2015-04-07 00:08:53 +0000 (Tue, 07 Apr 2015)
Log Message:
-----------
Update:CI:Simplifying the android build script
Modified Paths:
--------------
trunk/navit/ci/build_android.sh
Modified: trunk/navit/ci/build_android.sh
===================================================================
--- trunk/navit/ci/build_android.sh 2015-04-06 22:52:58 UTC (rev 6055)
+++ trunk/navit/ci/build_android.sh 2015-04-07 00:08:53 UTC (rev 6056)
@@ -6,7 +6,7 @@
# setup var's to perform environment setup and cmake
export START_PATH=~/
-export SOURCE_PATH=$START_PATH"/"${CIRCLE_PROJECT_REPONAME}"/navit/"
+export SOURCE_PATH=$START_PATH"/"${CIRCLE_PROJECT_REPONAME}"/"
export CMAKE_FILE=$SOURCE_PATH"/Toolchain/arm-eabi.cmake"
export NDK_SUFFIX="r10d"
@@ -25,7 +25,7 @@
export ANDROID_BUILD_CHECK=$ANDROID_SDK"/build-tools/"$BUILD_TOOLS
export ANDROID_PLATFORM_LATEST="android-21"
-export ANDROID_PLATFORM_MIN="android-7"
+export ANDROID_PLATFORM_MIN="android-10"
export ANDROID_PLATFORM_CHECK_MIN=$ANDROID_SDK"/platforms/"$ANDROID_PLATFORM_MIN"/images"
export ANDROID_PLATFORM_CHECK_MAX=$ANDROID_SDK"/platforms/"$ANDROID_PLATFORM_LATEST"/images"
@@ -48,89 +48,88 @@
echo
fi
-mkdir -p $BUILD_PATH
+#function extractSDK {
+# echo -e -n "${yel}" " Unpacking Android SDK... "
+#
+# cd $ANDROID_HOME
+#
+# $(tar -xf $ANDROID_SDK_FILE -C $ANDROID_HOME)
+#
+# if [ $? -eq 0 ]; then {
+# echo -e "${grn}" "SUCCEEDED" "${off}"
+# }
+# else
+# {
+# echo -e "${red}" "FAILED" "${off}"
+# exit 1
+# }
+# fi
+#}
+#
+#function extractNDK {
+# echo -e -n "${yel}" " Unpacking Android NDK... "
+#
+# cd $ANDROID_HOME
+# chmod +x ./android-ndk-r10d-linux-x86_64.bin
+# ./android-ndk-r10d-linux-x86_64.bin
+#
+# if [ $? -eq 0 ]; then {
+# echo -e "${grn}" "SUCCEEDED" "${off}"
+# }
+# else
+# {
+# echo -e "${red}" "FAILED" "${off}"
+# exit 1
+# }
+# fi
+#}
+#
+#
+#if [ ! -d $ANDROID_SDK ]; then {
+# echo -e -n "${yel}" " Android SDK downloading... "
+# extractSDK
+#}
+#else {
+# echo -e "${grn}" " Android SDK Found " "${off}"
+#}
+#fi
+#
+#if [ ! -d $ANDROID_NDK_BIN ]; then {
+# echo -e -n "${yel}" " Android NDK downloading... "
+# extractNDK
+#}
+#else {
+# echo -e "${grn}" " Android NDK Found " "${off}"
+#}
+#fi
+#
+#function addSDK {
+# export ADD_SDK="echo y|android update sdk --no-ui --all --filter $SDK_ADD_FILTER"
+# $ADD_SDK
+#}
+#
+#function updateSDK {
+# export UPD_SDK="echo y|android update sdk --no-ui --filter $SDK_UPD_FILTER"
+#echo $UPD_SDK
+# $UPD_SDK
+#}
+#
+#if [ ! -d $ANDROID_PLATFORM_CHECK_MIN ]; then {
+# echo -e -n "${yel}" " Android SDK Platform ... MISSING, downloading may take a very long time... "
+# echo y|android update sdk --no-ui --all --filter platform-tool,tools,build-tools-21.1.2,extra-android-m2repository,extra-android-support,android-10,sysimg-10,addon-google_apis-google-10,android-9,addon-google_apis-google-9,android-21,sysimg-21,addon-google_apis-google-21
+#
+# echo -e "${grn}" "SUCCEEDED" "${off}"
+#}
+#else {
+# echo -e -n "${grn}" " Android SDK Platform ..." "${off}"
+# updateSDK
+# echo -e "${grn}" "VERIFIED" "${off}"
+#}
+#fi
-function extractSDK {
- echo -e -n "${yel}" " Unpacking Android SDK... "
-
- cd $ANDROID_HOME
-
- $(tar -xf $ANDROID_SDK_FILE -C $ANDROID_HOME)
-
- if [ $? -eq 0 ]; then {
- echo -e "${grn}" "SUCCEEDED" "${off}"
- }
- else
- {
- echo -e "${red}" "FAILED" "${off}"
- exit 1
- }
- fi
-}
-
-function extractNDK {
- echo -e -n "${yel}" " Unpacking Android NDK... "
-
- cd $ANDROID_HOME
- chmod +x ./android-ndk-r10d-linux-x86_64.bin
- ./android-ndk-r10d-linux-x86_64.bin
-
- if [ $? -eq 0 ]; then {
- echo -e "${grn}" "SUCCEEDED" "${off}"
- }
- else
- {
- echo -e "${red}" "FAILED" "${off}"
- exit 1
- }
- fi
-}
-
-
-if [ ! -d $ANDROID_SDK ]; then {
- echo -e -n "${yel}" " Android SDK downloading... "
- extractSDK
-}
-else {
- echo -e "${grn}" " Android SDK Found " "${off}"
-}
-fi
-
-if [ ! -d $ANDROID_NDK_BIN ]; then {
- echo -e -n "${yel}" " Android NDK downloading... "
- extractNDK
-}
-else {
- echo -e "${grn}" " Android NDK Found " "${off}"
-}
-fi
-
-function addSDK {
- export ADD_SDK="echo y|android update sdk --no-ui --all --filter $SDK_ADD_FILTER"
- $ADD_SDK
-}
-
-function updateSDK {
- export UPD_SDK="echo y|android update sdk --no-ui --filter $SDK_UPD_FILTER"
-echo $UPD_SDK
- $UPD_SDK
-}
-
-if [ ! -d $ANDROID_PLATFORM_CHECK_MIN ]; then {
- echo -e -n "${yel}" " Android SDK Platform ... MISSING, downloading may take a very long time... "
- echo y|android update sdk --no-ui --all --filter platform-tool,tools,build-tools-21.1.2,extra-android-m2repository,extra-android-support,android-10,sysimg-10,addon-google_apis-google-10,android-9,addon-google_apis-google-9,android-21,sysimg-21,addon-google_apis-google-21
-
- echo -e "${grn}" "SUCCEEDED" "${off}"
-}
-else {
- echo -e -n "${grn}" " Android SDK Platform ..." "${off}"
- updateSDK
- echo -e "${grn}" "VERIFIED" "${off}"
-}
-fi
-
mkdir -p $BUILD_PATH
cd $BUILD_PATH
+export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_TOOLS:$ANDROID_SDK_PLATFORM_TOOLS:$PATH
cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DANDROID_API_VERSION=9 $SOURCE_PATH
make && make apkg || exit 1
mv navit/android/bin/Navit-debug.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug.apk
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2015-04-06 22:53:05
|
Revision: 6055
http://sourceforge.net/p/navit/code/6055
Author: mdankov
Date: 2015-04-06 22:52:58 +0000 (Mon, 06 Apr 2015)
Log Message:
-----------
Fix:port_android:Properly detect if we're already in the navit directory when setting map path
Modified Paths:
--------------
trunk/navit/navit/android/src/org/navitproject/navit/Navit.java
Modified: trunk/navit/navit/android/src/org/navitproject/navit/Navit.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/Navit.java 2015-04-06 22:25:27 UTC (rev 6054)
+++ trunk/navit/navit/android/src/org/navitproject/navit/Navit.java 2015-04-06 22:52:58 UTC (rev 6055)
@@ -626,7 +626,7 @@
if(resultCode == RESULT_OK) {
String newDir = data.getStringExtra(FileBrowserActivity.returnDirectoryParameter);
Log.d(TAG, "selected path= "+newDir);
- if(!newDir.contains("/navit/"))
+ if(!newDir.contains("/navit"))
newDir = newDir+"/navit/";
else
newDir = newDir+"/";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-06 22:25:35
|
Revision: 6054
http://sourceforge.net/p/navit/code/6054
Author: kazer_
Date: 2015-04-06 22:25:27 +0000 (Mon, 06 Apr 2015)
Log Message:
-----------
Fix:CI:Fixed android build script call
Modified Paths:
--------------
trunk/navit/circle.yml
Modified: trunk/navit/circle.yml
===================================================================
--- trunk/navit/circle.yml 2015-04-06 22:23:13 UTC (rev 6053)
+++ trunk/navit/circle.yml 2015-04-06 22:25:27 UTC (rev 6054)
@@ -41,7 +41,7 @@
# for aapt
- sudo apt-get install lib32stdc++6
- sudo apt-get install lib32z1
- - bash ci/build_apk.sh
+ - bash ci/build_android.sh
test:
post:
- sed -i -e 's@name="Local GPS" profilename="car" enabled="yes" active="1"@name="Local GPS" profilename="car" enabled="no" active="0"@' navit.xml:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2015-04-06 22:23:15
|
Revision: 6053
http://sourceforge.net/p/navit/code/6053
Author: mdankov
Date: 2015-04-06 22:23:13 +0000 (Mon, 06 Apr 2015)
Log Message:
-----------
Fix:build_android:Add FileBrowserActivity to AndroidManifest in cmake builds.
Modified Paths:
--------------
trunk/navit/navit/android/AndroidManifest.xml.cmake
Modified: trunk/navit/navit/android/AndroidManifest.xml.cmake
===================================================================
--- trunk/navit/navit/android/AndroidManifest.xml.cmake 2015-04-06 21:57:36 UTC (rev 6052)
+++ trunk/navit/navit/android/AndroidManifest.xml.cmake 2015-04-06 22:23:13 UTC (rev 6053)
@@ -35,5 +35,6 @@
<activity android:name=".NavitAddressSearchActivity"></activity>
<activity android:name=".NavitDownloadSelectMapActivity"></activity>
<activity android:name=".NavitAddressResultListActivity"></activity>
+ <activity android:name=".FileBrowserActivity"></activity>
</application>
</manifest>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-06 21:57:43
|
Revision: 6052
http://sourceforge.net/p/navit/code/6052
Author: kazer_
Date: 2015-04-06 21:57:36 +0000 (Mon, 06 Apr 2015)
Log Message:
-----------
Fix:CI:Ensure the ~/android folder exists
Modified Paths:
--------------
trunk/navit/circle.yml
Modified: trunk/navit/circle.yml
===================================================================
--- trunk/navit/circle.yml 2015-04-06 21:52:00 UTC (rev 6051)
+++ trunk/navit/circle.yml 2015-04-06 21:57:36 UTC (rev 6052)
@@ -14,6 +14,7 @@
- "~/assets/"
pre:
- "[ -d ~/assets ] || mkdir ~/assets"
+ - "[ -d ~/android ] || mkdir ~/android"
- wget -c -O ~/assets/cov-analysis-linux64-7.6.0.tar.gz http://sd-55475.dedibox.fr/cov-analysis-linux64-7.6.0.tar.gz
- sudo apt-get install cmake
- sudo apt-get install libpng12-dev
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-06 21:52:02
|
Revision: 6051
http://sourceforge.net/p/navit/code/6051
Author: kazer_
Date: 2015-04-06 21:52:00 +0000 (Mon, 06 Apr 2015)
Log Message:
-----------
Add:CI:Added automatic android build
Modified Paths:
--------------
trunk/navit/circle.yml
Added Paths:
-----------
trunk/navit/ci/build_android.sh
Added: trunk/navit/ci/build_android.sh
===================================================================
--- trunk/navit/ci/build_android.sh (rev 0)
+++ trunk/navit/ci/build_android.sh 2015-04-06 21:52:00 UTC (rev 6051)
@@ -0,0 +1,142 @@
+#!/bin/bash
+red='\e[0;31m'
+grn='\e[0;32m'
+yel='\e[1;33m'
+off='\e[0m'
+
+# setup var's to perform environment setup and cmake
+export START_PATH=~/
+export SOURCE_PATH=$START_PATH"/"${CIRCLE_PROJECT_REPONAME}"/navit/"
+export CMAKE_FILE=$SOURCE_PATH"/Toolchain/arm-eabi.cmake"
+
+export NDK_SUFFIX="r10d"
+export ANDROID_NDK=$ANDROID_HOME"/android-ndk-"$NDK_SUFFIX
+export ANDROID_NDK_BIN=$ANDROID_NDK"/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin"
+
+export ANDROID_SDK=$ANDROID_HOME"/android-sdk-linux"
+export ANDROID_SDK_TOOLS=$ANDROID_SDK"/tools"
+export ANDROID_SDK_PLATFORM_TOOLS=$ANDROID_SDK"/platform-tools"
+
+export ANDROID_TOOLS_CHECK=$ANDROID_SDK"/tools"
+
+export ANDROID_PLATFORM_TOOLS_CHECK=$ANDROID_SDK"/platform-tools"
+
+export ANDROID_BUILD_TOOLS="21.1.2"
+export ANDROID_BUILD_CHECK=$ANDROID_SDK"/build-tools/"$BUILD_TOOLS
+
+export ANDROID_PLATFORM_LATEST="android-21"
+export ANDROID_PLATFORM_MIN="android-7"
+export ANDROID_PLATFORM_CHECK_MIN=$ANDROID_SDK"/platforms/"$ANDROID_PLATFORM_MIN"/images"
+export ANDROID_PLATFORM_CHECK_MAX=$ANDROID_SDK"/platforms/"$ANDROID_PLATFORM_LATEST"/images"
+
+export BUILD_PATH=$START_PATH"/android-build"
+export ANDROID_ENV=$ANDROID_NDK_BIN:$ANDROID_SDK_TOOLS:$ANDROID_SDK_PLATFORM_TOOLS
+
+export SDK_ADD_FILTER="platform-tool,tools,build-tools-21.1.2,extra-android-m2repository,extra-android-support,android-10,sysimg-10,addon-google_apis-google-10,android-9,addon-google_apis-google-9,android-21,sysimg-21,addon-google_apis-google-21"
+
+export SDK_UPD_FILTER="platform-tool,tools,build-tools-21.1.2,extra-android-m2repository,extra-android-support"
+
+mkdir $ANDROID_HOME
+
+# If path already has our environment no need to set it
+if echo "$ANDROID_ENV" | grep -q "$PATH"; then
+ echo -e "${grn}" " Android PATH configuration... ALREADY SET" "${off}"
+ echo
+else
+ echo -e "${grn}" " Android PATH configuration... EXPORTED" "${off}"
+ export PATH=$ANDROID_ENV:$PATH
+ echo
+fi
+
+mkdir -p $BUILD_PATH
+
+function extractSDK {
+ echo -e -n "${yel}" " Unpacking Android SDK... "
+
+ cd $ANDROID_HOME
+
+ $(tar -xf $ANDROID_SDK_FILE -C $ANDROID_HOME)
+
+ if [ $? -eq 0 ]; then {
+ echo -e "${grn}" "SUCCEEDED" "${off}"
+ }
+ else
+ {
+ echo -e "${red}" "FAILED" "${off}"
+ exit 1
+ }
+ fi
+}
+
+function extractNDK {
+ echo -e -n "${yel}" " Unpacking Android NDK... "
+
+ cd $ANDROID_HOME
+ chmod +x ./android-ndk-r10d-linux-x86_64.bin
+ ./android-ndk-r10d-linux-x86_64.bin
+
+ if [ $? -eq 0 ]; then {
+ echo -e "${grn}" "SUCCEEDED" "${off}"
+ }
+ else
+ {
+ echo -e "${red}" "FAILED" "${off}"
+ exit 1
+ }
+ fi
+}
+
+
+if [ ! -d $ANDROID_SDK ]; then {
+ echo -e -n "${yel}" " Android SDK downloading... "
+ extractSDK
+}
+else {
+ echo -e "${grn}" " Android SDK Found " "${off}"
+}
+fi
+
+if [ ! -d $ANDROID_NDK_BIN ]; then {
+ echo -e -n "${yel}" " Android NDK downloading... "
+ extractNDK
+}
+else {
+ echo -e "${grn}" " Android NDK Found " "${off}"
+}
+fi
+
+function addSDK {
+ export ADD_SDK="echo y|android update sdk --no-ui --all --filter $SDK_ADD_FILTER"
+ $ADD_SDK
+}
+
+function updateSDK {
+ export UPD_SDK="echo y|android update sdk --no-ui --filter $SDK_UPD_FILTER"
+echo $UPD_SDK
+ $UPD_SDK
+}
+
+if [ ! -d $ANDROID_PLATFORM_CHECK_MIN ]; then {
+ echo -e -n "${yel}" " Android SDK Platform ... MISSING, downloading may take a very long time... "
+ echo y|android update sdk --no-ui --all --filter platform-tool,tools,build-tools-21.1.2,extra-android-m2repository,extra-android-support,android-10,sysimg-10,addon-google_apis-google-10,android-9,addon-google_apis-google-9,android-21,sysimg-21,addon-google_apis-google-21
+
+ echo -e "${grn}" "SUCCEEDED" "${off}"
+}
+else {
+ echo -e -n "${grn}" " Android SDK Platform ..." "${off}"
+ updateSDK
+ echo -e "${grn}" "VERIFIED" "${off}"
+}
+fi
+
+mkdir -p $BUILD_PATH
+cd $BUILD_PATH
+cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DANDROID_API_VERSION=9 $SOURCE_PATH
+make && make apkg || exit 1
+mv navit/android/bin/Navit-debug.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug.apk
+mv navit/android/bin/Navit-debug-unaligned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug-unaligned.apk
+make apkg-release && mv navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-release-unsigned.apk
+
+echo
+echo "Build leftovers :"
+ls navit/android/bin/
Modified: trunk/navit/circle.yml
===================================================================
--- trunk/navit/circle.yml 2015-04-06 21:32:57 UTC (rev 6050)
+++ trunk/navit/circle.yml 2015-04-06 21:52:00 UTC (rev 6051)
@@ -1,4 +1,17 @@
+machine:
+ environment:
+ ANDROID_HOME: /home/ubuntu/android
+ ANDROID_NDK_HOME: /home/ubuntu/android/android-ndk
+ ANDROID_SDK_CDN: https://dl.google.com/android
+ ANDROID_SDK_FILE: android-sdk_r24.0.2-linux.tgz
+ ANDROID_NDK_CDN: http://dl.google.com/android/ndk
+ ANDROID_NDK_FILE: android-ndk-r10d-linux-x86_64.bin
+ CMAKE_FILE: ../Toolchain/arm-eabi.cmake
dependencies:
+ cache_directories:
+ - ~/.android
+ - ~/android
+ - "~/assets/"
pre:
- "[ -d ~/assets ] || mkdir ~/assets"
- wget -c -O ~/assets/cov-analysis-linux64-7.6.0.tar.gz http://sd-55475.dedibox.fr/cov-analysis-linux64-7.6.0.tar.gz
@@ -10,8 +23,24 @@
- sudo apt-get install libdbus-glib-1-dev
- sudo apt-get install g++
- bash ci/build.sh
- cache_directories:
- - "~/assets/"
+# Android build
+ - wget -c -N -q $ANDROID_SDK_CDN/$ANDROID_SDK_FILE -O $ANDROID_HOME/$ANDROID_SDK_FILE
+ - wget -c -N -q $ANDROID_NDK_CDN/$ANDROID_NDK_FILE -O $ANDROID_HOME/$ANDROID_NDK_FILE
+ - sudo apt-get install gpsd
+ - sudo apt-get install gpsd-clients
+ - sudo apt-get install libgps-dev
+ - sudo apt-get install freeglut3-dev
+ - sudo apt-get install libxft-dev
+ - sudo apt-get install libglib2.0-dev
+ - sudo apt-get install libfreeimage-dev
+ - sudo apt-get install gettext
+ - sudo apt-get install openjdk-7-jdk
+ - sudo apt-get install ant
+ - sudo apt-get install libsaxonb-java
+# for aapt
+ - sudo apt-get install lib32stdc++6
+ - sudo apt-get install lib32z1
+ - bash ci/build_apk.sh
test:
post:
- sed -i -e 's@name="Local GPS" profilename="car" enabled="yes" active="1"@name="Local GPS" profilename="car" enabled="no" active="0"@' navit.xml:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2015-04-06 21:33:07
|
Revision: 6050
http://sourceforge.net/p/navit/code/6050
Author: mdankov
Date: 2015-04-06 21:32:57 +0000 (Mon, 06 Apr 2015)
Log Message:
-----------
Add:port_android:Made map and custom navit.xml path user-selectable|Related to #1290. Thank you, jandegr!
Modified Paths:
--------------
trunk/navit/navit/android/AndroidManifest.xml.in
trunk/navit/navit/android/res/values/strings.xml
trunk/navit/navit/android/src/org/navitproject/navit/Navit.java
trunk/navit/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
trunk/navit/navit/android.c
trunk/navit/navit/start_real.c
trunk/navit/navit/xslt/map_sdcard_navitmap_bin.xslt
Added Paths:
-----------
trunk/navit/navit/android/res/drawable-ldpi/dir_up.png
trunk/navit/navit/android/res/drawable-ldpi/file_icon.png
trunk/navit/navit/android/res/drawable-ldpi/folder_icon.png
trunk/navit/navit/android/res/drawable-ldpi/folder_icon_light.png
trunk/navit/navit/android/res/drawable-ldpi/ic_launcher.png
trunk/navit/navit/android/res/layout/
trunk/navit/navit/android/res/layout/ua_com_vassiliev_filebrowser_layout.xml
trunk/navit/navit/android/src/org/navitproject/navit/FileBrowserActivity.java
Modified: trunk/navit/navit/android/AndroidManifest.xml.in
===================================================================
--- trunk/navit/navit/android/AndroidManifest.xml.in 2015-04-06 21:22:22 UTC (rev 6049)
+++ trunk/navit/navit/android/AndroidManifest.xml.in 2015-04-06 21:32:57 UTC (rev 6050)
@@ -25,6 +25,7 @@
<activity android:name=".NavitAddressSearchActivity"></activity>
<activity android:name=".NavitDownloadSelectMapActivity"></activity>
<activity android:name=".NavitAddressResultListActivity"></activity>
+ <activity android:name=".FileBrowserActivity"></activity>
</application>
<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="8"/>
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:resizeable="true" android:anyDensity="true"/>
Added: trunk/navit/navit/android/res/drawable-ldpi/dir_up.png
===================================================================
(Binary files differ)
Index: trunk/navit/navit/android/res/drawable-ldpi/dir_up.png
===================================================================
--- trunk/navit/navit/android/res/drawable-ldpi/dir_up.png 2015-04-06 21:22:22 UTC (rev 6049)
+++ trunk/navit/navit/android/res/drawable-ldpi/dir_up.png 2015-04-06 21:32:57 UTC (rev 6050)
Property changes on: trunk/navit/navit/android/res/drawable-ldpi/dir_up.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/navit/navit/android/res/drawable-ldpi/file_icon.png
===================================================================
(Binary files differ)
Index: trunk/navit/navit/android/res/drawable-ldpi/file_icon.png
===================================================================
--- trunk/navit/navit/android/res/drawable-ldpi/file_icon.png 2015-04-06 21:22:22 UTC (rev 6049)
+++ trunk/navit/navit/android/res/drawable-ldpi/file_icon.png 2015-04-06 21:32:57 UTC (rev 6050)
Property changes on: trunk/navit/navit/android/res/drawable-ldpi/file_icon.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/navit/navit/android/res/drawable-ldpi/folder_icon.png
===================================================================
(Binary files differ)
Index: trunk/navit/navit/android/res/drawable-ldpi/folder_icon.png
===================================================================
--- trunk/navit/navit/android/res/drawable-ldpi/folder_icon.png 2015-04-06 21:22:22 UTC (rev 6049)
+++ trunk/navit/navit/android/res/drawable-ldpi/folder_icon.png 2015-04-06 21:32:57 UTC (rev 6050)
Property changes on: trunk/navit/navit/android/res/drawable-ldpi/folder_icon.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/navit/navit/android/res/drawable-ldpi/folder_icon_light.png
===================================================================
(Binary files differ)
Index: trunk/navit/navit/android/res/drawable-ldpi/folder_icon_light.png
===================================================================
--- trunk/navit/navit/android/res/drawable-ldpi/folder_icon_light.png 2015-04-06 21:22:22 UTC (rev 6049)
+++ trunk/navit/navit/android/res/drawable-ldpi/folder_icon_light.png 2015-04-06 21:32:57 UTC (rev 6050)
Property changes on: trunk/navit/navit/android/res/drawable-ldpi/folder_icon_light.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/navit/navit/android/res/drawable-ldpi/ic_launcher.png
===================================================================
(Binary files differ)
Index: trunk/navit/navit/android/res/drawable-ldpi/ic_launcher.png
===================================================================
--- trunk/navit/navit/android/res/drawable-ldpi/ic_launcher.png 2015-04-06 21:22:22 UTC (rev 6049)
+++ trunk/navit/navit/android/res/drawable-ldpi/ic_launcher.png 2015-04-06 21:32:57 UTC (rev 6050)
Property changes on: trunk/navit/navit/android/res/drawable-ldpi/ic_launcher.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/navit/navit/android/res/layout/ua_com_vassiliev_filebrowser_layout.xml
===================================================================
--- trunk/navit/navit/android/res/layout/ua_com_vassiliev_filebrowser_layout.xml (rev 0)
+++ trunk/navit/navit/android/res/layout/ua_com_vassiliev_filebrowser_layout.xml 2015-04-06 21:32:57 UTC (rev 6050)
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical"
+ android:padding="3dp" >
+
+ <!--
+ android:layout_weight="1"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:layout_width="fill_parent"
+ android:layout_width="fill_parent"
+ android:layout_gravity="top"
+ android:background = "#f00"
+ android:background = "#0f0"
+
+ -->
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="0dp"
+ android:gravity="top"
+ android:orientation="horizontal"
+ android:padding="0dp" >
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="0dp"
+ android:layout_weight="1"
+ android:gravity="top"
+ android:orientation="horizontal"
+ android:padding="0dp" >
+
+ <Button
+ android:id="@+id/upDirectoryButton"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="top"
+ android:layout_margin="0dp"
+ android:layout_weight="1"
+ android:padding="0dp"
+ android:drawableLeft="@drawable/dir_up"
+ android:text="Up" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="0dp"
+ android:layout_weight="1"
+ android:gravity="top"
+ android:orientation="horizontal"
+ android:padding="0dp" >
+
+ <Button
+ android:id="@+id/selectCurrentDirectoryButton"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="top"
+ android:gravity = "center|center_vertical"
+ android:layout_margin="0dp"
+ android:layout_weight="1"
+ android:padding="0dp"
+ android:text="Select" />
+ </LinearLayout>
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/currentDirectoryTextView"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:text="Current folder: \n/THis/is/a/long/path/to/test/if/this/will/span/multiple/lines" />
+
+ <ListView
+ android:id="@+id/fileListView"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:layout_marginTop="5dp"
+ android:layout_weight="1" />
+
+</LinearLayout>
\ No newline at end of file
Modified: trunk/navit/navit/android/res/values/strings.xml
===================================================================
--- trunk/navit/navit/android/res/values/strings.xml 2015-04-06 21:22:22 UTC (rev 6049)
+++ trunk/navit/navit/android/res/values/strings.xml 2015-04-06 21:32:57 UTC (rev 6050)
@@ -23,6 +23,7 @@
<string name="optionsmenu_toggle_poi">Toggle POIs</string>
<string name="optionsmenu_exit_navit">Exit Navit</string>
<string name="optionsmenu_backup_restore">Backup / Restore</string>
+ <string name="optionsmenu_set_map_location">Set map location</string>
<!-- POSITION POP-UP -->
<string name="position_popup_title">Position</string>
Added: trunk/navit/navit/android/src/org/navitproject/navit/FileBrowserActivity.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/FileBrowserActivity.java (rev 0)
+++ trunk/navit/navit/android/src/org/navitproject/navit/FileBrowserActivity.java 2015-04-06 21:32:57 UTC (rev 6050)
@@ -0,0 +1,432 @@
+package org.navitproject.navit;
+
+//Heavily based on code from
+//https://github.com/mburman/Android-File-Explore
+// Version of Aug 13, 2011
+//Also contributed:
+// Sugan Krishnan (https://github.com/rgksugan) - Jan 2013.
+//
+
+//Project type now is Android library:
+// http://developer.android.com/guide/developing/projects/projects-eclipse.html#ReferencingLibraryProject
+
+//General Java imports
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Collections;
+
+//Android imports
+import android.app.Activity;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.StatFs;
+import android.util.Log;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup.LayoutParams;
+import android.view.*;
+import android.widget.*;
+
+//Import of resources file for file browser
+import org.navitproject.navit.R;
+
+public class FileBrowserActivity extends Activity {
+ // Intent Action Constants
+ public static final String INTENT_ACTION_SELECT_DIR = "ua.com.vassiliev.androidfilebrowser.SELECT_DIRECTORY_ACTION";
+ public static final String INTENT_ACTION_SELECT_FILE = "ua.com.vassiliev.androidfilebrowser.SELECT_FILE_ACTION";
+
+ // Intent parameters names constants
+ public static final String startDirectoryParameter = "ua.com.vassiliev.androidfilebrowser.directoryPath";
+ public static final String returnDirectoryParameter = "ua.com.vassiliev.androidfilebrowser.directoryPathRet";
+ public static final String returnFileParameter = "ua.com.vassiliev.androidfilebrowser.filePathRet";
+ public static final String showCannotReadParameter = "ua.com.vassiliev.androidfilebrowser.showCannotRead";
+ public static final String filterExtension = "ua.com.vassiliev.androidfilebrowser.filterExtension";
+
+ // Stores names of traversed directories
+ ArrayList<String> pathDirsList = new ArrayList<String>();
+
+ // Check if the first level of the directory structure is the one showing
+ // private Boolean firstLvl = true;
+
+ private static final String LOGTAG = "F_PATH";
+
+ private List<Item> fileList = new ArrayList<Item>();
+ private File path = null;
+ private String chosenFile;
+ // private static final int DIALOG_LOAD_FILE = 1000;
+
+ ArrayAdapter<Item> adapter;
+
+ private boolean showHiddenFilesAndDirs = true;
+
+ private boolean directoryShownIsEmpty = false;
+
+ private String filterFileExtension = null;
+
+ // Action constants
+ private static int currentAction = -1;
+ private static final int SELECT_DIRECTORY = 1;
+ private static final int SELECT_FILE = 2;
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ // In case of
+ // ua.com.vassiliev.androidfilebrowser.SELECT_DIRECTORY_ACTION
+ // Expects com.mburman.fileexplore.directoryPath parameter to
+ // point to the start folder.
+ // If empty or null, will start from SDcard root.
+ setContentView(R.layout.ua_com_vassiliev_filebrowser_layout);
+
+ // Set action for this activity
+ Intent thisInt = this.getIntent();
+ currentAction = SELECT_DIRECTORY;// This would be a default action in
+ // case not set by intent
+ if (thisInt.getAction().equalsIgnoreCase(INTENT_ACTION_SELECT_FILE)) {
+ Log.d(LOGTAG, "SELECT ACTION - SELECT FILE");
+ currentAction = SELECT_FILE;
+ }
+
+ showHiddenFilesAndDirs = thisInt.getBooleanExtra(
+ showCannotReadParameter, true);
+
+ filterFileExtension = thisInt.getStringExtra(filterExtension);
+
+ setInitialDirectory();
+
+ parseDirectoryPath();
+ loadFileList();
+ this.createFileListAdapter();
+ this.initializeButtons();
+ this.initializeFileListView();
+ updateCurrentDirectoryTextView();
+ Log.d(LOGTAG, path.getAbsolutePath());
+ }
+
+ private void setInitialDirectory() {
+ Intent thisInt = this.getIntent();
+ String requestedStartDir = thisInt
+ .getStringExtra(startDirectoryParameter);
+
+ if (requestedStartDir != null && requestedStartDir.length() > 0) {// if(requestedStartDir!=null
+ File tempFile = new File(requestedStartDir);
+ if (tempFile.isDirectory())
+ this.path = tempFile;
+ }// if(requestedStartDir!=null
+
+ if (this.path == null) {// No or invalid directory supplied in intent
+ // parameter
+ if (Environment.getExternalStorageDirectory().isDirectory()
+ && Environment.getExternalStorageDirectory().canRead())
+ path = Environment.getExternalStorageDirectory();
+ else
+ path = new File("/");
+ }// if(this.path==null) {//No or invalid directory supplied in intent
+ // parameter
+ }// private void setInitialDirectory() {
+
+ private void parseDirectoryPath() {
+ pathDirsList.clear();
+ String pathString = path.getAbsolutePath();
+ String[] parts = pathString.split("/");
+ int i = 0;
+ while (i < parts.length) {
+ pathDirsList.add(parts[i]);
+ i++;
+ }
+ }
+
+ private void initializeButtons() {
+ Button upDirButton = (Button) this.findViewById(R.id.upDirectoryButton);
+ upDirButton.setOnClickListener(new OnClickListener() {
+ public void onClick(View v) {
+ Log.d(LOGTAG, "onclick for upDirButton");
+ loadDirectoryUp();
+ loadFileList();
+ adapter.notifyDataSetChanged();
+ updateCurrentDirectoryTextView();
+ }
+ });// upDirButton.setOnClickListener(
+
+ Button selectFolderButton = (Button) this
+ .findViewById(R.id.selectCurrentDirectoryButton);
+ if (currentAction == SELECT_DIRECTORY) {
+ selectFolderButton.setOnClickListener(new OnClickListener() {
+ public void onClick(View v) {
+ Log.d(LOGTAG, "onclick for selectFolderButton");
+ returnDirectoryFinishActivity();
+ }
+ });
+ } else {// if(currentAction == this.SELECT_DIRECTORY) {
+ selectFolderButton.setVisibility(View.GONE);
+ }// } else {//if(currentAction == this.SELECT_DIRECTORY) {
+ }// private void initializeButtons() {
+
+ private void loadDirectoryUp() {
+ // present directory removed from list
+ String s = pathDirsList.remove(pathDirsList.size() - 1);
+ // path modified to exclude present directory
+ path = new File(path.toString().substring(0,
+ path.toString().lastIndexOf(s)));
+ fileList.clear();
+ }
+
+ private void updateCurrentDirectoryTextView() {
+ int i = 0;
+ String curDirString = "";
+ while (i < pathDirsList.size()) {
+ curDirString += pathDirsList.get(i) + "/";
+ i++;
+ }
+ if (pathDirsList.size() == 0) {
+ ((Button) this.findViewById(R.id.upDirectoryButton))
+ .setEnabled(false);
+ curDirString = "/";
+ } else
+ ((Button) this.findViewById(R.id.upDirectoryButton))
+ .setEnabled(true);
+ long freeSpace = getFreeSpace(curDirString);
+ String formattedSpaceString = formatBytes(freeSpace);
+ if (freeSpace == 0) {
+ Log.d(LOGTAG, "NO FREE SPACE");
+ File currentDir = new File(curDirString);
+ if(!currentDir.canWrite())
+ formattedSpaceString = "NON Writable";
+ }
+
+ ((Button) this.findViewById(R.id.selectCurrentDirectoryButton))
+ .setText("Select\n[" + formattedSpaceString
+ + "]");
+
+ ((TextView) this.findViewById(R.id.currentDirectoryTextView))
+ .setText("Current directory: " + curDirString);
+ }// END private void updateCurrentDirectoryTextView() {
+
+ private void showToast(String message) {
+ Toast.makeText(this, message, Toast.LENGTH_LONG).show();
+ }
+
+ private void initializeFileListView() {
+ ListView lView = (ListView) this.findViewById(R.id.fileListView);
+ lView.setBackgroundColor(Color.LTGRAY);
+ LinearLayout.LayoutParams lParam = new LinearLayout.LayoutParams(
+ LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT);
+ lParam.setMargins(15, 5, 15, 5);
+ lView.setAdapter(this.adapter);
+ lView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+ public void onItemClick(AdapterView<?> parent, View view,
+ int position, long id) {
+ chosenFile = fileList.get(position).file;
+ File sel = new File(path + "/" + chosenFile);
+ Log.d(LOGTAG, "Clicked:" + chosenFile);
+ if (sel.isDirectory()) {
+ if (sel.canRead()) {
+ // Adds chosen directory to list
+ pathDirsList.add(chosenFile);
+ path = new File(sel + "");
+ Log.d(LOGTAG, "Just reloading the list");
+ loadFileList();
+ adapter.notifyDataSetChanged();
+ updateCurrentDirectoryTextView();
+ Log.d(LOGTAG, path.getAbsolutePath());
+ } else {// if(sel.canRead()) {
+ showToast("Path does not exist or cannot be read");
+ }// } else {//if(sel.canRead()) {
+ }// if (sel.isDirectory()) {
+ // File picked or an empty directory message clicked
+ else {// if (sel.isDirectory()) {
+ Log.d(LOGTAG, "item clicked");
+ if (!directoryShownIsEmpty) {
+ Log.d(LOGTAG, "File selected:" + chosenFile);
+ returnFileFinishActivity(sel.getAbsolutePath());
+ }
+ }// else {//if (sel.isDirectory()) {
+ }// public void onClick(DialogInterface dialog, int which) {
+ });// lView.setOnClickListener(
+ }// private void initializeFileListView() {
+
+ private void returnDirectoryFinishActivity() {
+ Intent retIntent = new Intent();
+ retIntent.putExtra(returnDirectoryParameter, path.getAbsolutePath());
+ this.setResult(RESULT_OK, retIntent);
+ this.finish();
+ }// END private void returnDirectoryFinishActivity() {
+
+ private void returnFileFinishActivity(String filePath) {
+ Intent retIntent = new Intent();
+ retIntent.putExtra(returnFileParameter, filePath);
+ this.setResult(RESULT_OK, retIntent);
+ this.finish();
+ }// END private void returnDirectoryFinishActivity() {
+
+ private void loadFileList() {
+ try {
+ path.mkdirs();
+ } catch (SecurityException e) {
+ Log.e(LOGTAG, "unable to write on the sd card ");
+ }
+ fileList.clear();
+
+ if (path.exists() && path.canRead()) {
+ FilenameFilter filter = new FilenameFilter() {
+ public boolean accept(File dir, String filename) {
+ File sel = new File(dir, filename);
+ boolean showReadableFile = showHiddenFilesAndDirs
+ || sel.canRead();
+ // Filters based on whether the file is hidden or not
+ if (currentAction == SELECT_DIRECTORY) {
+ return (sel.isDirectory() && showReadableFile);
+ }
+ if (currentAction == SELECT_FILE) {
+
+ // If it is a file check the extension if provided
+ if (sel.isFile() && filterFileExtension != null) {
+ return (showReadableFile && sel.getName().endsWith(
+ filterFileExtension));
+ }
+ return (showReadableFile);
+ }
+ return true;
+ }// public boolean accept(File dir, String filename) {
+ };// FilenameFilter filter = new FilenameFilter() {
+
+ String[] fList = path.list(filter);
+ this.directoryShownIsEmpty = false;
+ for (int i = 0; i < fList.length; i++) {
+ // Convert into file path
+ File sel = new File(path, fList[i]);
+ Log.d(LOGTAG,
+ "File:" + fList[i] + " readable:"
+ + (Boolean.valueOf(sel.canRead())).toString());
+ int drawableID = R.drawable.file_icon;
+ boolean canRead = sel.canRead();
+ // Set drawables
+ if (sel.isDirectory()) {
+ if (canRead) {
+ drawableID = R.drawable.folder_icon;
+ } else {
+ drawableID = R.drawable.folder_icon_light;
+ }
+ }
+ fileList.add(i, new Item(fList[i], drawableID, canRead));
+ }// for (int i = 0; i < fList.length; i++) {
+ if (fileList.size() == 0) {
+ // Log.d(LOGTAG, "This directory is empty");
+ this.directoryShownIsEmpty = true;
+ fileList.add(0, new Item("Directory is empty", -1, true));
+ } else {// sort non empty list
+ Collections.sort(fileList, new ItemFileNameComparator());
+ }
+ } else {
+ Log.e(LOGTAG, "path does not exist or cannot be read");
+ }
+ // Log.d(TAG, "loadFileList finished");
+ }// private void loadFileList() {
+
+ private void createFileListAdapter() {
+ adapter = new ArrayAdapter<Item>(this,
+ android.R.layout.select_dialog_item, android.R.id.text1,
+ fileList) {
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ // creates view
+ View view = super.getView(position, convertView, parent);
+ TextView textView = (TextView) view
+ .findViewById(android.R.id.text1);
+ // put the image on the text view
+ int drawableID = 0;
+ if (fileList.get(position).icon != -1) {
+ // If icon == -1, then directory is empty
+ drawableID = fileList.get(position).icon;
+ }
+ textView.setCompoundDrawablesWithIntrinsicBounds(drawableID, 0,
+ 0, 0);
+
+ textView.setEllipsize(null);
+
+ // add margin between image and text (support various screen
+ // densities)
+ // int dp5 = (int) (5 *
+ // getResources().getDisplayMetrics().density + 0.5f);
+ int dp3 = (int) (3 * getResources().getDisplayMetrics().density + 0.5f);
+ // TODO: change next line for empty directory, so text will be
+ // centered
+ textView.setCompoundDrawablePadding(dp3);
+ textView.setBackgroundColor(Color.LTGRAY);
+ return view;
+ }// public View getView(int position, View convertView, ViewGroup
+ };// adapter = new ArrayAdapter<Item>(this,
+ }// private createFileListAdapter(){
+
+ private class Item {
+ public String file;
+ public int icon;
+ public boolean canRead;
+
+ public Item(String file, Integer icon, boolean canRead) {
+ this.file = file;
+ this.icon = icon;
+ }
+
+ @Override
+ public String toString() {
+ return file;
+ }
+ }// END private class Item {
+
+ private class ItemFileNameComparator implements Comparator<Item> {
+ public int compare(Item lhs, Item rhs) {
+ return lhs.file.toLowerCase().compareTo(rhs.file.toLowerCase());
+ }
+ }
+
+ public void onConfigurationChanged(Configuration newConfig) {
+ super.onConfigurationChanged(newConfig);
+ if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {
+ Log.d(LOGTAG, "ORIENTATION_LANDSCAPE");
+ } else if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
+ Log.d(LOGTAG, "ORIENTATION_PORTRAIT");
+ }
+ // Layout apparently changes itself, only have to provide good onMeasure
+ // in custom components
+ // TODO: check with keyboard
+ // if(newConfig.keyboard == Configuration.KEYBOARDHIDDEN_YES)
+ }// END public void onConfigurationChanged(Configuration newConfig) {
+
+ public static long getFreeSpace(String path) {
+ StatFs stat = new StatFs(path);
+ long availSize = (long) stat.getAvailableBlocks()
+ * (long) stat.getBlockSize();
+ return availSize;
+ }// END public static long getFreeSpace(String path) {
+
+ public static String formatBytes(long bytes) {
+ // TODO: add flag to which part is needed (e.g. GB, MB, KB or bytes)
+ String retStr = "";
+ // One binary gigabyte equals 1,073,741,824 bytes.
+ if (bytes > 1073741824) {// Add GB
+ long gbs = bytes / 1073741824;
+ retStr += (new Long(gbs)).toString() + "GB ";
+ bytes = bytes - (gbs * 1073741824);
+ }
+ // One MB - 1048576 bytes
+ if (bytes > 1048576) {// Add GB
+ long mbs = bytes / 1048576;
+ retStr += (new Long(mbs)).toString() + "MB ";
+ bytes = bytes - (mbs * 1048576);
+ }
+ if (bytes > 1024) {
+ long kbs = bytes / 1024;
+ retStr += (new Long(kbs)).toString() + "KB";
+ bytes = bytes - (kbs * 1024);
+ } else
+ retStr += (new Long(bytes)).toString() + " bytes";
+ return retStr;
+ }// public static String formatBytes(long bytes){
+
+}// END public class FileBrowserActivity extends Activity {
Modified: trunk/navit/navit/android/src/org/navitproject/navit/Navit.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/Navit.java 2015-04-06 21:22:22 UTC (rev 6049)
+++ trunk/navit/navit/android/src/org/navitproject/navit/Navit.java 2015-04-06 21:32:57 UTC (rev 6050)
@@ -84,13 +84,14 @@
public static final int NavitDownloaderSelectMap_id = 967;
public static final int MAP_NUM_PRIMARY = 11;
public static final int NavitAddressSearch_id = 70;
+ public static final int NavitSelectStorage_id = 43;
public static String NavitLanguage;
public static Resources NavitResources = null;
public static final int MAP_NUM_SECONDARY = 12;
static final String NAVIT_PACKAGE_NAME = "org.navitproject.navit";
static final String TAG = "Navit";
- static final String MAP_FILENAME_PATH = Environment.getExternalStorageDirectory().getPath() + "/navit/";
+ static String map_filename_path = null;
static final String NAVIT_DATA_DIR = "/data/data/" + NAVIT_PACKAGE_NAME;
static final String NAVIT_DATA_SHARE_DIR = NAVIT_DATA_DIR + "/share";
static final String FIRST_STARTUP_FILE = NAVIT_DATA_SHARE_DIR + "/has_run_once.txt";
@@ -181,6 +182,7 @@
while ((i = resourcestream.read(buf)) != -1) {
resultfilestream.write(buf, 0, i);
}
+ resultfilestream.close();
} catch (Exception e) {
Log.e(TAG, "Exception " + e.getMessage());
return false;
@@ -294,8 +296,11 @@
}
Log.e("Navit", "Language " + lang);
+ SharedPreferences prefs = getSharedPreferences(NAVIT_PREFS,MODE_PRIVATE);
+ map_filename_path = prefs.getString("filenamePath", Environment.getExternalStorageDirectory().getPath() + "/navit/");
+
// make sure the new path for the navitmap.bin file(s) exist!!
- File navit_maps_dir = new File(MAP_FILENAME_PATH);
+ File navit_maps_dir = new File(map_filename_path);
navit_maps_dir.mkdirs();
// make sure the share dir exists
@@ -361,7 +366,7 @@
// --> dont use android.os.Build.VERSION.SDK_INT, needs API >= 4
Log.e("Navit", "android.os.Build.VERSION.SDK_INT=" + Integer.valueOf(android.os.Build.VERSION.SDK));
- NavitMain(this, NavitLanguage, Integer.valueOf(android.os.Build.VERSION.SDK), my_display_density, NAVIT_DATA_DIR+"/bin/navit");
+ NavitMain(this, NavitLanguage, Integer.valueOf(android.os.Build.VERSION.SDK), my_display_density, NAVIT_DATA_DIR+"/bin/navit",map_filename_path);
showInfos();
@@ -465,13 +470,14 @@
menu.clear();
// group-id,item-id,sort order number
- menu.add(1, 1, 100, getString(R.string.optionsmenu_zoom_in)); //TRANS
- menu.add(1, 2, 200, getString(R.string.optionsmenu_zoom_out)); //TRANS
+ //menu.add(1, 1, 100, getString(R.string.optionsmenu_zoom_in)); //TRANS
+ //menu.add(1, 2, 200, getString(R.string.optionsmenu_zoom_out)); //TRANS
menu.add(1, 3, 300, getString(R.string.optionsmenu_download_maps)); //TRANS
menu.add(1, 5, 400, getString(R.string.optionsmenu_toggle_poi)); //TRANS
menu.add(1, 6, 500, getString(R.string.optionsmenu_address_search)); //TRANS
+ menu.add(1, 10, 600, getString(R.string.optionsmenu_set_map_location));
menu.add(1, 99, 900, getString(R.string.optionsmenu_exit_navit)); //TRANS
@@ -571,6 +577,9 @@
/* Backup / Restore */
showDialog(NavitDialogs.DIALOG_BACKUP_RESTORE);
break;
+ case 10:
+ setMapLocation();
+ break;
case 99 :
// exit
this.onStop();
@@ -613,6 +622,22 @@
msg.sendToTarget();
}
break;
+ case NavitSelectStorage_id :
+ if(resultCode == RESULT_OK) {
+ String newDir = data.getStringExtra(FileBrowserActivity.returnDirectoryParameter);
+ Log.d(TAG, "selected path= "+newDir);
+ if(!newDir.contains("/navit/"))
+ newDir = newDir+"/navit/";
+ else
+ newDir = newDir+"/";
+ SharedPreferences prefs = this.getSharedPreferences(NAVIT_PREFS,MODE_PRIVATE);
+ SharedPreferences.Editor prefs_editor = prefs.edit();
+ prefs_editor.putString("filenamePath", newDir);
+ prefs_editor.commit();
+ Toast.makeText(this, String.format(Navit._("New location set to %s\nRestart Navit to apply the changes."),newDir),Toast.LENGTH_LONG).show();
+ }
+ else Log.w(TAG, "select path failed");
+ break;
default :
//Log.e("Navit", "onActivityResult " + requestCode + " " + resultCode);
ActivityResults[requestCode].onActivityResult(requestCode, resultCode, data);
@@ -640,6 +665,17 @@
return true;
}
+ public boolean setMapLocation()
+ {
+ Intent fileExploreIntent = new Intent(this,FileBrowserActivity.class);
+ fileExploreIntent
+ .putExtra(FileBrowserActivity.startDirectoryParameter, "/mnt")
+ .setAction(FileBrowserActivity.INTENT_ACTION_SELECT_DIR);
+ startActivityForResult(fileExploreIntent,NavitSelectStorage_id);
+
+ return true;
+ }
+
@Override
public void onDestroy()
{
@@ -676,7 +712,7 @@
finish();
}
- public native void NavitMain(Navit x, String lang, int version, String display_density_string, String path);
+ public native void NavitMain(Navit x, String lang, int version, String display_density_string, String path, String path2);
public native void NavitDestroy();
/*
Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java 2015-04-06 21:22:22 UTC (rev 6049)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java 2015-04-06 21:32:57 UTC (rev 6050)
@@ -64,7 +64,7 @@
} catch (Exception e) {
Log.e("Navit","Exception "+e.getClass().getName()+" during getFreeSpace, reporting 'no sdcard present'");
NavitDialogs.sendDialogMessage(NavitDialogs.MSG_TOAST_LONG, null,
- Navit._("Please attach your SD card to enable map download."),
+ String.format(Navit._("Current map location %s is not available\nPlease restart Navit after you attach an SD card or select a different map location."),Navit.map_filename_path),
-1, 0, 0);
finish();
}
@@ -72,7 +72,7 @@
protected long getFreeSpace()
{
- StatFs fsInfo = new StatFs(NavitMapDownloader.MAP_FILENAME_PATH);
+ StatFs fsInfo = new StatFs(Navit.map_filename_path);
return (long)fsInfo.getAvailableBlocks() * fsInfo.getBlockSize();
}
Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java 2015-04-06 21:22:22 UTC (rev 6049)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java 2015-04-06 21:32:57 UTC (rev 6050)
@@ -298,7 +298,7 @@
new osm_map_values(Navit._("Venezuela"), "-73.6", "0.4", "-59.7", "12.8", 124001905L, 1)
};
- public static final String MAP_FILENAME_PATH = Navit.MAP_FILENAME_PATH;
+ private String map_filename_path;
public static NavitMap[] getAvailableMaps() {
class filterMaps implements FilenameFilter {
@@ -309,12 +309,12 @@
}
}
NavitMap maps[] = new NavitMap[0];
- File map_dir = new File(MAP_FILENAME_PATH);
+ File map_dir = new File(Navit.map_filename_path);
String map_file_names[] = map_dir.list(new filterMaps());
if (map_file_names != null) {
maps = new NavitMap[map_file_names.length];
for (int map_file_index = 0; map_file_index < map_file_names.length; map_file_index++) {
- maps[map_file_index] = new NavitMap(MAP_FILENAME_PATH, map_file_names[map_file_index]);
+ maps[map_file_index] = new NavitMap(Navit.map_filename_path, map_file_names[map_file_index]);
}
}
return maps;
@@ -340,6 +340,7 @@
public NavitMapDownloader(int map_id) {
this.map_values = osm_maps[map_id];
this.map_id=map_id;
+ this.map_filename_path=Navit.map_filename_path;
}
public void run() {
@@ -368,7 +369,7 @@
if (success || stop_me ) {
NavitDialogs.sendDialogMessage( NavitDialogs.MSG_MAP_DOWNLOAD_FINISHED
- , MAP_FILENAME_PATH + map_values.map_name + ".bin", null, -1, success ? 1 : 0 , map_id );
+ , map_filename_path + map_values.map_name + ".bin", null, -1, success ? 1 : 0 , map_id );
}
}
@@ -384,8 +385,13 @@
needed_bytes = MAP_WRITE_FILE_BUFFER;
if (free_space < needed_bytes ) {
- Log.e(TAG, "Not enough free space. Please free at least " + needed_bytes / 1024 /1024 + "Mb.");
- updateProgress(free_space, needed_bytes, Navit._("Error downloading map!") + "\n" + Navit._("Not enough free space"));
+ String msg;
+ Log.e(TAG, "Not enough free space or media not available. Please free at least " + needed_bytes / 1024 /1024 + "Mb.");
+ if(free_space<0)
+ msg=Navit._("Media selected for map storage is not available");
+ else
+ msg=Navit._("Not enough free space");
+ updateProgress(free_space, needed_bytes, Navit._("Error downloading map!") + "\n" + msg);
return false;
}
return true;
@@ -471,7 +477,7 @@
}
protected File getDestinationFile() {
- File outputFile = new File(MAP_FILENAME_PATH, map_values.map_name + ".tmp");
+ File outputFile = new File(map_filename_path, map_values.map_name + ".tmp");
outputFile.getParentFile().mkdir();
return outputFile;
}
@@ -512,8 +518,12 @@
}
protected long getFreeSpace() {
- StatFs fsInfo = new StatFs(MAP_FILENAME_PATH);
- return (long)fsInfo.getAvailableBlocks() * fsInfo.getBlockSize();
+ try {
+ StatFs fsInfo = new StatFs(map_filename_path);
+ return (long)fsInfo.getAvailableBlocks() * fsInfo.getBlockSize();
+ } catch(Exception e) {
+ return -1;
+ }
}
protected BufferedInputStream getInputStream(URLConnection c) {
@@ -536,11 +546,11 @@
}
protected File getMapFile() {
- return new File(MAP_FILENAME_PATH, map_values.map_name + ".bin");
+ return new File(map_filename_path, map_values.map_name + ".bin");
}
protected File getMapInfoFile() {
- return new File(MAP_FILENAME_PATH, map_values.map_name + ".tmp.info");
+ return new File(map_filename_path, map_values.map_name + ".tmp.info");
}
protected BufferedOutputStream getOutputStream(File outputFile, boolean resume) {
Modified: trunk/navit/navit/android.c
===================================================================
--- trunk/navit/navit/android.c 2015-04-06 21:22:22 UTC (rev 6049)
+++ trunk/navit/navit/android.c 2015-04-06 21:32:57 UTC (rev 6050)
@@ -74,10 +74,11 @@
}
JNIEXPORT void JNICALL
-Java_org_navitproject_navit_Navit_NavitMain( JNIEnv* env, jobject thiz, jobject activity, jobject lang, int version, jobject display_density_string, jobject path)
+Java_org_navitproject_navit_Navit_NavitMain( JNIEnv* env, jobject thiz, jobject activity, jobject lang, int version, jobject display_density_string, jobject path, jobject map_path)
{
const char *langstr;
const char *displaydensitystr;
+ const char *map_file_path;
android_version=version;
__android_log_print(ANDROID_LOG_ERROR,"test","called");
jnienv=env;
@@ -91,6 +92,11 @@
dbg(lvl_debug,"*****displaydensity=%s\n",displaydensitystr);
setenv("ANDROID_DENSITY",displaydensitystr,1);
(*env)->ReleaseStringUTFChars(env, display_density_string, displaydensitystr);
+
+ map_file_path=(*env)->GetStringUTFChars(env, map_path, NULL);
+ setenv("NAVIT_USER_DATADIR",map_file_path,1);
+ (*env)->ReleaseStringUTFChars(env, display_density_string, map_file_path);
+
const char *strings=(*env)->GetStringUTFChars(env, path, NULL);
main_real(1, &strings);
(*env)->ReleaseStringUTFChars(env, path, strings);
Modified: trunk/navit/navit/start_real.c
===================================================================
--- trunk/navit/navit/start_real.c 2015-04-06 21:22:22 UTC (rev 6049)
+++ trunk/navit/navit/start_real.c 2015-04-06 21:32:57 UTC (rev 6050)
@@ -169,12 +169,6 @@
list = g_list_append(list,g_strjoin(NULL,getenv("NAVIT_USER_DATADIR"), "/navit.xml" , NULL));
list = g_list_append(list,g_strdup("navit.xml.local"));
list = g_list_append(list,g_strdup("navit.xml"));
-#ifdef HAVE_API_ANDROID
- // new preferred location (the new one should have priority over the legacy!)
- list = g_list_append(list,g_strdup("/sdcard/navit/navit.xml"));
- // legacy location, still supported
- list = g_list_append(list,g_strdup("/sdcard/navit.xml"));
-#endif
list = g_list_append(list,g_strjoin(NULL,getenv("NAVIT_SHAREDIR"), "/navit.xml.local" , NULL));
list = g_list_append(list,g_strjoin(NULL,getenv("NAVIT_SHAREDIR"), "/navit.xml" , NULL));
#ifndef _WIN32
Modified: trunk/navit/navit/xslt/map_sdcard_navitmap_bin.xslt
===================================================================
--- trunk/navit/navit/xslt/map_sdcard_navitmap_bin.xslt 2015-04-06 21:22:22 UTC (rev 6049)
+++ trunk/navit/navit/xslt/map_sdcard_navitmap_bin.xslt 2015-04-06 21:32:57 UTC (rev 6050)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<xsl:transform version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xi="http://www.w3.org/2001/XInclude">
<xsl:template match="/config/navit/mapset/xi:include">
- <maps type="binfile" data="/sdcard/navit/*.bin" />
+ <maps type="binfile" data="$NAVIT_USER_DATADIR/*.bin" />
</xsl:template>
</xsl:transform>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-06 21:22:23
|
Revision: 6049
http://sourceforge.net/p/navit/code/6049
Author: kazer_
Date: 2015-04-06 21:22:22 +0000 (Mon, 06 Apr 2015)
Log Message:
-----------
Fix:Translations:Work-around for a mistake breaking compilation in lt.po.in
Modified Paths:
--------------
trunk/navit/po/lt.po.in
Modified: trunk/navit/po/lt.po.in
===================================================================
--- trunk/navit/po/lt.po.in 2015-04-06 21:15:49 UTC (rev 6048)
+++ trunk/navit/po/lt.po.in 2015-04-06 21:22:22 UTC (rev 6049)
@@ -116,7 +116,7 @@
#, c-format
msgid "one mile"
msgid_plural "%d miles"
-msgstr[0] "viena mylia"
+msgstr[0] "%d mylia"
msgstr[1] "%d mylios"
msgstr[2] "%d mylių"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-06 21:15:51
|
Revision: 6048
http://sourceforge.net/p/navit/code/6048
Author: kazer_
Date: 2015-04-06 21:15:49 +0000 (Mon, 06 Apr 2015)
Log Message:
-----------
Add:Core:Added a basic circleci config
Added Paths:
-----------
trunk/navit/ci/
trunk/navit/ci/build.sh
trunk/navit/circle.yml
Added: trunk/navit/ci/build.sh
===================================================================
--- trunk/navit/ci/build.sh (rev 0)
+++ trunk/navit/ci/build.sh 2015-04-06 21:15:49 UTC (rev 6048)
@@ -0,0 +1,14 @@
+tar xfz ~/assets/cov-analysis-linux64-7.6.0.tar.gz
+export PATH=~/navit/cov-analysis-linux64-7.6.0/bin:$PATH
+
+mkdir bin && cd bin
+cov-build --dir cov-int cmake ../ -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE
+cov-build --dir cov-int make || exit -1
+tar czvf navit.tgz cov-int
+
+curl --form token=$COVERITY_TOKEN \
+ --form email=$COVERITY_EMAIL \
+ --form file=@navit.tgz \
+ --form version="${CIRCLE_BRANCH}-$CIRCLE_SHA1" \
+ --form description="${CIRCLE_BRANCH}-$CIRCLE_SHA1" \
+ https://scan.coverity.com/builds?project=$COVERITY_PROJECT
Added: trunk/navit/circle.yml
===================================================================
--- trunk/navit/circle.yml (rev 0)
+++ trunk/navit/circle.yml 2015-04-06 21:15:49 UTC (rev 6048)
@@ -0,0 +1,30 @@
+dependencies:
+ pre:
+ - "[ -d ~/assets ] || mkdir ~/assets"
+ - wget -c -O ~/assets/cov-analysis-linux64-7.6.0.tar.gz http://sd-55475.dedibox.fr/cov-analysis-linux64-7.6.0.tar.gz
+ - sudo apt-get install cmake
+ - sudo apt-get install libpng12-dev
+ - sudo apt-get install libgtk2.0-dev
+ - sudo apt-get install librsvg2-bin
+ - sudo apt-get install libfreetype6-dev
+ - sudo apt-get install libdbus-glib-1-dev
+ - sudo apt-get install g++
+ - bash ci/build.sh
+ cache_directories:
+ - "~/assets/"
+test:
+ post:
+ - sed -i -e 's@name="Local GPS" profilename="car" enabled="yes" active="1"@name="Local GPS" profilename="car" enabled="no" active="0"@' navit.xml:
+ pwd: bin/navit/
+ - sed -i -e 's@name="Demo" profilename="car" enabled="no" active="yes"@name="Demo" profilename="car" enabled="yes" active="yes" follow="1" refresh="1"@' navit.xml:
+ pwd: bin/navit/
+ - sed -i -e 's@type="internal" enabled@type="internal" fullscreen="1" font_size="350" enabled@' navit.xml:
+ pwd: bin/navit/
+ - sed -i -e 's@libbinding_dbus.so" active="no"@libbinding_dbus.so" active="yes"@' navit.xml:
+ pwd: bin/navit/
+ - ./navit:
+ pwd: bin/navit/
+ background: true
+ - sleep 5
+ - import -window root $CIRCLE_ARTIFACTS/default.png
+ - dbus-send --print-reply --session --dest=org.navit_project.navit /org/navit_project/navit/default_navit org.navit_project.navit.navit.quit
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-06 20:11:53
|
Revision: 6047
http://sourceforge.net/p/navit/code/6047
Author: kazer_
Date: 2015-04-06 20:11:50 +0000 (Mon, 06 Apr 2015)
Log Message:
-----------
Add:Translations:Added Korean, 74th translation
Modified Paths:
--------------
trunk/navit/README
Added Paths:
-----------
trunk/navit/po/ko.po.in
Modified: trunk/navit/README
===================================================================
--- trunk/navit/README 2015-04-06 20:01:30 UTC (rev 6046)
+++ trunk/navit/README 2015-04-06 20:11:50 UTC (rev 6047)
@@ -17,34 +17,7 @@
The routing engine not only calculates an optimal route to your
destination, but also generates directions and even speaks to you.
-Navit currently speaks 27 languages :
-- Brazilian Portuguese
-- Bulgarian
-- Chinese (Hong Kong)
-- Czech
-- Danish
-- Dutch
-- English
-- Estonian
-- Finnish
-- French
-- German
-- Hebrew
-- Hungarian
-- Italian
-- Japanese
-- Norwegian Bokmal
-- Polish
-- Portuguese
-- Romanian
-- Russian
-- Slovak
-- Slovenian
-- Spanish
-- Swedish
-- Telugu
-- Thai
-- Turkish
+Navit currently speaks over 70 languages!
You can help translating via our web based translation page :
http://translations.launchpad.net/navit/trunk/+pots/navit
Added: trunk/navit/po/ko.po.in
===================================================================
--- trunk/navit/po/ko.po.in (rev 0)
+++ trunk/navit/po/ko.po.in 2015-04-06 20:11:50 UTC (rev 6047)
@@ -0,0 +1,2635 @@
+# Korean translations for navit
+# Copyright (C) 2006-2014 The Navit Team
+# This file is distributed under the same license as the navit package.
+# Many thanks to the contributors of this translation:
+# Seungjun, Lee https://launchpad.net/~cybercorean
+
+msgid ""
+msgstr ""
+"Project-Id-Version: navit\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2015-04-03 14:35+0000\n"
+"Last-Translator: Seungjun, Lee <cyb...@gm...>\n"
+"Language-Team: Korean <ko...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Running from source directory\n"
+msgstr ""
+
+#, c-format
+msgid "setting '%s' to '%s'\n"
+msgstr ""
+
+#. TRANSLATORS: the following counts refer to streets
+msgid "zeroth"
+msgstr ""
+
+msgid "first"
+msgstr "첫번째"
+
+msgid "second"
+msgstr "두번째"
+
+msgid "third"
+msgstr "세번째"
+
+msgid "fourth"
+msgstr "네번째"
+
+msgid "fifth"
+msgstr "다섯번째"
+
+msgid "sixth"
+msgstr "여섯번재"
+
+#. TRANSLATORS: the following counts refer to roundabout exits
+msgid "zeroth exit"
+msgstr ""
+
+msgid "first exit"
+msgstr "첫번째 출구"
+
+msgid "second exit"
+msgstr "두번째 출구"
+
+msgid "third exit"
+msgstr "세번째 출구"
+
+msgid "fourth exit"
+msgstr "네번째 출구"
+
+msgid "fifth exit"
+msgstr "다섯번째 출구"
+
+msgid "sixth exit"
+msgstr "여섯번째 출구"
+
+#, c-format
+msgid "%d m"
+msgstr "%d 미터"
+
+#, c-format
+msgid "in %d m"
+msgstr "%d 미터 후에"
+
+#, c-format
+msgid "%d feet"
+msgstr "%d 피트"
+
+#, c-format
+msgid "in %d feet"
+msgstr "%d 피트 후에"
+
+#, c-format
+msgid "%d meters"
+msgstr "%d 미터"
+
+#, c-format
+msgid "in %d meters"
+msgstr "%d 미터 후에"
+
+#, c-format
+msgid "%d.%d miles"
+msgstr "%d.%d 마일"
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr "%d.%d 마일 후에"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d 킬로미터"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "%d.%d 킬로미터 후에"
+
+#, c-format
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] "%d 마일"
+
+#, c-format
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] "%d 마일 후에"
+
+#, c-format
+msgid "one kilometer"
+msgid_plural "%d kilometers"
+msgstr[0] "%d 킬로미터"
+
+#, c-format
+msgid "in one kilometer"
+msgid_plural "in %d kilometers"
+msgstr[0] "%d 킬로미터 후에"
+
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
+
+msgid "into the ramp"
+msgstr ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
+#, c-format
+msgid "%sinto the street %s%s%s"
+msgstr ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#, c-format
+msgid "%sinto the %s%s%s|male form"
+msgstr ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#, c-format
+msgid "%sinto the %s%s%s|female form"
+msgstr ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#, c-format
+msgid "%sinto the %s%s%s|neutral form"
+msgstr ""
+
+#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
+#, c-format
+msgid "%sinto the %s"
+msgstr ""
+
+msgid "When possible, please turn around"
+msgstr ""
+
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr ""
+
+msgid "Enter the roundabout soon"
+msgstr ""
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
+msgstr ""
+
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
+#, c-format
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
+
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
+#, c-format
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
+
+msgid "soon"
+msgstr ""
+
+msgid "now"
+msgstr ""
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr ""
+
+msgid "right"
+msgstr ""
+
+#, c-format
+msgid "after %i roads"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
+#, c-format
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
+
+msgid "easily "
+msgstr ""
+
+msgid "strongly "
+msgstr ""
+
+msgid "left"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s left turnaround"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr ""
+
+msgid "exit"
+msgstr ""
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
+
+#. Android resource: @strings/position_popup_title
+msgid "Position"
+msgstr ""
+
+msgid "Command"
+msgstr ""
+
+msgid "Length"
+msgstr ""
+
+msgid "km"
+msgstr ""
+
+msgid "m"
+msgstr ""
+
+msgid "Time"
+msgstr ""
+
+msgid "Destination Length"
+msgstr ""
+
+msgid "Destination Time"
+msgstr ""
+
+msgid "Roadbook"
+msgstr ""
+
+#, c-format
+msgid "Waypoint %d"
+msgstr ""
+
+msgid "Visit before..."
+msgstr ""
+
+msgid "Set as position"
+msgstr ""
+
+msgid "Set as destination"
+msgstr ""
+
+msgid "Add as bookmark"
+msgstr ""
+
+#, c-format
+msgid "Point 0x%x 0x%x"
+msgstr ""
+
+#, c-format
+msgid "Screen coord : %d %d"
+msgstr ""
+
+#. 020
+msgid "Andorra"
+msgstr ""
+
+#. 784
+msgid "United Arab Emirates"
+msgstr ""
+
+#. 004
+msgid "Afghanistan"
+msgstr ""
+
+#. 028
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#. 660
+msgid "Anguilla"
+msgstr ""
+
+#. 008
+msgid "Albania"
+msgstr ""
+
+#. 051
+msgid "Armenia"
+msgstr ""
+
+#. 530
+msgid "Netherlands Antilles"
+msgstr ""
+
+#. 024
+msgid "Angola"
+msgstr ""
+
+#. 010
+msgid "Antarctica"
+msgstr ""
+
+#. 032
+msgid "Argentina"
+msgstr ""
+
+#. 016
+msgid "American Samoa"
+msgstr ""
+
+#. 040
+msgid "Austria"
+msgstr ""
+
+#. 036
+msgid "Australia"
+msgstr ""
+
+#. 533
+msgid "Aruba"
+msgstr ""
+
+#. 248
+msgid "Aland Islands"
+msgstr ""
+
+#. 031
+msgid "Azerbaijan"
+msgstr ""
+
+#. 070
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#. 052
+msgid "Barbados"
+msgstr ""
+
+#. 050
+msgid "Bangladesh"
+msgstr ""
+
+#. 056
+msgid "Belgium"
+msgstr ""
+
+#. 854
+msgid "Burkina Faso"
+msgstr ""
+
+#. 100
+msgid "Bulgaria"
+msgstr ""
+
+#. 048
+msgid "Bahrain"
+msgstr ""
+
+#. 108
+msgid "Burundi"
+msgstr ""
+
+#. 204
+msgid "Benin"
+msgstr ""
+
+#. 652
+msgid "Saint Barthelemy"
+msgstr ""
+
+#. 060
+msgid "Bermuda"
+msgstr ""
+
+#. 096
+msgid "Brunei Darussalam"
+msgstr ""
+
+#. 068
+msgid "Bolivia"
+msgstr ""
+
+#. 535
+msgid "Bonaire, Sint Eustatius and Saba"
+msgstr ""
+
+#. 076
+msgid "Brazil"
+msgstr ""
+
+#. 044
+msgid "Bahamas"
+msgstr ""
+
+#. 064
+msgid "Bhutan"
+msgstr ""
+
+#. 074
+msgid "Bouvet Island"
+msgstr ""
+
+#. 072
+msgid "Botswana"
+msgstr ""
+
+#. 112
+msgid "Belarus"
+msgstr ""
+
+#. 084
+msgid "Belize"
+msgstr ""
+
+#. 124
+msgid "Canada"
+msgstr ""
+
+#. 166
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#. 180
+msgid "Congo, Democratic Republic of the"
+msgstr ""
+
+#. 140
+msgid "Central African Republic"
+msgstr ""
+
+#. 178
+msgid "Congo"
+msgstr ""
+
+#. 756
+msgid "Switzerland"
+msgstr ""
+
+#. 384
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#. 184
+msgid "Cook Islands"
+msgstr ""
+
+#. 152
+msgid "Chile"
+msgstr ""
+
+#. 120
+msgid "Cameroon"
+msgstr ""
+
+#. 156
+msgid "China"
+msgstr ""
+
+#. 170
+msgid "Colombia"
+msgstr ""
+
+#. 188
+msgid "Costa Rica"
+msgstr ""
+
+#. 192
+msgid "Cuba"
+msgstr ""
+
+#. 132
+msgid "Cape Verde"
+msgstr ""
+
+#. 531
+msgid "Curacao"
+msgstr ""
+
+#. 162
+msgid "Christmas Island"
+msgstr ""
+
+#. 196
+msgid "Cyprus"
+msgstr ""
+
+#. 203
+msgid "Czech Republic"
+msgstr ""
+
+#. 276
+msgid "Germany"
+msgstr ""
+
+#. 262
+msgid "Djibouti"
+msgstr ""
+
+#. 208
+msgid "Denmark"
+msgstr ""
+
+#. 212
+msgid "Dominica"
+msgstr ""
+
+#. 214
+msgid "Dominican Republic"
+msgstr ""
+
+#. 012
+msgid "Algeria"
+msgstr ""
+
+#. 218
+msgid "Ecuador"
+msgstr ""
+
+#. 233
+msgid "Estonia"
+msgstr ""
+
+#. 818
+msgid "Egypt"
+msgstr ""
+
+#. 732
+msgid "Western Sahara"
+msgstr ""
+
+#. 232
+msgid "Eritrea"
+msgstr ""
+
+#. 724
+msgid "Spain"
+msgstr ""
+
+#. 231
+msgid "Ethiopia"
+msgstr ""
+
+#. 246
+msgid "Finland"
+msgstr ""
+
+#. 242
+msgid "Fiji"
+msgstr ""
+
+#. 238
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#. 583
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#. 234
+msgid "Faroe Islands"
+msgstr ""
+
+#. 250
+msgid "France"
+msgstr ""
+
+#. 266
+msgid "Gabon"
+msgstr ""
+
+#. 826
+msgid "United Kingdom"
+msgstr ""
+
+#. 308
+msgid "Grenada"
+msgstr ""
+
+#. 268
+msgid "Georgia"
+msgstr ""
+
+#. 254
+msgid "French Guiana"
+msgstr ""
+
+#. 831
+msgid "Guernsey"
+msgstr ""
+
+#. 288
+msgid "Ghana"
+msgstr ""
+
+#. 292
+msgid "Gibraltar"
+msgstr ""
+
+#. 304
+msgid "Greenland"
+msgstr ""
+
+#. 270
+msgid "Gambia"
+msgstr ""
+
+#. 324
+msgid "Guinea"
+msgstr ""
+
+#. 312
+msgid "Guadeloupe"
+msgstr ""
+
+#. 226
+msgid "Equatorial Guinea"
+msgstr ""
+
+#. 300
+msgid "Greece"
+msgstr ""
+
+#. 239
+msgid "South Georgia and the South Sandwich Islands"
+msgstr ""
+
+#. 320
+msgid "Guatemala"
+msgstr ""
+
+#. 316
+msgid "Guam"
+msgstr ""
+
+#. 624
+msgid "Guinea-Bissau"
+msgstr ""
+
+#. 328
+msgid "Guyana"
+msgstr ""
+
+#. 344
+msgid "Hong Kong"
+msgstr ""
+
+#. 334
+msgid "Heard Island and McDonald Islands"
+msgstr ""
+
+#. 340
+msgid "Honduras"
+msgstr ""
+
+#. 191
+msgid "Croatia"
+msgstr ""
+
+#. 332
+msgid "Haiti"
+msgstr ""
+
+#. 348
+msgid "Hungary"
+msgstr ""
+
+#. 360
+msgid "Indonesia"
+msgstr ""
+
+#. 372
+msgid "Ireland"
+msgstr ""
+
+#. 376
+msgid "Israel"
+msgstr ""
+
+#. 833
+msgid "Isle of Man"
+msgstr ""
+
+#. 356
+msgid "India"
+msgstr ""
+
+#. 086
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#. 368
+msgid "Iraq"
+msgstr ""
+
+#. 364
+msgid "Iran, Islamic Republic of"
+msgstr ""
+
+#. 352
+msgid "Iceland"
+msgstr ""
+
+#. 380
+msgid "Italy"
+msgstr ""
+
+#. 832
+msgid "Jersey"
+msgstr ""
+
+#. 388
+msgid "Jamaica"
+msgstr ""
+
+#. 400
+msgid "Jordan"
+msgstr ""
+
+#. 392
+msgid "Japan"
+msgstr ""
+
+#. 404
+msgid "Kenya"
+msgstr ""
+
+#. 417
+msgid "Kyrgyzstan"
+msgstr ""
+
+#. 116
+msgid "Cambodia"
+msgstr ""
+
+#. 296
+msgid "Kiribati"
+msgstr ""
+
+#. 174
+msgid "Comoros"
+msgstr ""
+
+#. 659
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#. 408
+msgid "Korea, Democratic People's Republic of"
+msgstr ""
+
+#. 410
+msgid "Korea, Republic of"
+msgstr ""
+
+#. 414
+msgid "Kuwait"
+msgstr ""
+
+#. 136
+msgid "Cayman Islands"
+msgstr ""
+
+#. 398
+msgid "Kazakhstan"
+msgstr ""
+
+#. 418
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#. 422
+msgid "Lebanon"
+msgstr ""
+
+#. 662
+msgid "Saint Lucia"
+msgstr ""
+
+#. 438
+msgid "Liechtenstein"
+msgstr ""
+
+#. 144
+msgid "Sri Lanka"
+msgstr ""
+
+#. 430
+msgid "Liberia"
+msgstr ""
+
+#. 426
+msgid "Lesotho"
+msgstr ""
+
+#. 440
+msgid "Lithuania"
+msgstr ""
+
+#. 442
+msgid "Luxembourg"
+msgstr ""
+
+#. 428
+msgid "Latvia"
+msgstr ""
+
+#. 434
+msgid "Libya"
+msgstr ""
+
+#. 504
+msgid "Morocco"
+msgstr ""
+
+#. 492
+msgid "Monaco"
+msgstr ""
+
+#. 498
+msgid "Moldova, Republic of"
+msgstr ""
+
+#. 499
+msgid "Montenegro"
+msgstr ""
+
+#. 663
+msgid "Saint Martin (French part)"
+msgstr ""
+
+#. 450
+msgid "Madagascar"
+msgstr ""
+
+#. 584
+msgid "Marshall Islands"
+msgstr ""
+
+#. 807
+msgid "Macedonia, the former Yugoslav Republic of"
+msgstr ""
+
+#. 466
+msgid "Mali"
+msgstr ""
+
+#. 104
+msgid "Myanmar"
+msgstr ""
+
+#. 496
+msgid "Mongolia"
+msgstr ""
+
+#. 446
+msgid "Macao"
+msgstr ""
+
+#. 580
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#. 474
+msgid "Martinique"
+msgstr ""
+
+#. 478
+msgid "Mauritania"
+msgstr ""
+
+#. 500
+msgid "Montserrat"
+msgstr ""
+
+#. 470
+msgid "Malta"
+msgstr ""
+
+#. 480
+msgid "Mauritius"
+msgstr ""
+
+#. 462
+msgid "Maldives"
+msgstr ""
+
+#. 454
+msgid "Malawi"
+msgstr ""
+
+#. 484
+msgid "Mexico"
+msgstr ""
+
+#. 458
+msgid "Malaysia"
+msgstr ""
+
+#. 508
+msgid "Mozambique"
+msgstr ""
+
+#. 516
+msgid "Namibia"
+msgstr ""
+
+#. 540
+msgid "New Caledonia"
+msgstr ""
+
+#. 562
+msgid "Niger"
+msgstr ""
+
+#. 574
+msgid "Norfolk Island"
+msgstr ""
+
+#. 566
+msgid "Nigeria"
+msgstr ""
+
+#. 558
+msgid "Nicaragua"
+msgstr ""
+
+#. 528
+msgid "Netherlands"
+msgstr ""
+
+#. 578
+msgid "Norway"
+msgstr ""
+
+#. 524
+msgid "Nepal"
+msgstr ""
+
+#. 520
+msgid "Nauru"
+msgstr ""
+
+#. 570
+msgid "Niue"
+msgstr ""
+
+#. 554
+msgid "New Zealand"
+msgstr ""
+
+#. 512
+msgid "Oman"
+msgstr ""
+
+#. 591
+msgid "Panama"
+msgstr ""
+
+#. 604
+msgid "Peru"
+msgstr ""
+
+#. 258
+msgid "French Polynesia"
+msgstr ""
+
+#. 598
+msgid "Papua New Guinea"
+msgstr ""
+
+#. 608
+msgid "Philippines"
+msgstr ""
+
+#. 586
+msgid "Pakistan"
+msgstr ""
+
+#. 616
+msgid "Poland"
+msgstr ""
+
+#. 666
+msgid "Saint Pierre and Miquelon"
+msgstr ""
+
+#. 612
+msgid "Pitcairn"
+msgstr ""
+
+#. 630
+msgid "Puerto Rico"
+msgstr ""
+
+#. 275
+msgid "Palestinian Territory, Occupied"
+msgstr ""
+
+#. 620
+msgid "Portugal"
+msgstr ""
+
+#. 585
+msgid "Palau"
+msgstr ""
+
+#. 600
+msgid "Paraguay"
+msgstr ""
+
+#. 634
+msgid "Qatar"
+msgstr ""
+
+#. 638
+msgid "Reunion"
+msgstr ""
+
+#. 642
+msgid "Romania"
+msgstr ""
+
+#. 688
+msgid "Serbia"
+msgstr ""
+
+#. 643
+msgid "Russian Federation"
+msgstr ""
+
+#. 646
+msgid "Rwanda"
+msgstr ""
+
+#. 682
+msgid "Saudi Arabia"
+msgstr ""
+
+#. 090
+msgid "Solomon Islands"
+msgstr ""
+
+#. 690
+msgid "Seychelles"
+msgstr ""
+
+#. 736
+msgid "Sudan"
+msgstr ""
+
+#. 752
+msgid "Sweden"
+msgstr ""
+
+#. 702
+msgid "Singapore"
+msgstr ""
+
+#. 654
+msgid "Saint Helena"
+msgstr ""
+
+#. 705
+msgid "Slovenia"
+msgstr ""
+
+#. 744
+msgid "Svalbard and Jan Mayen"
+msgstr ""
+
+#. 703
+msgid "Slovakia"
+msgstr ""
+
+#. 694
+msgid "Sierra Leone"
+msgstr ""
+
+#. 674
+msgid "San Marino"
+msgstr ""
+
+#. 686
+msgid "Senegal"
+msgstr ""
+
+#. 706
+msgid "Somalia"
+msgstr ""
+
+#. 740
+msgid "Suriname"
+msgstr ""
+
+#. 728
+msgid "South Sudan"
+msgstr ""
+
+#. 678
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#. 222
+msgid "El Salvador"
+msgstr ""
+
+#. 534
+msgid "Sint Maarten (Dutch part)"
+msgstr ""
+
+#. 760
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#. 748
+msgid "Swaziland"
+msgstr ""
+
+#. 796
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#. 148
+msgid "Chad"
+msgstr ""
+
+#. 260
+msgid "French Southern Territories"
+msgstr ""
+
+#. 768
+msgid "Togo"
+msgstr ""
+
+#. 764
+msgid "Thailand"
+msgstr ""
+
+#. 762
+msgid "Tajikistan"
+msgstr ""
+
+#. 772
+msgid "Tokelau"
+msgstr ""
+
+#. 626
+msgid "Timor-Leste"
+msgstr ""
+
+#. 795
+msgid "Turkmenistan"
+msgstr ""
+
+#. 788
+msgid "Tunisia"
+msgstr ""
+
+#. 776
+msgid "Tonga"
+msgstr ""
+
+#. 792
+msgid "Turkey"
+msgstr ""
+
+#. 780
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#. 798
+msgid "Tuvalu"
+msgstr ""
+
+#. 158
+msgid "Taiwan, Province of China"
+msgstr ""
+
+#. 834
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#. 804
+msgid "Ukraine"
+msgstr ""
+
+#. 800
+msgid "Uganda"
+msgstr ""
+
+#. 581
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#. 840
+msgid "United States"
+msgstr ""
+
+#. 858
+msgid "Uruguay"
+msgstr ""
+
+#. 860
+msgid "Uzbekistan"
+msgstr ""
+
+#. 336
+msgid "Holy See (Vatican City State)"
+msgstr ""
+
+#. 670
+msgid "Saint Vincent and the Grenadines"
+msgstr ""
+
+#. 862
+msgid "Venezuela"
+msgstr ""
+
+#. 092
+msgid "Virgin Islands, British"
+msgstr ""
+
+#. 850
+msgid "Virgin Islands, U.S."
+msgstr ""
+
+#. 704
+msgid "Viet Nam"
+msgstr ""
+
+#. 548
+msgid "Vanuatu"
+msgstr ""
+
+#. 876
+msgid "Wallis and Futuna"
+msgstr ""
+
+#. 882
+msgid "Samoa"
+msgstr ""
+
+#. 887
+msgid "Yemen"
+msgstr ""
+
+#. 175
+msgid "Mayotte"
+msgstr ""
+
+#. 710
+msgid "South Africa"
+msgstr ""
+
+#. 894
+msgid "Zambia"
+msgstr ""
+
+#. 716
+msgid "Zimbabwe"
+msgstr ""
+
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
+msgid ""
+"navit usage:\n"
+"navit [options] [configfile]\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
+"\t-h: print this usage info and exit.\n"
+"\t-v: print the version and exit.\n"
+msgstr ""
+
+#. We have not found an existing config file from all possibilities
+msgid "No config file navit.xml, navit.xml.local found\n"
+msgstr ""
+
+#, c-format
+msgid "Error parsing config file '%s': %s\n"
+msgstr ""
+
+#, c-format
+msgid "Using config file '%s'\n"
+msgstr ""
+
+#, c-format
+msgid "Error: No configuration found in config file '%s'\n"
+msgstr ""
+
+msgid ""
+"Internal initialization failed, exiting. Check previous error messages.\n"
+msgstr ""
+
+msgid "unknown street"
+msgstr ""
+
+#. Safe cast: attr_generic_set_attr does not modify its parameter.
+msgid "Unnamed vehicle"
+msgstr ""
+
+msgid "Failed to write bookmarks file"
+msgstr ""
+
+#. Strings from navit_shipped.xml
+msgid "Map Point"
+msgstr ""
+
+msgid "Car"
+msgstr ""
+
+msgid "Iso2"
+msgstr ""
+
+msgid "Iso3"
+msgstr ""
+
+msgid "Country"
+msgstr ""
+
+msgid "Postal"
+msgstr ""
+
+msgid "Town"
+msgstr ""
+
+msgid "District"
+msgstr ""
+
+msgid "Street"
+msgstr ""
+
+msgid "Number"
+msgstr ""
+
+msgid "Enter Destination"
+msgstr ""
+
+msgid "Zip Code"
+msgstr ""
+
+msgid "City"
+msgstr ""
+
+msgid "District/Township"
+msgstr ""
+
+msgid "Map"
+msgstr ""
+
+msgid "Bookmark"
+msgstr ""
+
+msgid "Destination"
+msgstr ""
+
+#. TRANSLATORS: These texts are for menu items in GTK GUI. The _ indicates the mnemonic key (=underlined character) for this menu item. Please place the _ before a suitable character in the translation (or omit it if no mnemonic key is desired).
+msgid "_Display"
+msgstr ""
+
+msgid "_Route"
+msgstr ""
+
+msgid "_Former Destinations"
+msgstr ""
+
+msgid "_Bookmarks"
+msgstr ""
+
+msgid "_Map"
+msgstr ""
+
+msgid "_Layout"
+msgstr ""
+
+msgid "_Projection"
+msgstr ""
+
+msgid "_Vehicle"
+msgstr ""
+
+msgid "Zoom_Out"
+msgstr ""
+
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
+msgstr ""
+
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
+msgstr ""
+
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
+msgstr ""
+
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
+msgstr ""
+
+msgid "Test"
+msgstr ""
+
+msgid "_Quit"
+msgstr ""
+
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
+
+msgid "_Lock on Road"
+msgstr ""
+
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr ""
+
+msgid "Show/hide route description"
+msgstr ""
+
+msgid "_Autozoom"
+msgstr ""
+
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
+msgid "N"
+msgstr ""
+
+msgid "NE"
+msgstr ""
+
+msgid "E"
+msgstr ""
+
+msgid "SE"
+msgstr ""
+
+msgid "S"
+msgstr ""
+
+msgid "SW"
+msgstr ""
+
+msgid "W"
+msgstr ""
+
+msgid "NW"
+msgstr ""
+
+#. Android resource: @strings/no
+msgid "No"
+msgstr ""
+
+msgid "2D"
+msgstr ""
+
+msgid "3D"
+msgstr ""
+
+msgid "OT"
+msgstr ""
+
+#, c-format
+msgid "Route %4.0fkm %02d:%02d ETA"
+msgstr ""
+
+msgid "Route 0000km 0+00:00 ETA"
+msgstr ""
+
+msgid "Help"
+msgstr ""
+
+#, c-format
+msgid "Waypoint %s"
+msgstr ""
+
+msgid "Select waypoint to insert the new one before"
+msgstr ""
+
+msgid "View in Browser"
+msgstr ""
+
+msgid "Item type"
+msgstr ""
+
+#. Android resource: @strings/address_search_streets
+msgid "Streets"
+msgstr ""
+
+msgid "House numbers"
+msgstr ""
+
+msgid "View Attributes"
+msgstr ""
+
+msgid "Set as position (and deactivate vehicle)"
+msgstr ""
+
+msgid "POIs"
+msgstr ""
+
+msgid "View on map"
+msgstr ""
+
+msgid "Remove search results from the map"
+msgstr ""
+
+msgid "Show results on the map"
+msgstr ""
+
+msgid "Foursquare"
+msgstr ""
+
+msgid "Cut Bookmark"
+msgstr ""
+
+msgid "Copy Bookmark"
+msgstr ""
+
+msgid "Rename Bookmark"
+msgstr ""
+
+msgid "Paste Bookmark"
+msgstr ""
+
+msgid "Delete Bookmark"
+msgstr ""
+
+msgid "Delete waypoint"
+msgstr ""
+
+msgid "Bookmarks"
+msgstr ""
+
+msgid "Bookmarks as waypoints"
+msgstr ""
+
+msgid "Save waypoints"
+msgstr ""
+
+msgid "Replace with waypoints"
+msgstr ""
+
+msgid "Delete Folder"
+msgstr ""
+
+#. Adds the Bookmark folders
+msgid "Add Bookmark folder"
+msgstr ""
+
+#. Pastes the Bookmark
+msgid "Paste bookmark"
+msgstr ""
+
+#, c-format
+msgid "Bookmark %s"
+msgstr ""
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
+msgid "Show Satellite Status"
+msgstr ""
+
+msgid " Elevation "
+msgstr ""
+
+msgid " Azimuth "
+msgstr ""
+
+msgid "Show NMEA Data"
+msgstr ""
+
+msgid "car"
+msgstr ""
+
+msgid "bike"
+msgstr ""
+
+msgid "pedestrian"
+msgstr ""
+
+#, c-format
+msgid "Current profile: %s"
+msgstr ""
+
+#, c-format
+msgid "Change profile to: %s"
+msgstr ""
+
+msgid "Set as active"
+msgstr ""
+
+msgid "Show Satellite status"
+msgstr ""
+
+msgid "Show NMEA data"
+msgstr ""
+
+msgid "Add Bookmark"
+msgstr ""
+
+msgid "Rename"
+msgstr ""
+
+msgid "About Navit"
+msgstr ""
+
+#. Authors
+msgid "By"
+msgstr ""
+
+#. Contributors
+msgid "And all the Navit Team"
+msgstr ""
+
+msgid "members and contributors."
+msgstr ""
+
+msgid "Waypoints"
+msgstr ""
+
+msgid "Enter Coordinates"
+msgstr ""
+
+#.
+#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
+#. gui_internal_widget_append(wb, w)
+#.
+#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
+#. gui_internal_widget_append(w, we)
+msgid "Latitude Longitude"
+msgstr ""
+
+msgid "Enter coordinates, for example:"
+msgstr ""
+
+msgid "Vehicle"
+msgstr ""
+
+msgid "Rules"
+msgstr ""
+
+msgid "Lock on road"
+msgstr ""
+
+msgid "Northing"
+msgstr ""
+
+msgid "Map follows Vehicle"
+msgstr ""
+
+msgid "Plan with Waypoints"
+msgstr ""
+
+msgid "Maps"
+msgstr ""
+
+msgid "Layout"
+msgstr ""
+
+msgid "Height Profile"
+msgstr ""
+
+msgid "Route Description"
+msgstr ""
+
+msgid "Show Locale"
+msgstr ""
+
+msgid "Former Destinations"
+msgstr ""
+
+msgid "- No former destinations available -"
+msgstr ""
+
+msgid "Message"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Back to map"
+msgstr ""
+
+msgid "Main Menu"
+msgstr ""
+
+msgid "House number"
+msgstr ""
+
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "partial match"
+msgstr ""
+
+#. Android resource: @strings/address_search_button
+msgid "Search"
+msgstr ""
+
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
+msgstr ""
+
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
+msgid "Map data (c) OpenStreetMap contributors, ODBL"
+msgstr ""
+
+msgid "Downloaded maps"
+msgstr ""
+
+msgid "Cancel"
+msgstr ""
+
+msgid "Whole Planet"
+msgstr ""
+
+msgid "Africa"
+msgstr ""
+
+msgid "Canary Islands"
+msgstr ""
+
+msgid "Asia"
+msgstr ""
+
+msgid "Korea"
+msgstr ""
+
+msgid "Taiwan"
+msgstr ""
+
+msgid "UAE+Other"
+msgstr ""
+
+msgid "Oceania"
+msgstr ""
+
+msgid "Tasmania"
+msgstr ""
+
+msgid "Victoria"
+msgstr ""
+
+msgid "New South Wales"
+msgstr ""
+
+msgid "Europe"
+msgstr ""
+
+msgid "Western Europe"
+msgstr ""
+
+msgid "Azores"
+msgstr ""
+
+msgid "BeNeLux"
+msgstr ""
+
+msgid "Alsace"
+msgstr ""
+
+msgid "Aquitaine"
+msgstr ""
+
+msgid "Auvergne"
+msgstr ""
+
+msgid "Basse-Normandie"
+msgstr ""
+
+msgid "Bourgogne"
+msgstr ""
+
+msgid "Bretagne"
+msgstr ""
+
+msgid "Centre"
+msgstr ""
+
+msgid "Champagne-Ardenne"
+msgstr ""
+
+msgid "Corse"
+msgstr ""
+
+msgid "Franche-Comte"
+msgstr ""
+
+msgid "Haute-Normandie"
+msgstr ""
+
+msgid "Ile-de-France"
+msgstr ""
+
+msgid "Languedoc-Roussillon"
+msgstr ""
+
+msgid "Limousin"
+msgstr ""
+
+msgid "Lorraine"
+msgstr ""
+
+msgid "Midi-Pyrenees"
+msgstr ""
+
+msgid "Nord-pas-de-Calais"
+msgstr ""
+
+msgid "Pays-de-la-Loire"
+msgstr ""
+
+msgid "Picardie"
+msgstr ""
+
+msgid "Poitou-Charentes"
+msgstr ""
+
+msgid "Provence-Alpes-Cote-d-Azur"
+msgstr ""
+
+msgid "Rhone-Alpes"
+msgstr ""
+
+msgid "Baden-Wuerttemberg"
+msgstr ""
+
+msgid "Bayern"
+msgstr ""
+
+msgid "Mittelfranken"
+msgstr ""
+
+msgid "Niederbayern"
+msgstr ""
+
+msgid "Oberbayern"
+msgstr ""
+
+msgid "Oberfranken"
+msgstr ""
+
+msgid "Oberpfalz"
+msgstr ""
+
+msgid "Schwaben"
+msgstr ""
+
+msgid "Unterfranken"
+msgstr ""
+
+msgid "Berlin"
+msgstr ""
+
+msgid "Brandenburg"
+msgstr ""
+
+msgid "Bremen"
+msgstr ""
+
+msgid "Hamburg"
+msgstr ""
+
+msgid "Hessen"
+msgstr ""
+
+msgid "Mecklenburg-Vorpommern"
+msgstr ""
+
+msgid "Niedersachsen"
+msgstr ""
+
+msgid "Nordrhein-westfalen"
+msgstr ""
+
+msgid "Rheinland-Pfalz"
+msgstr ""
+
+msgid "Saarland"
+msgstr ""
+
+msgid "Sachsen-Anhalt"
+msgstr ""
+
+msgid "Sachsen"
+msgstr ""
+
+msgid "Schleswig-Holstein"
+msgstr ""
+
+msgid "Thueringen"
+msgstr ""
+
+msgid "Mallorca"
+msgstr ""
+
+msgid "Galicia"
+msgstr ""
+
+msgid "Scandinavia"
+msgstr ""
+
+msgid "England"
+msgstr ""
+
+msgid "Buckinghamshire"
+msgstr ""
+
+msgid "Cambridgeshire"
+msgstr ""
+
+msgid "Cumbria"
+msgstr ""
+
+msgid "East yorkshire with hull"
+msgstr ""
+
+msgid "Essex"
+msgstr ""
+
+msgid "Herefordshire"
+msgstr ""
+
+msgid "Kent"
+msgstr ""
+
+msgid "Lancashire"
+msgstr ""
+
+msgid "Leicestershire"
+msgstr ""
+
+msgid "Norfolk"
+msgstr ""
+
+msgid "Nottinghamshire"
+msgstr ""
+
+msgid "Oxfordshire"
+msgstr ""
+
+msgid "Shropshire"
+msgstr ""
+
+msgid "Somerset"
+msgstr ""
+
+msgid "South yorkshire"
+msgstr ""
+
+msgid "Suffolk"
+msgstr ""
+
+msgid "Surrey"
+msgstr ""
+
+msgid "Wiltshire"
+msgstr ""
+
+msgid "Scotland"
+msgstr ""
+
+msgid "Wales"
+msgstr ""
+
+msgid "Crete"
+msgstr ""
+
+msgid "North America"
+msgstr ""
+
+msgid "Alaska"
+msgstr ""
+
+msgid "Hawaii"
+msgstr ""
+
+msgid "USA"
+msgstr ""
+
+msgid " (except Alaska and Hawaii)"
+msgstr ""
+
+msgid "Midwest"
+msgstr ""
+
+msgid "Michigan"
+msgstr ""
+
+msgid "Ohio"
+msgstr ""
+
+msgid "Northeast"
+msgstr ""
+
+msgid "Massachusetts"
+msgstr ""
+
+msgid "Vermont"
+msgstr ""
+
+msgid "Pacific"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "Arkansas"
+msgstr ""
+
+msgid "District of Columbia"
+msgstr ""
+
+msgid "Florida"
+msgstr ""
+
+msgid "Louisiana"
+msgstr ""
+
+msgid "Maryland"
+msgstr ""
+
+msgid "Mississippi"
+msgstr ""
+
+msgid "Oklahoma"
+msgstr ""
+
+msgid "Texas"
+msgstr ""
+
+msgid "Virginia"
+msgstr ""
+
+msgid "West Virginia"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "Arizona"
+msgstr ""
+
+msgid "California"
+msgstr ""
+
+msgid "Colorado"
+msgstr ""
+
+msgid "Idaho"
+msgstr ""
+
+msgid "Montana"
+msgstr ""
+
+msgid "New Mexico"
+msgstr ""
+
+msgid "Nevada"
+msgstr ""
+
+msgid "Oregon"
+msgstr ""
+
+msgid "Utah"
+msgstr ""
+
+msgid "Washington State"
+msgstr ""
+
+msgid "South+Middle America"
+msgstr ""
+
+msgid "Guyane Francaise"
+msgstr ""
+
+msgid "downloading"
+msgstr ""
+
+#. Android resource: @strings/map_download_ready
+msgid "ready"
+msgstr ""
+
+msgid "Error downloading map!"
+msgstr ""
+
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
+msgstr ""
+
+msgid "Error writing map!"
+msgstr ""
+
+msgid "Map download aborted!"
+msgstr ""
+
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
+msgstr ""
+
+#. Android resource: @strings/map_download_title
+msgid "Map download"
+msgstr ""
+
+msgid "Vehicle Position"
+msgstr ""
+
+msgid "Main menu"
+msgstr ""
+
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
+
+msgid "Tools"
+msgstr ""
+
+msgid "Route"
+msgstr ""
+
+msgid "About"
+msgstr ""
+
+msgid "Quit"
+msgstr ""
+
+msgid "Actions"
+msgstr ""
+
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
+msgid "Coordinates"
+msgstr ""
+
+msgid ""
+"Stop\n"
+"Navigation"
+msgstr ""
+
+msgid "Display"
+msgstr ""
+
+msgid "Fullscreen"
+msgstr ""
+
+msgid "Window Mode"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid ""
+"Drop last \n"
+"Waypoint"
+msgstr ""
+
+msgid ""
+"Drop next \n"
+"Waypoint"
+msgstr ""
+
+msgid "Satellite Status"
+msgstr ""
+
+msgid "NMEA Data"
+msgstr ""
+
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
+msgid "car_pedantic"
+msgstr ""
+
+msgid "horse"
+msgstr ""
+
+msgid "Truck"
+msgstr ""
+
+#. Strings from android/res/values/strings.xml
+#. Android resource: @strings/yes
+msgid "Yes"
+msgstr ""
+
+#. Android resource: @strings/notification_ticker
+msgid "Navit started"
+msgstr ""
+
+#. Android resource: @strings/notification_event_default
+msgid "Navit running"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_title
+msgid "Welcome to Navit"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_message
+msgid ""
+"Thank you for installing Navit!\n"
+"\n"
+"To start, select \"Download maps\" from the menu to download a map. Note: "
+"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
+"\n"
+"Mapdata: (c) OpenStreetMap contributors\n"
+"\n"
+"Enjoy Navit!"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_OK
+msgid "OK"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_more_info
+msgid "More info"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_zoom_in
+msgid "Zoom in"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_zoom_out
+msgid "Zoom out"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_download_maps
+msgid "Download maps"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_toggle_poi
+msgid "Toggle POIs"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_exit_navit
+msgid "Exit Navit"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_backup_restore
+msgid "Backup / Restore"
+msgstr ""
+
+#. Android resource: @strings/map_delete
+msgid "Delete this map?"
+msgstr ""
+
+#. Android resource: @strings/map_download_downloading
+msgid "Downloading:"
+msgstr ""
+
+#. Android resource: @strings/map_download_download_error
+msgid "Error downloading map."
+msgstr ""
+
+#. Android resource: @strings/map_download_download_aborted
+msgid "Map download aborted"
+msgstr ""
+
+#. Android resource: @strings/map_no_fix
+msgid "No location. Reopen after location fix."
+msgstr ""
+
+#. Android resource: @strings/maps_for_current_location
+msgid "Maps containing current location"
+msgstr ""
+
+#. Android resource: @strings/address_search_title
+msgid "Address search"
+msgstr ""
+
+#. Android resource: @strings/address_enter_destination
+msgid "Enter destination"
+msgstr ""
+
+#. Android resource: @strings/address_partial_match
+msgid "Match partial address"
+msgstr ""
+
+#. Android resource: @strings/address_search_searching
+msgid "Searching..."
+msgstr ""
+
+#. Android resource: @strings/address_search_not_found
+msgid "Address not found"
+msgstr ""
+
+#. Android resource: @strings/address_search_getting_results
+msgid "Getting search results"
+msgstr ""
+
+#. Android resource: @strings/address_search_loading_results
+msgid "Loading search results"
+msgstr ""
+
+#. Android resource: @strings/address_search_no_results
+msgid "No results found"
+msgstr ""
+
+#. Android resource: @strings/address_search_no_text_entered
+msgid "No text entered"
+msgstr ""
+
+#. Android resource: @strings/address_search_set_destination
+msgid "Setting destination to:"
+msgstr ""
+
+#. Android resource: @strings/choose_an_action
+msgid "Choose an action"
+msgstr ""
+
+#. Android resource: @strings/please_insert_an_sd_card
+msgid "Please insert an SD Card"
+msgstr ""
+
+#. Android resource: @strings/backing_up
+msgid "Backing up..."
+msgstr ""
+
+#. Android resource: @strings/restoring
+msgid "Restoring..."
+msgstr ""
+
+#. Android resource: @strings/failed_to_create_backup_directory
+msgid "Failed to create backup directory"
+msgstr ""
+
+#. Android resource: @strings/backup_failed
+msgid "Backup failed"
+msgstr ""
+
+#. Android resource: @strings/no_backup_found
+msgid "No backup found"
+msgstr ""
+
+#. Android resource: @strings/failed_to_restore
+msgid "Failed to restore"
+msgstr ""
+
+#. Android resource: @strings/backup_successful
+msgid "Backup successful"
+msgstr ""
+
+#. Android resource: @strings/restore_successful_please_restart_navit
+msgid ""
+"Restore Successful\n"
+"Please restart Navit"
+msgstr ""
+
+#. Android resource: @strings/backup_not_found
+msgid "Backup not found"
+msgstr ""
+
+#. Android resource: @strings/restore_failed
+msgid "Restore failed"
+msgstr ""
+
+#. Android resource: @strings/select_backup
+msgid "Select backup"
+msgstr ""
+
+#. Android resource: @strings/backup
+msgid "Backup"
+msgstr ""
+
+#. Android resource: @strings/restore
+msgid "Restore"
+msgstr ""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-06 20:01:44
|
Revision: 6046
http://sourceforge.net/p/navit/code/6046
Author: kazer_
Date: 2015-04-06 20:01:30 +0000 (Mon, 06 Apr 2015)
Log Message:
-----------
Update:Core:massive translation update from launchpad
Modified Paths:
--------------
trunk/navit/po/af.po.in
trunk/navit/po/ar.po.in
trunk/navit/po/ast.po.in
trunk/navit/po/be.po.in
trunk/navit/po/bg.po.in
trunk/navit/po/bs.po.in
trunk/navit/po/ca.po.in
trunk/navit/po/ckb.po.in
trunk/navit/po/cs.po.in
trunk/navit/po/cy.po.in
trunk/navit/po/da.po.in
trunk/navit/po/de.po.in
trunk/navit/po/de_CH.po.in
trunk/navit/po/el.po.in
trunk/navit/po/en_AU.po.in
trunk/navit/po/en_CA.po.in
trunk/navit/po/en_GB.po.in
trunk/navit/po/eo.po.in
trunk/navit/po/es.po.in
trunk/navit/po/et.po.in
trunk/navit/po/eu.po.in
trunk/navit/po/fa.po.in
trunk/navit/po/fi.po.in
trunk/navit/po/fil.po.in
trunk/navit/po/fo.po.in
trunk/navit/po/fr.po.in
trunk/navit/po/fr_CH.po.in
trunk/navit/po/fy.po.in
trunk/navit/po/gl.po.in
trunk/navit/po/he.po.in
trunk/navit/po/hi.po.in
trunk/navit/po/hr.po.in
trunk/navit/po/hu.po.in
trunk/navit/po/id.po.in
trunk/navit/po/it.po.in
trunk/navit/po/ja.po.in
trunk/navit/po/jv.po.in
trunk/navit/po/kk.po.in
trunk/navit/po/kn.po.in
trunk/navit/po/ku.po.in
trunk/navit/po/lb.po.in
trunk/navit/po/lt.po.in
trunk/navit/po/lv.po.in
trunk/navit/po/mk.po.in
trunk/navit/po/ml.po.in
trunk/navit/po/mn.po.in
trunk/navit/po/mr.po.in
trunk/navit/po/nb.po.in
trunk/navit/po/nds.po.in
trunk/navit/po/nl.po.in
trunk/navit/po/nn.po.in
trunk/navit/po/pl.po.in
trunk/navit/po/pms.po.in
trunk/navit/po/pt.po.in
trunk/navit/po/pt_BR.po.in
trunk/navit/po/ro.po.in
trunk/navit/po/ru.po.in
trunk/navit/po/sc.po.in
trunk/navit/po/si.po.in
trunk/navit/po/sk.po.in
trunk/navit/po/sl.po.in
trunk/navit/po/sr.po.in
trunk/navit/po/sv.po.in
trunk/navit/po/sw.po.in
trunk/navit/po/ta.po.in
trunk/navit/po/te.po.in
trunk/navit/po/th.po.in
trunk/navit/po/tr.po.in
trunk/navit/po/uk.po.in
trunk/navit/po/ur.po.in
trunk/navit/po/vi.po.in
trunk/navit/po/zh_CN.po.in
trunk/navit/po/zh_HK.po.in
Modified: trunk/navit/po/af.po.in
===================================================================
--- trunk/navit/po/af.po.in 2015-04-05 18:53:07 UTC (rev 6045)
+++ trunk/navit/po/af.po.in 2015-04-06 20:01:30 UTC (rev 6046)
@@ -138,8 +138,10 @@
msgstr[0] "na een kilometer"
msgstr[1] "na %d kilometer"
-msgid "exit"
-msgstr "afrit"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
msgid "into the ramp"
msgstr "na die afrit"
@@ -169,33 +171,18 @@
msgid "%sinto the %s"
msgstr "%sin die %s in"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "regs"
+msgid "When possible, please turn around"
+msgstr "Draai asseblief om wanneer moontlik"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "links"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "maklik "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Volg die pad vir die volgende %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "skerp "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "regtig sterk "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "onbekend "
-
-msgid "When possible, please turn around"
-msgstr "Draai asseblief om wanneer moontlik"
-
msgid "Enter the roundabout soon"
msgstr "Gaan kortliks in die sirkel in"
@@ -204,57 +191,134 @@
msgid "Enter the roundabout %s"
msgstr ""
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
#, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "verlaat dan die sirkel by die %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Verlaat die sirkel by die %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
-#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Volg die pad vir die volgende %s"
-
msgid "soon"
msgstr "kortliks"
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "nou"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
+#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Neem die %1$s pad na %2$s"
+msgid "right"
+msgstr "regs"
+
#, c-format
msgid "after %i roads"
msgstr "na %i paaie"
-msgid "now"
-msgstr "nou"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "neem dan die %1$s pad na %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
-msgid "error"
-msgstr "fout"
+msgid "easily "
+msgstr "maklik "
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "skerp "
+
+msgid "left"
+msgstr "links"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Draai %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "draai dan %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+msgid "then you have reached your destination."
+msgstr "dan het jy jou bestemming bereik."
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Jy het jou bestemming bereik %s"
-msgid "then you have reached your destination."
-msgstr "dan het jy jou bestemming bereik."
+msgid "exit"
+msgstr "afrit"
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Posisie"
@@ -1313,11 +1377,13 @@
msgid ""
"navit usage:\n"
"navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
"\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
msgstr ""
#. We have not found an existing config file from all possibilities
@@ -1681,6 +1747,9 @@
msgid "Show results on the map"
msgstr ""
+msgid "Foursquare"
+msgstr ""
+
msgid "Cut Bookmark"
msgstr "Sny Boekmerk"
Modified: trunk/navit/po/ar.po.in
===================================================================
--- trunk/navit/po/ar.po.in 2015-04-05 18:53:07 UTC (rev 6045)
+++ trunk/navit/po/ar.po.in 2015-04-06 20:01:30 UTC (rev 6046)
@@ -153,8 +153,10 @@
msgstr[4] "بعد %d كلم"
msgstr[5] "بعد %d كلم"
-msgid "exit"
-msgstr "خروج"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
msgid "into the ramp"
msgstr "إلى داخل الطريق المنحدر"
@@ -184,33 +186,18 @@
msgid "%sinto the %s"
msgstr "%s إلى داخل %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "إلى اليمين"
+msgid "When possible, please turn around"
+msgstr "حيث ممكن الرجاء اللف"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "إلى اليسار"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "بسهولة "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "تابع الطريق لل- %s التالية"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "بكل شدة "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "بشدة حادة "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "غير معروف "
-
-msgid "When possible, please turn around"
-msgstr "حيث ممكن الرجاء اللف"
-
msgid "Enter the roundabout soon"
msgstr "قريباً الدخول إلى المستديرة"
@@ -219,57 +206,134 @@
msgid "Enter the roundabout %s"
msgstr "أدخل المسافة %s إلى المستديرة"
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
#, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "ثم أخرج من المستديرة عند الــ%s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "أخرج من المستديرة عند الــ %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
-#, c-format
-msgid "Follow the road for the next %s"
-msgstr "تابع الطريق لل- %s التالية"
-
msgid "soon"
msgstr "قريبا"
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "الآن"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
+#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "خذ الطريق %1$s إلى ال%2$s"
+msgid "right"
+msgstr "إلى اليمين"
+
#, c-format
msgid "after %i roads"
msgstr "بعد %i طرقات"
-msgid "now"
-msgstr "الآن"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "ثم خذ الطريق %1$s إلى ال- %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
-msgid "error"
-msgstr "خطء"
+msgid "easily "
+msgstr "بسهولة "
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "بكل شدة "
+
+msgid "left"
+msgstr "إلى اليسار"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "حوّل %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "ثم حوّل %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+msgid "then you have reached your destination."
+msgstr "و بعدها تكون قد وصلت إلى هدفك"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "لقد وصلت إلى هدفك %s"
-msgid "then you have reached your destination."
-msgstr "و بعدها تكون قد وصلت إلى هدفك"
+msgid "exit"
+msgstr "خروج"
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "الموقع"
@@ -1328,11 +1392,13 @@
msgid ""
"navit usage:\n"
"navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
"\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
msgstr ""
#. We have not found an existing config file from all possibilities
@@ -1696,6 +1762,9 @@
msgid "Show results on the map"
msgstr "أعرض النتائج على الخريطة"
+msgid "Foursquare"
+msgstr ""
+
msgid "Cut Bookmark"
msgstr "قص العلامة"
Modified: trunk/navit/po/ast.po.in
===================================================================
--- trunk/navit/po/ast.po.in 2015-04-05 18:53:07 UTC (rev 6045)
+++ trunk/navit/po/ast.po.in 2015-04-06 20:01:30 UTC (rev 6046)
@@ -133,8 +133,10 @@
msgstr[0] "nun quilómetru"
msgstr[1] "en %d quilómetros"
-msgid "exit"
-msgstr "salida"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
msgid "into the ramp"
msgstr "pal enllaz"
@@ -164,33 +166,18 @@
msgid "%sinto the %s"
msgstr "%s pa la %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "drecha"
+msgid "When possible, please turn around"
+msgstr "Cuando seya posible, de la vuelta"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "izquierda"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "selemente "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Siga pela carretera los siguientes %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "enforma "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "dafechu "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "desconocío "
-
-msgid "When possible, please turn around"
-msgstr "Cuando seya posible, de la vuelta"
-
msgid "Enter the roundabout soon"
msgstr "Entre ceo na rotonda"
@@ -199,57 +186,134 @@
msgid "Enter the roundabout %s"
msgstr ""
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
#, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "llueu dexe la rotonda pola %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Dexe la rotonda pola %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
-#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Siga pela carretera los siguientes %s"
-
msgid "soon"
msgstr "aína"
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "agora"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
+#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Tome la carretera %1$s dica %2$s"
+msgid "right"
+msgstr "drecha"
+
#, c-format
msgid "after %i roads"
msgstr "tres %i carreteres"
-msgid "now"
-msgstr "agora"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "llueu tome la carretera %1$s dica %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
-msgid "error"
-msgstr "error"
+msgid "easily "
+msgstr "selemente "
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "enforma "
+
+msgid "left"
+msgstr "izquierda"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Xire %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "llueu xire %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+msgid "then you have reached your destination."
+msgstr "entós llegará al destín."
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Llegó al destín %s"
-msgid "then you have reached your destination."
-msgstr "entós llegará al destín."
+msgid "exit"
+msgstr "salida"
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Posición"
@@ -1308,11 +1372,13 @@
msgid ""
"navit usage:\n"
"navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
"\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
msgstr ""
#. We have not found an existing config file from all possibilities
@@ -1676,6 +1742,9 @@
msgid "Show results on the map"
msgstr ""
+msgid "Foursquare"
+msgstr ""
+
msgid "Cut Bookmark"
msgstr "Cortar marcador"
Modified: trunk/navit/po/be.po.in
===================================================================
--- trunk/navit/po/be.po.in 2015-04-05 18:53:07 UTC (rev 6045)
+++ trunk/navit/po/be.po.in 2015-04-06 20:01:30 UTC (rev 6046)
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the navit package.
# Many thanks to the contributors of this translation:
# Anatoli Putseyeu https://launchpad.net/~st-shadow-by
+# KaZeR https://launchpad.net/~kazer
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2011-10-11 19:19+0000\n"
-"Last-Translator: Anatoli Putseyeu <Unknown>\n"
+"PO-Revision-Date: 2014-11-15 22:06+0000\n"
+"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Belarusian <be...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -134,8 +135,10 @@
msgstr[0] ""
msgstr[1] ""
-msgid "exit"
-msgstr "выхад"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
msgid "into the ramp"
msgstr ""
@@ -165,92 +168,154 @@
msgid "%sinto the %s"
msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "направа"
+msgid "When possible, please turn around"
+msgstr "Развярніцеся, калі будзе магчымасць"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "налева"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "мацней "
+msgid "Enter the roundabout soon"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
+#, c-format
+msgid "then leave the roundabout at the %1$s %2$s"
msgstr ""
-msgid "When possible, please turn around"
-msgstr "Развярніцеся, калі будзе магчымасць"
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
+#, c-format
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
-msgid "Enter the roundabout soon"
+msgid "soon"
+msgstr "скора"
+
+msgid "now"
+msgstr "зараз"
+
+msgid "then"
msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
#, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
msgstr ""
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
#, c-format
-msgid "then leave the roundabout at the %s"
+msgid "%1$s merge right %2$s"
msgstr ""
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "%1$s left exit %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
#, c-format
-msgid "Follow the road for the next %s"
+msgid "%1$s right exit %2$s %3$s"
msgstr ""
-msgid "soon"
-msgstr "скора"
+msgid " at the exit "
+msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
+#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr ""
+msgid "right"
+msgstr "направа"
+
#, c-format
msgid "after %i roads"
msgstr ""
-msgid "now"
-msgstr "зараз"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
msgstr ""
-msgid "error"
-msgstr "памылка"
+msgid "easily "
+msgstr ""
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "мацней "
+
+msgid "left"
+msgstr "налева"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
msgstr ""
+msgid "then you have reached your destination."
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr ""
-msgid "then you have reached your destination."
+msgid "exit"
+msgstr "выхад"
+
+msgid "interchange"
msgstr ""
+#, c-format
+msgid "%s %s"
+msgstr ""
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Размяшчэнне"
@@ -1309,11 +1374,13 @@
msgid ""
"navit usage:\n"
"navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
"\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
msgstr ""
#. We have not found an existing config file from all possibilities
@@ -1677,6 +1744,9 @@
msgid "Show results on the map"
msgstr ""
+msgid "Foursquare"
+msgstr ""
+
msgid "Cut Bookmark"
msgstr ""
Modified: trunk/navit/po/bg.po.in
===================================================================
--- trunk/navit/po/bg.po.in 2015-04-05 18:53:07 UTC (rev 6045)
+++ trunk/navit/po/bg.po.in 2015-04-06 20:01:30 UTC (rev 6046)
@@ -137,8 +137,10 @@
msgstr[0] "след един километър"
msgstr[1] "след %d километра"
-msgid "exit"
-msgstr "изход"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
msgid "into the ramp"
msgstr "на рампата"
@@ -168,33 +170,18 @@
msgid "%sinto the %s"
msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "надясно"
+msgid "When possible, please turn around"
+msgstr "Когато е възможно обърнете"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "наляво"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "леко "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Следвайте пътя през следващите %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "силно "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "наистина силно "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "непознат "
-
-msgid "When possible, please turn around"
-msgstr "Когато е възможно обърнете"
-
msgid "Enter the roundabout soon"
msgstr "Скоро навлизате в кръгово"
@@ -203,57 +190,134 @@
msgid "Enter the roundabout %s"
msgstr ""
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
#, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "след това излезте от кръговото на %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Излезте от кръговото на %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
-#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Следвайте пътя през следващите %s"
-
msgid "soon"
msgstr "скоро"
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "сега"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
+#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Тръгнете по %1$s път към %2$s"
+msgid "right"
+msgstr "надясно"
+
#, c-format
msgid "after %i roads"
msgstr "след %i пресечки"
-msgid "now"
-msgstr "сега"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "тогава хванете пътя %1$s към %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
-msgid "error"
-msgstr "грешка"
+msgid "easily "
+msgstr "леко "
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "силно "
+
+msgid "left"
+msgstr "наляво"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Завийте %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "тогава завийте %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+msgid "then you have reached your destination."
+msgstr "след това пристигате на местоназначението"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Достигнахте до целта %s"
-msgid "then you have reached your destination."
-msgstr "след това пристигате на местоназначението"
+msgid "exit"
+msgstr "изход"
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Позиция"
@@ -1312,11 +1376,13 @@
msgid ""
"navit usage:\n"
"navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
"\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
msgstr ""
#. We have not found an existing config file from all possibilities
@@ -1680,6 +1746,9 @@
msgid "Show results on the map"
msgstr ""
+msgid "Foursquare"
+msgstr ""
+
msgid "Cut Bookmark"
msgstr ""
Modified: trunk/navit/po/bs.po.in
===================================================================
--- trunk/navit/po/bs.po.in 2015-04-05 18:53:07 UTC (rev 6045)
+++ trunk/navit/po/bs.po.in 2015-04-06 20:01:30 UTC (rev 6046)
@@ -136,8 +136,10 @@
msgstr[1] "u %d kilometara"
msgstr[2] "u %d kilometara"
-msgid "exit"
-msgstr "izlaz"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
msgid "into the ramp"
msgstr "u rampu"
@@ -167,92 +169,154 @@
msgid "%sinto the %s"
msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
+msgid "When possible, please turn around"
msgstr ""
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
+#, c-format
+msgid "then leave the roundabout at the %1$s %2$s"
msgstr ""
-msgid "When possible, please turn around"
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
+#, c-format
+msgid "Leave the roundabout at the %1$s %2$s"
msgstr ""
-msgid "Enter the roundabout soon"
+msgid "soon"
msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "now"
+msgstr ""
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
#, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
msgstr ""
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
#, c-format
-msgid "then leave the roundabout at the %s"
+msgid "%1$s merge right %2$s"
msgstr ""
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "%1$s left exit %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
#, c-format
-msgid "Follow the road for the next %s"
+msgid "%1$s right exit %2$s %3$s"
msgstr ""
-msgid "soon"
+msgid " at the exit "
msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
+#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr ""
+msgid "right"
+msgstr ""
+
#, c-format
msgid "after %i roads"
msgstr ""
-msgid "now"
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
+#, c-format
+msgid "Turn %1$s%2$s %3$s %4$s"
msgstr ""
-#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "easily "
msgstr ""
-msgid "error"
+msgid "strongly "
msgstr ""
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "left"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
msgstr ""
+msgid "then you have reached your destination."
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr ""
-msgid "then you have reached your destination."
+msgid "exit"
+msgstr "izlaz"
+
+msgid "interchange"
msgstr ""
+#, c-format
+msgid "%s %s"
+msgstr ""
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr ""
@@ -1311,11 +1375,13 @@
msgid ""
"navit usage:\n"
"navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
"\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
msgstr ""
#. We have not found an existing config file from all possibilities
@@ -1679,6 +1745,9 @@
msgid "Show results on the map"
msgstr ""
+msgid "Foursquare"
+msgstr ""
+
msgid "Cut Bookmark"
msgstr ""
Modified: trunk/navit/po/ca.po.in
===================================================================
--- trunk/navit/po/ca.po.in 2015-04-05 18:53:07 UTC (rev 6045)
+++ trunk/navit/po/ca.po.in 2015-04-06 20:01:30 UTC (rev 6046)
@@ -143,8 +143,10 @@
msgstr[0] "d'aquí a un quilòmetre"
msgstr[1] "d'aquí a %d quilòmetres"
-msgid "exit"
-msgstr "surt"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
msgid "into the ramp"
msgstr "a la sortida"
@@ -174,33 +176,18 @@
msgid "%sinto the %s"
msgstr "%s cap a la %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "dreta"
+msgid "When possible, please turn around"
+msgstr "Quan sigui possible, doneu mitja volta"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "esquerra"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "fàcilment "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Seguiu per la carretera durant els propers %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "fortament "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "realment fort "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "desconegut "
-
-msgid "When possible, please turn around"
-msgstr "Quan sigui possible, doneu mitja volta"
-
msgid "Enter the roundabout soon"
msgstr "Entreu a la rotonda vinent"
@@ -209,57 +196,134 @@
msgid "Enter the roundabout %s"
msgstr ""
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
#, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "aleshores deixeu la rotonda a la %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Deixeu la rotonda a la %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
-#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Seguiu per la carretera durant els propers %s"
-
msgid "soon"
msgstr "aviat"
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "ara"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
+#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Preneu el %1$s carrer a la %2$s"
+msgid "right"
+msgstr "dreta"
+
#, c-format
msgid "after %i roads"
msgstr "després de %i carrers"
-msgid "now"
-msgstr "ara"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "després, agafeu la %1$s carretera a la %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
-msgid "error"
-msgstr "error"
+msgid "easily "
+msgstr "fàcilment "
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "fortament "
+
+msgid "left"
+msgstr "esquerra"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Gireu %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "després, gireu %1$s%2$s%3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+msgid "then you have reached your destination."
+msgstr "aleshores heu arribat a destí"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Heu arribat a la destinació %s"
-msgid "then you have reached your destination."
-msgstr "aleshores heu arribat a destí"
+msgid "exit"
+msgstr "surt"
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Posició"
@@ -1318,11 +1382,13 @@
msgid ""
"navit usage:\n"
"navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
"\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
msgstr ""
#. We have not found an existing config file from all possibilities
@@ -1686,6 +1752,9 @@
msgid "Show results on the map"
msgstr ""
+msgid "Foursquare"
+msgstr ""
+
msgid "Cut Bookmark"
msgstr "Retalla el punt"
Modified: trunk/navit/po/ckb.po.in
===================================================================
--- trunk/navit/po/ckb.po.in 2015-04-05 18:53:07 UTC (rev 6045)
+++ trunk/navit/po/ckb.po.in 2015-04-06 20:01:30 UTC (rev 6046)
@@ -132,7 +132,9 @@
msgstr[0] ""
msgstr[1] ""
-msgid "exit"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
msgstr ""
msgid "into the ramp"
@@ -163,92 +165,154 @@
msgid "%sinto the %s"
msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
+msgid "When possible, please turn around"
msgstr ""
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
+#, c-format
+msgid "then leave the roundabout at the %1$s %2$s"
msgstr ""
-msgid "When possible, please turn around"
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
+#, c-format
+msgid "Leave the roundabout at the %1$s %2$s"
msgstr ""
-msgid "Enter the roundabout soon"
+msgid "soon"
msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "now"
+msgstr ""
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
#, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
msgstr ""
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
#, c-format
-msgid "then leave the roundabout at the %s"
+msgid "%1$s merge right %2$s"
msgstr ""
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "%1$s left exit %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
#, c-format
-msgid "Follow the road for the next %s"
+msgid "%1$s right exit %2$s %3$s"
msgstr ""
-msgid "soon"
+msgid " at the exit "
msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
+#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr ""
+msgid "right"
+msgstr ""
+
#, c-format
msgid "after %i roads"
msgstr ""
-msgid "now"
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
+#, c-format
+msgid "Turn %1$s%2$s %3$s %4$s"
msgstr ""
-#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "easily "
msgstr ""
-msgid "error"
+msgid "strongly "
msgstr ""
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "left"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
msgstr ""
+msgid "then you have reached your destination."
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr ""
-msgid "then you have reached your destination."
+msgid "exit"
msgstr ""
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr ""
@@ -1307,11 +1371,13 @@
msgid ""
"navit usage:\n"
"navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
"\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
msgstr ""
#. We have not found an existing config file from all possibilities
@@ -1675,6 +1741,9 @@
msgid "Show results on the map"
msgstr ""
+msgid "Foursquare"
+msgstr ""
+
msgid "Cut Bookmark"
msgstr ""
Modified: trunk/navit/po/cs.po.in
===================================================================
--- trunk/navit/po/cs.po.in 2015-04-05 18:53:07 UTC (rev 6045)
+++ trunk/navit/po/cs.po.in 2015-04-06 20:01:30 UTC (rev 6046)
@@ -5,6 +5,7 @@
# 72ka https://launchpad.net/~2hp
# Aleš Janda https://launchpad.net/~kyblicek
# Ivan Kološ https://launchpad.net/~ivan-kolos
+# Jakuje https://launchpad.net/~jakuje
# MMlosh https://launchpad.net/~mmlosh
# Mike Crash https://launchpad.net/~mike-mikecrash
# T.lama https://launchpad.net/~klacl
@@ -148,8 +149,10 @@
msgstr[1] "za %d kilometry"
msgstr[2] "za %d kilometrů"
-msgid "exit"
-msgstr "ukončit"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
msgid "into the ramp"
msgstr "na přivadeč"
@@ -179,33 +182,18 @@
msgid "%sinto the %s"
msgstr "%sna %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "vpravo"
+msgid "When possible, please turn around"
+msgstr "Až to bude možné, otočte se"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "vlevo"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "mírně "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Pokračujte po cestě dalších %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "silně "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "opravdu silně "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "neurčitě "
-
-msgid "When possible, please turn around"
-msgstr "Až to bude možné, otočte se"
-
msgid "Enter the roundabout soon"
msgstr "Brzy najeďte na kruhový objezd"
@@ -214,57 +202,134 @@
msgid "Enter the roundabout %s"
msgstr "Najeďte na kruhový objezd %s"
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
#, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "pak sjeďte na %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Sjeďte na %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
-#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Pokračujte po cestě dalších %s"
-
msgid "soon"
msgstr "brzy"
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "nyní"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
+#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Jeďte na %1$s silnici %2$s"
+msgid "right"
+msgstr "vpravo"
+
#, c-format
msgid "after %i roads"
msgstr "za %i silnice"
-msgid "now"
-msgstr "nyní"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "pak jeďte %1$s silnici %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
-msgid "error"
-msgstr "chyba"
+msgid "easily "
+msgstr "mírně "
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "silně "
+
+msgid "left"
+msgstr "vlevo"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Zabočte %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "pak odbočte %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+msgid "then you have reached your destination."
+msgstr "pak budete v cíli."
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "%s dorazíte do cíle"
-msgid "then you have reached your destination."
-msgstr "pak budete v cíli."
+msgid "exit"
+msgstr "ukončit"
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Poloha"
@@ -1323,19 +1388,14 @@
msgid ""
"navit usage:\n"
"navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
"\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
msgstr ""
-"Použití navit:\n"
-"navit [volby] [konfigurační soubor]\n"
-"\t-c <soubor>: Použijte <soubor> jako konfigurační soubor\n"
-"\t-d <n>: Nastavení souhrnné výstupní ladící úrovně v <n> (0-3). Přepíše "
-"nastavení z konfiguračního souboru.\n"
-"\t-h: Zobrazí tuto nápovědu a skončí.\n"
-"\t-v: Zobrazí verzy a skončí.\n"
#. We have not found an existing config file from all possibilities
msgid "No config file navit.xml, navit.xml.local found\n"
@@ -1700,6 +1760,9 @@
msgid "Show results on the map"
msgstr "Zobrazit výsledky na mapě"
+msgid "Foursquare"
+msgstr ""
+
msgid "Cut Bookmark"
msgstr "Vyjmout záložku"
Modified: trunk/navit/po/cy.po.in
===================================================================
--- trunk/navit/po/cy.po.in 2015-04-05 18:53:07 UTC (rev 6045)
+++ trunk/navit/po/cy.po.in 2015-04-06 20:01:30 UTC (rev 6046)
@@ -2,14 +2,15 @@
# Copyright (C) 2006-2014 The Navit Team
# This file is distributed under the same license as the navit package.
# Many thanks to the contributors of this translation:
+# Padi Phillips https://launchpad.net/~padi
# Simon Hewison https://launchpad.net/~simon-hewison-6
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-08-08 23:15+0000\n"
-"Last-Translator: Simon Hewison <sim...@zy...>\n"
+"PO-Revision-Date: 2015-01-18 20:41+0000\n"
+"Last-Translator: Padi Phillips <Unknown>\n"
"Language-Team: Welsh <cy...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -135,8 +136,10 @@
msgstr[0] ""
msgstr[1] ""
-msgid "exit"
-msgstr "allanfa"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %...
[truncated message content] |
|
From: <md...@us...> - 2015-04-05 18:53:10
|
Revision: 6045
http://sourceforge.net/p/navit/code/6045
Author: mdankov
Date: 2015-04-05 18:53:07 +0000 (Sun, 05 Apr 2015)
Log Message:
-----------
Add:port_android:On download completion, move screen position to the center of downloaded area.
Modified Paths:
--------------
trunk/navit/navit/android/src/org/navitproject/navit/NavitDialogs.java
trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitDialogs.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitDialogs.java 2015-04-05 18:51:15 UTC (rev 6044)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitDialogs.java 2015-04-05 18:53:07 UTC (rev 6045)
@@ -68,11 +68,21 @@
mActivity.dismissDialog(DIALOG_MAPDOWNLOAD);
mActivity.removeDialog(DIALOG_MAPDOWNLOAD);
if (msg.getData().getInt("value1") == 1) {
- Message activate_map_msg =
+ Message msg_out =
Message.obtain(Navit.N_NavitGraphics.callback_handler,
NavitGraphics.msg_type.CLB_LOAD_MAP.ordinal());
- activate_map_msg.setData(msg.getData());
- activate_map_msg.sendToTarget();
+ msg_out.setData(msg.getData());
+ msg_out.sendToTarget();
+
+ msg_out = Message.obtain(Navit.N_NavitGraphics.callback_handler,
+ NavitGraphics.msg_type.CLB_CALL_CMD.ordinal());
+ Bundle b = new Bundle();
+ int mi=msg.getData().getInt("value2");
+ double lon=(Double.parseDouble(NavitMapDownloader.osm_maps[mi].lon1)+Double.parseDouble(NavitMapDownloader.osm_maps[mi].lon2))/2.0;
+ double lat=(Double.parseDouble(NavitMapDownloader.osm_maps[mi].lat1)+Double.parseDouble(NavitMapDownloader.osm_maps[mi].lat2))/2.0;
+ b.putString("cmd", "set_center(\""+ lon +" "+ lat + "\",1); zoom=256");
+ msg_out.setData(b);
+ msg_out.sendToTarget();
}
break;
}
Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java 2015-04-05 18:51:15 UTC (rev 6044)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java 2015-04-05 18:53:07 UTC (rev 6045)
@@ -321,6 +321,7 @@
}
private Boolean stop_me = false;
private osm_map_values map_values;
+ private int map_id;
private long uiLastUpdated = -1;
private Boolean retryDownload = false; //Download failed, but
@@ -338,6 +339,7 @@
public NavitMapDownloader(int map_id) {
this.map_values = osm_maps[map_id];
+ this.map_id=map_id;
}
public void run() {
@@ -366,7 +368,7 @@
if (success || stop_me ) {
NavitDialogs.sendDialogMessage( NavitDialogs.MSG_MAP_DOWNLOAD_FINISHED
- , MAP_FILENAME_PATH + map_values.map_name + ".bin", null, -1, success ? 1 : 0 , 0 );
+ , MAP_FILENAME_PATH + map_values.map_name + ".bin", null, -1, success ? 1 : 0 , map_id );
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2015-04-05 18:51:23
|
Revision: 6044
http://sourceforge.net/p/navit/code/6044
Author: mdankov
Date: 2015-04-05 18:51:15 +0000 (Sun, 05 Apr 2015)
Log Message:
-----------
Add:core:Support optional argument to set_center() command, which enables delay before map returns to gps position.
Modified Paths:
--------------
trunk/navit/navit/navit.c
Modified: trunk/navit/navit/navit.c
===================================================================
--- trunk/navit/navit/navit.c 2015-04-05 10:21:22 UTC (rev 6043)
+++ trunk/navit/navit/navit.c 2015-04-05 18:51:15 UTC (rev 6044)
@@ -1215,10 +1215,13 @@
navit_cmd_set_center(struct navit *this, char *function, struct attr **in, struct attr ***out, int *valid)
{
struct pcoord pc;
+ int set_timeout=0;
in=navit_get_coord(this, in, &pc);
if (!in)
return;
- navit_set_center(this, &pc, 0);
+ if(in[0] && ATTR_IS_INT(in[0]->type))
+ set_timeout=in[0]->u.num!=0;
+ navit_set_center(this, &pc, set_timeout);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2015-04-05 10:21:29
|
Revision: 6043
http://sourceforge.net/p/navit/code/6043
Author: mdankov
Date: 2015-04-05 10:21:22 +0000 (Sun, 05 Apr 2015)
Log Message:
-----------
Fix:port_android:Enable fastscroll controls in Address search country select & result lists
Modified Paths:
--------------
trunk/navit/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java 2015-04-04 20:41:16 UTC (rev 6042)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java 2015-04-05 10:21:22 UTC (rev 6043)
@@ -275,7 +275,9 @@
}
});
- mapModeChooser.show();
+ AlertDialog d=mapModeChooser.create();
+ d.getListView().setFastScrollEnabled(true);
+ d.show();
}
/**
@@ -312,6 +314,7 @@
finish();
}
ListView addressesFound = new ListView(this);
+ addressesFound.setFastScrollEnabled(true);
ArrayAdapter<String> addressList =
new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2015-04-04 20:41:19
|
Revision: 6042
http://sourceforge.net/p/navit/code/6042
Author: mdankov
Date: 2015-04-04 20:41:16 +0000 (Sat, 04 Apr 2015)
Log Message:
-----------
Fix:port_android:Display country flag image in Android search dialog.
Modified Paths:
--------------
trunk/navit/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java 2015-04-02 17:08:56 UTC (rev 6041)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java 2015-04-04 20:41:16 UTC (rev 6042)
@@ -101,7 +101,24 @@
}
return drawableId;
}
+
+ private void setCountryButtonImage() {
+ // We have all images stored as drawable_nodpi resources which allows native code to manipulate them
+ // without interference with android builtin choosing and scaling system. But that makes us to
+ // reinvent the wheel here to show an image in android native interface.
+ int flag_icon_sizes[]={24,32,48,64,96};
+ int exact_size, nearest_size;
+ exact_size=(int)(Navit.metrics.density*24.0 -.5);
+ nearest_size=flag_icon_sizes[0];
+ for(int size: flag_icon_sizes) {
+ nearest_size=size;
+ if(exact_size<=size)
+ break;
+ }
+ mCountryButton.setImageResource(getDrawableID("country_" + mCountry+"_"+nearest_size+"_"+nearest_size));
+ }
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -139,9 +156,9 @@
}
mCountryButton = new ImageButton(this);
+
+ setCountryButtonImage();
- mCountryButton.setImageResource(getDrawableID("country_" + mCountry));
-
mCountryButton.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
requestCountryDialog();
@@ -254,7 +271,7 @@
edit_settings.putString("DefaultCountry", mCountry);
edit_settings.commit();
- mCountryButton.setImageResource(getDrawableID("country_" + mCountry));
+ setCountryButtonImage();
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-02 17:09:03
|
Revision: 6041
http://sourceforge.net/p/navit/code/6041
Author: kazer_
Date: 2015-04-02 17:08:56 +0000 (Thu, 02 Apr 2015)
Log Message:
-----------
Refactor:core:Removed quesoglc deps
Modified Paths:
--------------
trunk/navit/CMakeLists.txt
trunk/navit/configure.in
Modified: trunk/navit/CMakeLists.txt
===================================================================
--- trunk/navit/CMakeLists.txt 2015-03-31 21:04:13 UTC (rev 6040)
+++ trunk/navit/CMakeLists.txt 2015-04-02 17:08:56 UTC (rev 6041)
@@ -160,7 +160,6 @@
#pkg-config based detection
find_package(PkgConfig)
if(PKG_CONFIG_FOUND)
- pkg_check_modules(QUESOGLC quesoglc)
pkg_check_modules(LIBLOCATION liblocation)
pkg_check_modules(LIBOSSO libosso)
# Accept even old versions of libgps, because N810 uses an old version (see #1179).
Modified: trunk/navit/configure.in
===================================================================
--- trunk/navit/configure.in 2015-03-31 21:04:13 UTC (rev 6040)
+++ trunk/navit/configure.in 2015-04-02 17:08:56 UTC (rev 6041)
@@ -1223,10 +1223,6 @@
then
sdl_failures=$sdl_failures"glut "
fi
-if test x"$glc" != xyes
- then
- sdl_failures=$sdl_failures"quesoglc "
-fi
if test -z "$sdl_failures"
then
echo "OpenGL gui : ENABLED, with $CEGUI_LIBS"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2015-03-31 21:04:21
|
Revision: 6040
http://sourceforge.net/p/navit/code/6040
Author: mdankov
Date: 2015-03-31 21:04:13 +0000 (Tue, 31 Mar 2015)
Log Message:
-----------
Fix:port_android:Quickfix for #1286, crash starting map download when no SD card present.
Modified Paths:
--------------
trunk/navit/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java 2015-03-31 18:18:46 UTC (rev 6039)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java 2015-03-31 21:04:13 UTC (rev 6040)
@@ -59,7 +59,15 @@
updateDownloadedMaps();
updateMapsForLocation(NavitMapDownloader.osm_maps);
setListAdapter(adapter);
- setTitle(String.valueOf(getFreeSpace() / 1024 / 1024) + "MB available");
+ try {
+ setTitle(String.valueOf(getFreeSpace() / 1024 / 1024) + "MB available");
+ } catch (Exception e) {
+ Log.e("Navit","Exception "+e.getClass().getName()+" during getFreeSpace, reporting 'no sdcard present'");
+ NavitDialogs.sendDialogMessage(NavitDialogs.MSG_TOAST_LONG, null,
+ Navit._("Please attach your SD card to enable map download."),
+ -1, 0, 0);
+ finish();
+ }
}
protected long getFreeSpace()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2015-03-31 18:18:54
|
Revision: 6039
http://sourceforge.net/p/navit/code/6039
Author: mdankov
Date: 2015-03-31 18:18:46 +0000 (Tue, 31 Mar 2015)
Log Message:
-----------
Add:port_android:Script to update predefined map sizes in NavitMapDownloader.java
Added Paths:
-----------
trunk/navit/contrib/android-update-map-sizes.pl
Added: trunk/navit/contrib/android-update-map-sizes.pl
===================================================================
--- trunk/navit/contrib/android-update-map-sizes.pl (rev 0)
+++ trunk/navit/contrib/android-update-map-sizes.pl 2015-03-31 18:18:46 UTC (rev 6039)
@@ -0,0 +1,41 @@
+#!/usr/bin/perl
+# Navit, a modular navigation system.
+# Copyright (C) 2005-2008 Navit Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# version 2 as published by the Free Software Foundation.
+#
+# 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, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+
+
+print STDERR "NavitMapDownloader.java map sizes update script.\n";
+print STDERR "Please feed me NavitMapDownloader.java on stdin, get the updated file on stdout.\n";
+
+while(<>){
+ if(/^(.*new osm_map_values\(.*)"([\-0-9\.]+)"\s*,\s*"([\-0-9\.]+)"\s*,\s*"([\-0-9\.]+)"\s*,\s*"([\-0-9\.]+)"\s*,\s*([0-9L]+)\s*,\s*([0-9L]+.*\).*$)/i) {
+ $prefix=qq($1 "$2", "$3", "$4", "$5",);
+ $suffix=$7;
+ $size="==err==";
+ $curline="$_";
+ do{
+ print STDERR $curline;
+ open IN, "curl --head -L http://maps.navit-project.org/api/map/?bbox=$2,$3,$4,$5|";
+ while(<IN>) {
+ $size="$1L" if(/^Content-Length:\s*(\d+)/)
+ }
+ close IN;
+ } while($size eq "==err==");
+ print "$prefix $size, $suffix\n";
+ } else {
+ print "$_";
+ }
+}
Property changes on: trunk/navit/contrib/android-update-map-sizes.pl
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2015-03-31 17:59:22
|
Revision: 6038
http://sourceforge.net/p/navit/code/6038
Author: mdankov
Date: 2015-03-31 17:59:20 +0000 (Tue, 31 Mar 2015)
Log Message:
-----------
Fix:gui_internal:Add navit.svg icon used in "About" dialog.
Added Paths:
-----------
trunk/navit/navit/xpm/navit.svg
Added: trunk/navit/navit/xpm/navit.svg
===================================================================
--- trunk/navit/navit/xpm/navit.svg (rev 0)
+++ trunk/navit/navit/xpm/navit.svg 2015-03-31 17:59:20 UTC (rev 6038)
@@ -0,0 +1,393 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="22"
+ height="22"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.48.4 r9939"
+ version="1.0"
+ sodipodi:docname="navit.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="/home/jeff/projets/navit/navit.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs4">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3376">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop3378" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop3380" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3365">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.61904764;"
+ offset="0"
+ id="stop3367" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3369" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3328">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop3330" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3332" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3320">
+ <stop
+ style="stop-color:#116cbf;stop-opacity:1;"
+ offset="0"
+ id="stop3322" />
+ <stop
+ id="stop3354"
+ offset="0.08"
+ style="stop-color:#116cbf;stop-opacity:1;" />
+ <stop
+ id="stop3352"
+ offset="0.4893617"
+ style="stop-color:#1a6cb6;stop-opacity:1;" />
+ <stop
+ style="stop-color:#329eff;stop-opacity:1;"
+ offset="1"
+ id="stop3324" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3308">
+ <stop
+ style="stop-color:#062643;stop-opacity:1;"
+ offset="0"
+ id="stop3310" />
+ <stop
+ style="stop-color:#0d5799;stop-opacity:1;"
+ offset="1"
+ id="stop3312" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3235">
+ <stop
+ style="stop-color:#c17d11;stop-opacity:1;"
+ offset="0"
+ id="stop3237" />
+ <stop
+ style="stop-color:#e9cb14;stop-opacity:1;"
+ offset="1"
+ id="stop3239" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3227">
+ <stop
+ style="stop-color:#76650c;stop-opacity:1;"
+ offset="0"
+ id="stop3229" />
+ <stop
+ style="stop-color:#76650c;stop-opacity:0;"
+ offset="1"
+ id="stop3231" />
+ </linearGradient>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="15.556349 : 133.02972 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective10" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3235"
+ id="linearGradient3241"
+ x1="64"
+ y1="115.11359"
+ x2="64"
+ y2="17.40102"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.15819674,0,0,0.15819674,1.9928719,0.69315656)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3308"
+ id="linearGradient3314"
+ x1="-7.7781754"
+ y1="4.2563133"
+ x2="43.133514"
+ y2="4.2563133"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3320"
+ id="linearGradient3326"
+ x1="7.6363606"
+ y1="87.731171"
+ x2="58.391151"
+ y2="38.450466"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.15669503,0.02174581,-0.02174581,0.15669503,4.357122,0.76802046)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3227"
+ id="linearGradient3340"
+ gradientUnits="userSpaceOnUse"
+ x1="63"
+ y1="106.75"
+ x2="92"
+ y2="29.25" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3328"
+ id="linearGradient3342"
+ gradientUnits="userSpaceOnUse"
+ x1="71"
+ y1="69.5"
+ x2="87.25"
+ y2="33.5" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3365"
+ id="linearGradient3371"
+ x1="-1.5"
+ y1="86.5"
+ x2="73.5"
+ y2="40"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.15819674,0,0,0.15819674,1.9928719,0.69315656)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3376"
+ id="linearGradient3382"
+ x1="62.147858"
+ y1="67.453751"
+ x2="11.016594"
+ y2="24.242672"
+ gradientUnits="userSpaceOnUse" />
+ <filter
+ inkscape:collect="always"
+ id="filter3424">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.90523025"
+ id="feGaussianBlur3426" />
+ </filter>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.313708"
+ inkscape:cx="16.894586"
+ inkscape:cy="27.303943"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer2"
+ showgrid="false"
+ inkscape:window-width="1280"
+ inkscape:window-height="948"
+ inkscape:window-x="0"
+ inkscape:window-y="24"
+ showborder="true"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Calque 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <rect
+ style="fill:url(#linearGradient3241);fill-opacity:1;stroke:#43350f;stroke-width:0.79098374;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2403"
+ width="18.792814"
+ height="15.381022"
+ x="2.7210562"
+ y="3.1272359"
+ rx="1.5819675"
+ ry="1.5819675" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="lignes"
+ style="display:inline">
+ <g
+ id="g3336"
+ transform="matrix(0.15819674,0,0,0.15819674,5.1568068,0.69315656)">
+ <path
+ sodipodi:nodetypes="cczzczc"
+ id="path3223"
+ d="m 92,27 8,-4 c 0,0 -32.803776,29.787015 -21.5,41.25 11.303776,11.462985 5.61873,46.35859 -6,46.25 L 19,110 C 39.916667,101.41667 73.874441,83.136394 61,66.25 48.125559,49.363606 92,27 92,27 z"
+ style="fill:url(#linearGradient3340);fill-opacity:1;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="czc"
+ id="path3244"
+ d="M 49.5,110 C 60.666667,104.16667 83.256846,86.358298 72,70.5 60.743153,54.641702 77.5,38.5 92.5,29"
+ style="fill:none;stroke:url(#linearGradient3342);stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:9, 9;stroke-dashoffset:0"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="bulle"
+ style="display:none">
+ <path
+ sodipodi:type="arc"
+ style="fill:url(#linearGradient3314);fill-opacity:1;stroke:#1f3157;stroke-width:5.30526352;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path3305"
+ sodipodi:cx="17.67767"
+ sodipodi:cy="4.2563133"
+ sodipodi:rx="25.455845"
+ sodipodi:ry="25.455845"
+ d="m 43.133514,4.2563133 a 25.455845,25.455845 0 1 1 -50.9116894,0 25.455845,25.455845 0 1 1 50.9116894,0 z"
+ transform="matrix(1.3194444,0,0,1.3194444,18.394598,29.399489)" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="rose des vents"
+ style="display:none">
+ <g
+ id="g3256"
+ transform="matrix(0.7071068,0.7071068,-0.7071068,0.7071068,36.903806,-19.093669)"
+ style="opacity:0.5">
+ <path
+ transform="translate(67.5,7)"
+ d="m -25.999999,61.185085 -5.673657,-27.511429 -27.511429,-5.673655 27.511429,-5.673657 5.673655,-27.5114293 5.673657,27.5114293 27.5114293,5.673655 -27.5114293,5.673657 z"
+ inkscape:randomized="0"
+ inkscape:rounded="0"
+ inkscape:flatsided="false"
+ sodipodi:arg2="2.3561945"
+ sodipodi:arg1="1.5707963"
+ sodipodi:r2="8.0237608"
+ sodipodi:r1="33.185085"
+ sodipodi:cy="28"
+ sodipodi:cx="-26"
+ sodipodi:sides="4"
+ id="path3258"
+ style="fill:#167bd9;fill-opacity:1;stroke:none"
+ sodipodi:type="star" />
+ <path
+ transform="translate(67.5,7)"
+ d="m -25.999999,61.185085 6.826343,-33.011429 -40.011429,-0.173655 33.011429,6.826343 0.173655,-40.0114293 -6.826343,33.0114293 40.0114293,0.173655 -33.0114293,-6.826343 z"
+ inkscape:randomized="0"
+ inkscape:rounded="0"
+ inkscape:flatsided="false"
+ sodipodi:arg2="0.025433549"
+ sodipodi:arg1="1.5707963"
+ sodipodi:r2="6.8285527"
+ sodipodi:r1="33.185085"
+ sodipodi:cy="28"
+ sodipodi:cx="-26"
+ sodipodi:sides="4"
+ id="path3260"
+ style="fill:#c3dff9;fill-opacity:1;stroke:none"
+ sodipodi:type="star" />
+ </g>
+ <g
+ id="g3252">
+ <path
+ transform="translate(67.5,7)"
+ d="m -25.999999,61.185085 -5.673657,-27.511429 -27.511429,-5.673655 27.511429,-5.673657 5.673655,-27.5114293 5.673657,27.5114293 27.5114293,5.673655 -27.5114293,5.673657 z"
+ inkscape:randomized="0"
+ inkscape:rounded="0"
+ inkscape:flatsided="false"
+ sodipodi:arg2="2.3561945"
+ sodipodi:arg1="1.5707963"
+ sodipodi:r2="8.0237608"
+ sodipodi:r1="33.185085"
+ sodipodi:cy="28"
+ sodipodi:cx="-26"
+ sodipodi:sides="4"
+ id="path3248"
+ style="fill:#167bd9;fill-opacity:1;stroke:none"
+ sodipodi:type="star" />
+ <path
+ transform="translate(67.5,7)"
+ d="m -25.999999,61.185085 6.826343,-33.011429 -40.011429,-0.173655 33.011429,6.826343 0.173655,-40.0114293 -6.826343,33.0114293 40.0114293,0.173655 -33.0114293,-6.826343 z"
+ inkscape:randomized="0"
+ inkscape:rounded="0"
+ inkscape:flatsided="false"
+ sodipodi:arg2="0.025433549"
+ sodipodi:arg1="1.5707963"
+ sodipodi:r2="6.8285527"
+ sodipodi:r1="33.185085"
+ sodipodi:cy="28"
+ sodipodi:cx="-26"
+ sodipodi:sides="4"
+ id="path3250"
+ style="fill:#c3dff9;fill-opacity:1;stroke:none"
+ sodipodi:type="star" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer6"
+ inkscape:label="ondes"
+ style="display:inline">
+ <path
+ sodipodi:type="spiral"
+ style="fill:none;stroke:url(#linearGradient3382);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3424)"
+ id="path3374"
+ sodipodi:cx="14.142136"
+ sodipodi:cy="19.812662"
+ sodipodi:expansion="1"
+ sodipodi:revolution="7"
+ sodipodi:radius="54.341515"
+ sodipodi:argument="-17.841497"
+ sodipodi:t0="0"
+ d="m 14.142136,19.812662 c 0.622964,0.987625 -1.02395,1.327003 -1.641498,1.035408 -1.673515,-0.790205 -1.44576,-3.111369 -0.429317,-4.318403 1.818177,-2.1591 5.16668,-1.702115 6.995307,0.176773 2.683583,2.757343 1.972982,7.252372 -0.782863,9.672211 C 14.610657,29.603916 8.9345884,28.6291 5.934649,24.989699 2.1595315,20.409885 3.4032379,13.538342 7.9296913,9.9636782 13.411833,5.6342815 21.486273,7.1492634 25.632617,12.56481 30.51894,18.946845 28.731319,28.228517 22.425395,32.944641 15.144955,38.389593 4.6532955,36.328487 -0.63134024,29.131329 -6.6360792,20.95346 -4.300928,9.2499464 3.7880618,3.3976889 12.862686,-3.1676594 25.779376,-0.55807441 32.198606,8.4231809 39.325168,18.394077 36.440869,32.524914 26.567024,39.51063 15.700216,47.198863 0.35449515,44.039641 -7.1973295,33.272958 -15.447588,21.510513 -12.013284,4.9493376 -0.35356778,-3.1683003 12.304301,-11.980865 30.081381,-8.2713528 38.764595,4.2815513 48.13969,17.834674 44.154872,36.828022 30.708654,46.076619 16.260416,56.014427 -3.9494981,51.754222 -13.763319,37.414588 -24.263992,22.071347 -19.728335,0.64462208 -4.4951973,-9.7342896 11.742953,-20.797954 34.386694,-15.98679 45.330585,0.1399218 56.957348,17.272902 51.870631,41.133834 34.850283,52.642608 16.822539,64.832562 -8.2557318,59.470254 -20.329308,41.556217 -33.082529,22.633765 -27.444596,-3.6619713 -8.6368269,-16.300279 11.180283,-29.616836 38.693597,-23.70325 51.896574,-4.0017077 65.776525,16.710018 59.587261,45.441005 38.991913,59.208598 17.385609,73.651995 -12.563136,67.187032 -26.895297,45.697847 -41.902187,23.196997 -35.161504,-7.9695799 -12.778456,-22.866268 10.616911,-38.436689 43.001386,-31.420272 58.462563,-8.1433373 74.596552,16.146521 67.304385,49.748954 43.133542,65.774587"
+ transform="matrix(-0.15819674,0,0,0.15819674,22.262049,1.7055356)" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="flèche"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient3326);fill-opacity:1;stroke:#1f3157;stroke-width:0.47459021;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ d="M 5.6166617,6.6702162 C 8.5498903,6.3591404 11.366732,6.8627725 14.089084,8.0278339 L 12.323485,12.25995 11.465549,10.2747 C 9.1936105,11.38659 7.6712925,13.621104 6.8096897,16.845097 L 0.57820215,12.334567 C 2.318135,10.026025 5.9650066,8.1110997 8.889601,7.8565979 L 5.6166617,6.6702162 z"
+ id="rect3317"
+ sodipodi:nodetypes="cccccccc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:url(#linearGradient3371);fill-opacity:1;stroke:none"
+ d="M 8.2416433,7.021026 C 9.8257327,6.8500961 11.315051,7.2477939 12.75025,7.9702064 8.920071,9.4835882 6.1923078,11.598289 4.6822166,14.377175 L 1.7555768,12.162421 C 3.6037773,9.8056523 6.570797,8.7541746 9.6654142,7.8515586 L 8.2416433,7.021026 z"
+ id="rect3362"
+ sodipodi:nodetypes="cccccc"
+ inkscape:connector-curvature="0" />
+ </g>
+</svg>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2015-03-31 17:57:49
|
Revision: 6037
http://sourceforge.net/p/navit/code/6037
Author: mdankov
Date: 2015-03-31 17:57:47 +0000 (Tue, 31 Mar 2015)
Log Message:
-----------
Fix:port_android:Do not show estimated time and percent value as "NaN" in map download progress info
Modified Paths:
--------------
trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java 2015-03-30 21:40:40 UTC (rev 6036)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java 2015-03-31 17:57:47 UTC (rev 6037)
@@ -345,7 +345,7 @@
retry_counter = 0;
Log.v(TAG, "start download " + map_values.map_name);
- updateProgress(0, 20, Navit._("downloading") + ": " + map_values.map_name);
+ updateProgress(0, map_values.est_size_bytes, Navit._("downloading") + ": " + map_values.map_name);
boolean success;
do {
@@ -435,8 +435,12 @@
c.setRequestProperty("Range", "bytes=" + old_download_size + "-");
already_read = old_download_size;
}
+ try {
+ real_size_bytes=Long.parseLong(c.getHeaderField("Content-Length")) + already_read;
+ } catch(Exception e) {
+ real_size_bytes=-1;
+ }
- real_size_bytes = c.getContentLength() + already_read;
long fileTime = c.getLastModified();
if (!resume) {
@@ -638,7 +642,7 @@
protected void updateProgress(long startTime, long offsetBytes, long readBytes, long maxBytes) {
long currentTime = System.nanoTime();
- if (currentTime > uiLastUpdated + UPDATE_PROGRESS_TIME_NS) {
+ if ((currentTime > uiLastUpdated + UPDATE_PROGRESS_TIME_NS) && startTime!=currentTime) {
float per_second_overall = (readBytes - offsetBytes) / ((currentTime - startTime) / 1000000000f);
long bytes_remaining = maxBytes - readBytes;
int eta_seconds = (int) (bytes_remaining / per_second_overall);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
13 messages has been excluded from this view by a project administrator.
