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: <ka...@us...> - 2015-08-04 20:47:32
|
Revision: 6135 http://sourceforge.net/p/navit/code/6135 Author: kazer_ Date: 2015-08-04 20:47:30 +0000 (Tue, 04 Aug 2015) Log Message: ----------- Fix:Android:Default to 0 if we can't find the svn rev of the last commit Modified Paths: -------------- trunk/navit/ci/build_android.sh trunk/navit/po/de.po.in trunk/navit/po/pt_BR.po.in Modified: trunk/navit/ci/build_android.sh =================================================================== --- trunk/navit/ci/build_android.sh 2015-08-04 18:15:11 UTC (rev 6134) +++ trunk/navit/ci/build_android.sh 2015-08-04 20:47:30 UTC (rev 6135) @@ -131,6 +131,7 @@ export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_TOOLS:$ANDROID_SDK_PLATFORM_TOOLS:$PATH android list targets svn_rev=` cd ~/navit/; git log -1|grep git-svn-id:|cut -c 65-68` +if [[ "$svn_rev" == "" ]]; then svn_rev="0"; fi sed -i -e "s/ANDROID_VERSION_INT=\"0\"/ANDROID_VERSION_INT=\"${svn_rev}\"/g" ~/navit/navit/android/CMakeLists.txt cp ~/navit/navit/android/CMakeLists.txt $CIRCLE_ARTIFACTS/ Modified: trunk/navit/po/de.po.in =================================================================== --- trunk/navit/po/de.po.in 2015-08-04 18:15:11 UTC (rev 6134) +++ trunk/navit/po/de.po.in 2015-08-04 20:47:30 UTC (rev 6135) @@ -40,8 +40,8 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2015-07-20 21:54+0000\n" -"Last-Translator: Mathias Klein <ma_...@gm...>\n" +"PO-Revision-Date: 2015-07-23 12:34+0000\n" +"Last-Translator: Robotaxi <rob...@ar...>\n" "Language-Team: Martin Schaller <mar...@so...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -393,7 +393,7 @@ #. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" -msgstr "Sie haben Ihr Ziel %s erreicht" +msgstr "%s haben Sie Ihr Ziel erreicht" #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" msgid "Interchange" @@ -2808,9 +2808,3 @@ "Navit kann jede text-to-speech engine nutzen, die installiert ist. Die\r\n" "derzeit angewählte engine kann Ihre Sprache nicht wiedergeben.\r\n" "Soll das System den Voice-Download Dialog öffnen?" - -#~ msgid "%d m" -#~ msgstr "%d m" - -#~ msgid "in %d m" -#~ msgstr "in %d m" Modified: trunk/navit/po/pt_BR.po.in =================================================================== --- trunk/navit/po/pt_BR.po.in 2015-08-04 18:15:11 UTC (rev 6134) +++ trunk/navit/po/pt_BR.po.in 2015-08-04 20:47:30 UTC (rev 6135) @@ -86,14 +86,6 @@ msgstr "sexta saída" #, c-format -msgid "%d m" -msgstr "" - -#, c-format -msgid "in %d m" -msgstr "" - -#, c-format msgid "%d feet" msgstr "%d pés" @@ -102,14 +94,6 @@ msgstr "em %d pés" #, c-format -msgid "%d meters" -msgstr "%d metros" - -#, c-format -msgid "in %d meters" -msgstr "em %d metros" - -#, c-format msgid "%d.%d miles" msgstr "%d.%d milhas" @@ -118,14 +102,6 @@ msgstr "em %d.%d milhas" #, c-format -msgid "%d.%d kilometers" -msgstr "%d.%d quilômetros" - -#, c-format -msgid "in %d.%d kilometers" -msgstr "em %d.%d quilômetros" - -#, c-format msgid "one mile" msgid_plural "%d miles" msgstr[0] "uma milha" @@ -138,6 +114,22 @@ msgstr[1] "em %d milhas" #, c-format +msgid "%d meters" +msgstr "%d metros" + +#, c-format +msgid "in %d meters" +msgstr "em %d metros" + +#, c-format +msgid "%d.%d kilometers" +msgstr "%d.%d quilômetros" + +#, c-format +msgid "in %d.%d kilometers" +msgstr "em %d.%d quilômetros" + +#, c-format msgid "one kilometer" msgid_plural "%d kilometers" msgstr[0] "um quilômetro" @@ -218,10 +210,10 @@ msgid "Enter the roundabout soon" msgstr "Entre na rotatória em seguida" -#. TRANSLATORS: first arg. is the distance to the roundabout, second arg. is the manieth exit +#. TRANSLATORS: %s is the distance to the roundabout #, c-format -msgid "Enter the roundabout %1$s and leave at the %2$s" -msgstr "" +msgid "Enter the roundabout %s" +msgstr "Entre na rotatória %s" #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format @@ -242,25 +234,25 @@ msgid "then" msgstr "em seguida" -#. TRANSLATORS: the arg. is the phrase 'onto ...'. +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then right merge%1$s" +msgid "then merge%1$s|right" msgstr "" -#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Merge right %1$s%2$s" +msgid "Merge %1$s%2$s|right" msgstr "" -#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "then left merge%1$s" -msgstr "" +msgid "then merge%1$s|left" +msgstr "em seguida vire a %1$s|esquerda" -#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Merge left %1$s%2$s" -msgstr "" +msgid "Merge %1$s%2$s|left" +msgstr "Vire a %1$s%2$s|esquerda" msgid "on your left" msgstr "à sua esquerda" @@ -345,23 +337,23 @@ msgid "Turn %1$s%2$s %3$s%4$s" msgstr "Vire a %1$s%2$s %3$s%4$s" -#. TRANSLATORS: Left U-turn -msgid "then make a left U-turn" -msgstr "" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "então faça o retorno" -#. TRANSLATORS: the arg. is distance. Left U-turn +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Make a left U-turn %1$s" -msgstr "" +msgid "Make a U-turn %1$s|left" +msgstr "Faça o retorno a esquerda %1$s" -#. TRANSLATORS: Right U-turn, the stuff after -msgid "then make a right U-turn" -msgstr "" +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "então faça o retorno a direita" -#. TRANSLATORS: the arg. is distance. Right U-turn +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Make a right U-turn %1$s" -msgstr "" +msgid "Make a U-turn %1$s|right" +msgstr "Faça o retorno a direita %1$s" #. An empty placeholder that we can use in the future for #. * some motorway commands that are now suppressed but we @@ -2786,29 +2778,3 @@ "currently selected engine reports it is unable to speak in your language. " "Should we ask the system to show voice download dialog?" msgstr "" - -#, c-format -#~ msgid "Enter the roundabout %s" -#~ msgstr "Entre na rotatória %s" - -#, c-format -#~ msgid "then merge%1$s|left" -#~ msgstr "em seguida vire a %1$s|esquerda" - -#, c-format -#~ msgid "Merge %1$s%2$s|left" -#~ msgstr "Vire a %1$s%2$s|esquerda" - -#~ msgid "then make a U-turn|left" -#~ msgstr "então faça o retorno" - -#, c-format -#~ msgid "Make a U-turn %1$s|left" -#~ msgstr "Faça o retorno a esquerda %1$s" - -#~ msgid "then make a U-turn|right" -#~ msgstr "então faça o retorno a direita" - -#, c-format -#~ msgid "Make a U-turn %1$s|right" -#~ msgstr "Faça o retorno a direita %1$s" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2015-08-04 18:15:14
|
Revision: 6134 http://sourceforge.net/p/navit/code/6134 Author: kazer_ Date: 2015-08-04 18:15:11 +0000 (Tue, 04 Aug 2015) Log Message: ----------- Update:Translations:Updated French (fr) translation from launchpad Modified Paths: -------------- trunk/navit/po/fr.po.in Modified: trunk/navit/po/fr.po.in =================================================================== --- trunk/navit/po/fr.po.in 2015-08-03 04:46:51 UTC (rev 6133) +++ trunk/navit/po/fr.po.in 2015-08-04 18:15:11 UTC (rev 6134) @@ -22,14 +22,15 @@ # mercier133 https://launchpad.net/~mercierdamien # metehyi https://launchpad.net/~metehyi # pierre https://launchpad.net/~pmghost4 +# quent57 https://launchpad.net/~quent57 # yannick56 https://launchpad.net/~yleny msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2015-07-19 03:58+0000\n" -"Last-Translator: Michael von Glasow <Unknown>\n" +"PO-Revision-Date: 2015-08-02 19:54+0000\n" +"Last-Translator: quent57 <qu...@ya...>\n" "Language-Team: KaZeR <ka...@al...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -259,10 +260,10 @@ msgstr "" msgid "on your left" -msgstr "" +msgstr "sur votre gauche" msgid "on your right" -msgstr "" +msgstr "sur votre droite" #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2015-08-03 04:46:53
|
Revision: 6133 http://sourceforge.net/p/navit/code/6133 Author: kazer_ Date: 2015-08-03 04:46:51 +0000 (Mon, 03 Aug 2015) Log Message: ----------- Update:Translations:Updated Brazilian Portuguese translation from launchpad Modified Paths: -------------- trunk/navit/po/pt_BR.po.in Modified: trunk/navit/po/pt_BR.po.in =================================================================== --- trunk/navit/po/pt_BR.po.in 2015-07-31 22:42:39 UTC (rev 6132) +++ trunk/navit/po/pt_BR.po.in 2015-08-03 04:46:51 UTC (rev 6133) @@ -24,8 +24,8 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2015-07-19 04:00+0000\n" -"Last-Translator: Helder Santana <hel...@gm...>\n" +"PO-Revision-Date: 2015-07-27 11:44+0000\n" +"Last-Translator: Julio Alexander Sieg <jul...@gm...>\n" "Language-Team: Brazilian Portuguese <pt...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,7 +39,7 @@ #, c-format msgid "setting '%s' to '%s'\n" -msgstr "ajustando '%s' para '%s'\n" +msgstr "ajustando de '%s' para '%s'\n" #. TRANSLATORS: the following counts refer to streets msgid "zeroth" @@ -86,6 +86,14 @@ msgstr "sexta saída" #, c-format +msgid "%d m" +msgstr "" + +#, c-format +msgid "in %d m" +msgstr "" + +#, c-format msgid "%d feet" msgstr "%d pés" @@ -94,6 +102,14 @@ msgstr "em %d pés" #, c-format +msgid "%d meters" +msgstr "%d metros" + +#, c-format +msgid "in %d meters" +msgstr "em %d metros" + +#, c-format msgid "%d.%d miles" msgstr "%d.%d milhas" @@ -102,6 +118,14 @@ msgstr "em %d.%d milhas" #, c-format +msgid "%d.%d kilometers" +msgstr "%d.%d quilômetros" + +#, c-format +msgid "in %d.%d kilometers" +msgstr "em %d.%d quilômetros" + +#, c-format msgid "one mile" msgid_plural "%d miles" msgstr[0] "uma milha" @@ -114,22 +138,6 @@ msgstr[1] "em %d milhas" #, c-format -msgid "%d meters" -msgstr "%d metros" - -#, c-format -msgid "in %d meters" -msgstr "em %d metros" - -#, c-format -msgid "%d.%d kilometers" -msgstr "%d.%d quilômetros" - -#, c-format -msgid "in %d.%d kilometers" -msgstr "em %d.%d quilôtros" - -#, c-format msgid "one kilometer" msgid_plural "%d kilometers" msgstr[0] "um quilômetro" @@ -149,7 +157,7 @@ #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name #, c-format msgid "%1$sonto %2$s" -msgstr "" +msgstr "%1$sno %2$s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format @@ -210,10 +218,10 @@ msgid "Enter the roundabout soon" msgstr "Entre na rotatória em seguida" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: first arg. is the distance to the roundabout, second arg. is the manieth exit #, c-format -msgid "Enter the roundabout %s" -msgstr "Entre na rotatória %s" +msgid "Enter the roundabout %1$s and leave at the %2$s" +msgstr "" #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format @@ -234,25 +242,25 @@ msgid "then" msgstr "em seguida" -#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#. TRANSLATORS: the arg. is the phrase 'onto ...'. #, c-format -msgid "then merge%1$s|right" +msgid "then right merge%1$s" msgstr "" -#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. #, c-format -msgid "Merge %1$s%2$s|right" +msgid "Merge right %1$s%2$s" msgstr "" -#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge #, c-format -msgid "then merge%1$s|left" -msgstr "em seguida vire a %1$s|esquerda" +msgid "then left merge%1$s" +msgstr "" -#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge #, c-format -msgid "Merge %1$s%2$s|left" -msgstr "Vire a %1$s%2$s|esquerda" +msgid "Merge left %1$s%2$s" +msgstr "" msgid "on your left" msgstr "à sua esquerda" @@ -337,23 +345,23 @@ msgid "Turn %1$s%2$s %3$s%4$s" msgstr "Vire a %1$s%2$s %3$s%4$s" -#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. -msgid "then make a U-turn|left" -msgstr "então faça o retorno" +#. TRANSLATORS: Left U-turn +msgid "then make a left U-turn" +msgstr "" -#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. +#. TRANSLATORS: the arg. is distance. Left U-turn #, c-format -msgid "Make a U-turn %1$s|left" -msgstr "Faça o retorno a esquerda %1$s" +msgid "Make a left U-turn %1$s" +msgstr "" -#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. -msgid "then make a U-turn|right" -msgstr "então faça o retorno a direita" +#. TRANSLATORS: Right U-turn, the stuff after +msgid "then make a right U-turn" +msgstr "" -#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. +#. TRANSLATORS: the arg. is distance. Right U-turn #, c-format -msgid "Make a U-turn %1$s|right" -msgstr "Faça o retorno a direita %1$s" +msgid "Make a right U-turn %1$s" +msgstr "" #. An empty placeholder that we can use in the future for #. * some motorway commands that are now suppressed but we @@ -2778,3 +2786,29 @@ "currently selected engine reports it is unable to speak in your language. " "Should we ask the system to show voice download dialog?" msgstr "" + +#, c-format +#~ msgid "Enter the roundabout %s" +#~ msgstr "Entre na rotatória %s" + +#, c-format +#~ msgid "then merge%1$s|left" +#~ msgstr "em seguida vire a %1$s|esquerda" + +#, c-format +#~ msgid "Merge %1$s%2$s|left" +#~ msgstr "Vire a %1$s%2$s|esquerda" + +#~ msgid "then make a U-turn|left" +#~ msgstr "então faça o retorno" + +#, c-format +#~ msgid "Make a U-turn %1$s|left" +#~ msgstr "Faça o retorno a esquerda %1$s" + +#~ msgid "then make a U-turn|right" +#~ msgstr "então faça o retorno a direita" + +#, c-format +#~ msgid "Make a U-turn %1$s|right" +#~ msgstr "Faça o retorno a direita %1$s" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2015-07-31 22:42:41
|
Revision: 6132 http://sourceforge.net/p/navit/code/6132 Author: kazer_ Date: 2015-07-31 22:42:39 +0000 (Fri, 31 Jul 2015) Log Message: ----------- Fix:Ci:Fixed the regexp to not choke on commit messages containing 'svn' Modified Paths: -------------- trunk/navit/ci/build_android.sh Modified: trunk/navit/ci/build_android.sh =================================================================== --- trunk/navit/ci/build_android.sh 2015-07-31 22:03:41 UTC (rev 6131) +++ trunk/navit/ci/build_android.sh 2015-07-31 22:42:39 UTC (rev 6132) @@ -130,7 +130,7 @@ cd $BUILD_PATH export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_TOOLS:$ANDROID_SDK_PLATFORM_TOOLS:$PATH android list targets -svn_rev=` cd ~/navit/; git log -1|grep svn|cut -c 65-68` +svn_rev=` cd ~/navit/; git log -1|grep git-svn-id:|cut -c 65-68` sed -i -e "s/ANDROID_VERSION_INT=\"0\"/ANDROID_VERSION_INT=\"${svn_rev}\"/g" ~/navit/navit/android/CMakeLists.txt cp ~/navit/navit/android/CMakeLists.txt $CIRCLE_ARTIFACTS/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2015-07-31 22:03:44
|
Revision: 6131 http://sourceforge.net/p/navit/code/6131 Author: kazer_ Date: 2015-07-31 22:03:41 +0000 (Fri, 31 Jul 2015) Log Message: ----------- Update:Android:Set the svn revision from build_android.sh Modified Paths: -------------- trunk/navit/ci/build_android.sh Modified: trunk/navit/ci/build_android.sh =================================================================== --- trunk/navit/ci/build_android.sh 2015-07-31 19:40:00 UTC (rev 6130) +++ trunk/navit/ci/build_android.sh 2015-07-31 22:03:41 UTC (rev 6131) @@ -130,6 +130,10 @@ cd $BUILD_PATH export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_TOOLS:$ANDROID_SDK_PLATFORM_TOOLS:$PATH android list targets +svn_rev=` cd ~/navit/; git log -1|grep svn|cut -c 65-68` +sed -i -e "s/ANDROID_VERSION_INT=\"0\"/ANDROID_VERSION_INT=\"${svn_rev}\"/g" ~/navit/navit/android/CMakeLists.txt +cp ~/navit/navit/android/CMakeLists.txt $CIRCLE_ARTIFACTS/ + cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DANDROID_API_VERSION=19 $SOURCE_PATH make || exit 1 if [[ "${CIRCLE_BRANCH}" == "master" ]]; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2015-07-31 19:40:03
|
Revision: 6130 http://sourceforge.net/p/navit/code/6130 Author: kazer_ Date: 2015-07-31 19:40:00 +0000 (Fri, 31 Jul 2015) Log Message: ----------- Update:CI:generate a non debug apk from the master branch Modified Paths: -------------- trunk/navit/ci/build_android.sh Modified: trunk/navit/ci/build_android.sh =================================================================== --- trunk/navit/ci/build_android.sh 2015-07-27 17:34:32 UTC (rev 6129) +++ trunk/navit/ci/build_android.sh 2015-07-31 19:40:00 UTC (rev 6130) @@ -131,10 +131,13 @@ 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=19 $SOURCE_PATH -make && make apkg || exit 1 -mv navit/android/bin/Navit-debug.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug.apk +make || exit 1 +if [[ "${CIRCLE_BRANCH}" == "master" ]]; then + make apkg-release && mv navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-release-unsigned.apk +else + make apkg && mv navit/android/bin/Navit-debug.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug.apk +fi #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 $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-07-27 17:34:36
|
Revision: 6129 http://sourceforge.net/p/navit/code/6129 Author: kazer_ Date: 2015-07-27 17:34:32 +0000 (Mon, 27 Jul 2015) Log Message: ----------- Update:Translations:Massive translation update from launchpad. Mostly fixing high five merge updates 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/ko.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-07-27 16:14:48 UTC (rev 6128) +++ trunk/navit/po/af.po.in 2015-07-27 17:34:32 UTC (rev 6129) @@ -5,6 +5,7 @@ # Andre Hugo https://launchpad.net/~cortexhugo # KaZeR https://launchpad.net/~kazer # Kobus https://launchpad.net/~kobuswolf +# Michael von Glasow https://launchpad.net/~michael-vonglasow # Stephan Wessels https://launchpad.net/~slwessels # Wimpie Hall https://launchpad.net/~gotek # mdhull https://launchpad.net/~mark-emsafrica @@ -13,8 +14,8 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2013-09-28 01:39+0000\n" -"Last-Translator: KaZeR <Unknown>\n" +"PO-Revision-Date: 2015-07-19 03:57+0000\n" +"Last-Translator: Michael von Glasow <Unknown>\n" "Language-Team: Afrikaans <af...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,14 +76,6 @@ msgstr "sesde uitgang" #, c-format -msgid "%d m" -msgstr "%d meter" - -#, c-format -msgid "in %d m" -msgstr "na %d meter" - -#, c-format msgid "%d feet" msgstr "" @@ -91,14 +84,6 @@ msgstr "" #, c-format -msgid "%d meters" -msgstr "%d meter" - -#, c-format -msgid "in %d meters" -msgstr "na %d meter" - -#, c-format msgid "%d.%d miles" msgstr "" @@ -107,14 +92,6 @@ msgstr "" #, c-format -msgid "%d.%d kilometers" -msgstr "%d, %d kilometer" - -#, c-format -msgid "in %d.%d kilometers" -msgstr "na %d.%d kilometer" - -#, c-format msgid "one mile" msgid_plural "%d miles" msgstr[0] "" @@ -127,6 +104,22 @@ msgstr[1] "" #, c-format +msgid "%d meters" +msgstr "%d meter" + +#, c-format +msgid "in %d meters" +msgstr "na %d meter" + +#, c-format +msgid "%d.%d kilometers" +msgstr "%d, %d kilometer" + +#, c-format +msgid "in %d.%d kilometers" +msgstr "na %d.%d kilometer" + +#, c-format msgid "one kilometer" msgid_plural "%d kilometers" msgstr[0] "een kilometer" @@ -170,22 +163,22 @@ #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format msgid "%sinto %s%s%s" -msgstr "" +msgstr "%sin die %s%s%s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|masculine form" -msgstr "" +msgstr "%sin die %s%s%s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|feminine form" -msgstr "" +msgstr "%sin die %s%s%s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|neuter form" -msgstr "" +msgstr "%sin die %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format @@ -215,12 +208,12 @@ #. 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 "" +msgstr "verlaat dan die sirkel by die %1$s %2$s" #. 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 "" +msgstr "Verlaat die sirkel by die %1$s %2$s" msgid "soon" msgstr "kortliks" @@ -229,7 +222,7 @@ msgstr "nou" msgid "then" -msgstr "" +msgstr "dan" #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format @@ -260,19 +253,19 @@ #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format msgid "Take exit %1$s %2$s %3$s" -msgstr "" +msgstr "Neem die afrit %1$s %2$s %3$s" #. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format msgid "Take the exit %1$s %2$s%3$s" -msgstr "" +msgstr "Neem die afrit %1$s %2$s%3$s" #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" msgid "at interchange" msgstr "" msgid "at exit" -msgstr "" +msgstr "by die afrit" #. TRANSLATORS: the arg. is where to do the maneuver #, c-format @@ -332,25 +325,25 @@ #. 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 "" +msgstr "Draai %1$s%2$s %3$s%4$s" #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|left" -msgstr "" +msgstr "draai dan om" #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|left" -msgstr "" +msgstr "Draai om %1$s" #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|right" -msgstr "" +msgstr "draai dan om" #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|right" -msgstr "" +msgstr "Draai om %1$s" #. An empty placeholder that we can use in the future for #. * some motorway commands that are now suppressed but we @@ -380,7 +373,7 @@ msgstr "" msgid "Exit" -msgstr "" +msgstr "Afrit" #. Android resource: @strings/position_popup_title msgid "Position" Modified: trunk/navit/po/ar.po.in =================================================================== --- trunk/navit/po/ar.po.in 2015-07-27 16:14:48 UTC (rev 6128) +++ trunk/navit/po/ar.po.in 2015-07-27 17:34:32 UTC (rev 6129) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2015-06-12 18:19+0000\n" +"PO-Revision-Date: 2015-07-19 03:57+0000\n" "Last-Translator: dargirov <dar...@ma...>\n" "Language-Team: Arabic <ar...@li...>\n" "MIME-Version: 1.0\n" @@ -75,14 +75,6 @@ msgstr "المخرج السادس" #, c-format -msgid "%d m" -msgstr "%d م" - -#, c-format -msgid "in %d m" -msgstr "بعد %d متر" - -#, c-format msgid "%d feet" msgstr "%dقدم" @@ -91,14 +83,6 @@ 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 أميال" @@ -107,14 +91,6 @@ 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] "مايل واحد" @@ -135,6 +111,22 @@ msgstr[5] "بعد %d أميال" #, c-format +msgid "%d meters" +msgstr "%d متر" + +#, c-format +msgid "in %d meters" +msgstr "بعد %d متر" + +#, c-format +msgid "%d.%d kilometers" +msgstr "%d.%d كلم" + +#, c-format +msgid "in %d.%d kilometers" +msgstr "بعد %d%d كلم" + +#, c-format msgid "one kilometer" msgid_plural "%d kilometers" msgstr[0] "كلم واحد" @@ -186,22 +178,22 @@ #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format msgid "%sinto %s%s%s" -msgstr "" +msgstr "%s إلى داخل الشارع %s%s%s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|masculine form" -msgstr "" +msgstr "%sإلى داخل %s%s%s|صفة الذكر" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|feminine form" -msgstr "" +msgstr "%sإلى داخل %s%s%s|صفة الأنثى" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|neuter form" -msgstr "" +msgstr "%sإلى داخل %s%s%s|غير محدد الجنس" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format @@ -231,12 +223,12 @@ #. 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 "" +msgstr "ثم أخرج من المستديرة عند الــ%1$s %2$s" #. 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 "" +msgstr "أخرج من المستديرة عند الــ %1$s %2$s" msgid "soon" msgstr "قريبا" @@ -348,7 +340,7 @@ #. 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 "" +msgstr "حوّل %1$s%2$s %3$s%4$s" #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|left" @@ -396,7 +388,7 @@ msgstr "" msgid "Exit" -msgstr "" +msgstr "خروج" #. Android resource: @strings/position_popup_title msgid "Position" Modified: trunk/navit/po/ast.po.in =================================================================== --- trunk/navit/po/ast.po.in 2015-07-27 16:14:48 UTC (rev 6128) +++ trunk/navit/po/ast.po.in 2015-07-27 17:34:32 UTC (rev 6129) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2013-09-28 01:39+0000\n" +"PO-Revision-Date: 2015-07-19 03:57+0000\n" "Last-Translator: Xuacu Saturio <xua...@gm...>\n" "Language-Team: Asturian <as...@li...>\n" "MIME-Version: 1.0\n" @@ -70,14 +70,6 @@ msgstr "sesta salida" #, c-format -msgid "%d m" -msgstr "%d m" - -#, c-format -msgid "in %d m" -msgstr "en %d m" - -#, c-format msgid "%d feet" msgstr "" @@ -86,14 +78,6 @@ msgstr "" #, c-format -msgid "%d meters" -msgstr "%d metros" - -#, c-format -msgid "in %d meters" -msgstr "en %d metros" - -#, c-format msgid "%d.%d miles" msgstr "" @@ -102,14 +86,6 @@ msgstr "" #, c-format -msgid "%d.%d kilometers" -msgstr "%d,%d quilómetros" - -#, c-format -msgid "in %d.%d kilometers" -msgstr "en %d,%d quilómetros" - -#, c-format msgid "one mile" msgid_plural "%d miles" msgstr[0] "" @@ -122,6 +98,22 @@ msgstr[1] "" #, c-format +msgid "%d meters" +msgstr "%d metros" + +#, c-format +msgid "in %d meters" +msgstr "en %d metros" + +#, c-format +msgid "%d.%d kilometers" +msgstr "%d,%d quilómetros" + +#, c-format +msgid "in %d.%d kilometers" +msgstr "en %d,%d quilómetros" + +#, c-format msgid "one kilometer" msgid_plural "%d kilometers" msgstr[0] "un quilómetru" @@ -160,27 +152,27 @@ #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. msgid "onto the motorway ramp" -msgstr "" +msgstr "pal enllaz" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format msgid "%sinto %s%s%s" -msgstr "" +msgstr "%s pa la cai %s%s%s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|masculine form" -msgstr "" +msgstr "%s pal %s%s%s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|feminine form" -msgstr "" +msgstr "%s pa la %s%s%s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|neuter form" -msgstr "" +msgstr "%s pal %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format @@ -210,12 +202,12 @@ #. 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 "" +msgstr "llueu dexe la rotonda pola %1$s %2$s" #. 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 "" +msgstr "Dexe la rotonda pola %1$s %2$s" msgid "soon" msgstr "aína" @@ -224,7 +216,7 @@ msgstr "agora" msgid "then" -msgstr "" +msgstr "llueu" #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format @@ -260,7 +252,7 @@ #. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format msgid "Take the exit %1$s %2$s%3$s" -msgstr "" +msgstr "Tome la salida %1$s %2$s%3$s" #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" msgid "at interchange" @@ -327,25 +319,25 @@ #. 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 "" +msgstr "Xire %1$s%2$s %3$s%4$s" #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|left" -msgstr "" +msgstr "llueu de la vuelta" #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|left" -msgstr "" +msgstr "De la vuelta %1$s" #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|right" -msgstr "" +msgstr "llueu de la vuelta" #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|right" -msgstr "" +msgstr "De la vuelta %1$s" #. An empty placeholder that we can use in the future for #. * some motorway commands that are now suppressed but we @@ -360,7 +352,7 @@ #. * #. msgid "follow" -msgstr "" +msgstr "siga" msgid "then you have reached your destination." msgstr "entós llegará al destín." @@ -375,7 +367,7 @@ msgstr "" msgid "Exit" -msgstr "" +msgstr "Salida" #. Android resource: @strings/position_popup_title msgid "Position" Modified: trunk/navit/po/be.po.in =================================================================== --- trunk/navit/po/be.po.in 2015-07-27 16:14:48 UTC (rev 6128) +++ trunk/navit/po/be.po.in 2015-07-27 17:34:32 UTC (rev 6129) @@ -4,13 +4,14 @@ # Many thanks to the contributors of this translation: # Anatoli Putseyeu https://launchpad.net/~st-shadow-by # KaZeR https://launchpad.net/~kazer +# Michael von Glasow https://launchpad.net/~michael-vonglasow msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2014-11-15 22:06+0000\n" -"Last-Translator: KaZeR <Unknown>\n" +"PO-Revision-Date: 2015-07-19 03:57+0000\n" +"Last-Translator: Michael von Glasow <Unknown>\n" "Language-Team: Belarusian <be...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -71,14 +72,6 @@ msgstr "шосты выхад" #, c-format -msgid "%d m" -msgstr "" - -#, c-format -msgid "in %d m" -msgstr "праз %d м" - -#, c-format msgid "%d feet" msgstr "" @@ -87,14 +80,6 @@ msgstr "" #, c-format -msgid "%d meters" -msgstr "%d метраў" - -#, c-format -msgid "in %d meters" -msgstr "праз %d метраў" - -#, c-format msgid "%d.%d miles" msgstr "" @@ -103,14 +88,6 @@ msgstr "" #, 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] "" @@ -123,6 +100,22 @@ msgstr[1] "" #, c-format +msgid "%d meters" +msgstr "%d метраў" + +#, c-format +msgid "in %d meters" +msgstr "праз %d метраў" + +#, c-format +msgid "%d.%d kilometers" +msgstr "%d.%d кіламетраў" + +#, c-format +msgid "in %d.%d kilometers" +msgstr "праз %d.%d кіламетраў" + +#, c-format msgid "one kilometer" msgid_plural "%d kilometers" msgstr[0] "%d кіламетр" @@ -338,7 +331,7 @@ #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|left" -msgstr "" +msgstr "Развярніцеся %1$s" #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|right" @@ -347,7 +340,7 @@ #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|right" -msgstr "" +msgstr "Развярніцеся %1$s" #. An empty placeholder that we can use in the future for #. * some motorway commands that are now suppressed but we @@ -377,7 +370,7 @@ msgstr "" msgid "Exit" -msgstr "" +msgstr "Выхад" #. Android resource: @strings/position_popup_title msgid "Position" Modified: trunk/navit/po/bg.po.in =================================================================== --- trunk/navit/po/bg.po.in 2015-07-27 16:14:48 UTC (rev 6128) +++ trunk/navit/po/bg.po.in 2015-07-27 17:34:32 UTC (rev 6129) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2013-09-28 01:39+0000\n" +"PO-Revision-Date: 2015-07-19 03:57+0000\n" "Last-Translator: Alex Stanev <al...@st...>\n" "Language-Team: Bulgarian <bg...@li...>\n" "MIME-Version: 1.0\n" @@ -74,14 +74,6 @@ msgstr "шестия изход" #, c-format -msgid "%d m" -msgstr "%d м" - -#, c-format -msgid "in %d m" -msgstr "след %d м" - -#, c-format msgid "%d feet" msgstr "" @@ -90,14 +82,6 @@ msgstr "" #, c-format -msgid "%d meters" -msgstr "%d метра" - -#, c-format -msgid "in %d meters" -msgstr "след %d метра" - -#, c-format msgid "%d.%d miles" msgstr "" @@ -106,14 +90,6 @@ msgstr "" #, 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] "" @@ -126,6 +102,22 @@ msgstr[1] "" #, c-format +msgid "%d meters" +msgstr "%d метра" + +#, c-format +msgid "in %d meters" +msgstr "след %d метра" + +#, c-format +msgid "%d.%d kilometers" +msgstr "%d.%d километра" + +#, c-format +msgid "in %d.%d kilometers" +msgstr "след %d.%d километра" + +#, c-format msgid "one kilometer" msgid_plural "%d kilometers" msgstr[0] "един километър" @@ -164,27 +156,27 @@ #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. msgid "onto the motorway ramp" -msgstr "" +msgstr "на рампата" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format msgid "%sinto %s%s%s" -msgstr "" +msgstr "%sпо улица %s%s%s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|masculine form" -msgstr "" +msgstr "%sпо улица %s%s%s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|feminine form" -msgstr "" +msgstr "%sпо улица %s%s%s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|neuter form" -msgstr "" +msgstr "%sпо улица %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format @@ -209,17 +201,17 @@ #. TRANSLATORS: %s is the distance to the roundabout #, c-format msgid "Enter the roundabout %s" -msgstr "" +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 %1$s %2$s" -msgstr "" +msgstr "след това излезте от кръговото на %1$s %2$s" #. 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 "" +msgstr "Излезте от кръговото на %1$s %2$s" msgid "soon" msgstr "скоро" @@ -228,7 +220,7 @@ msgstr "сега" msgid "then" -msgstr "" +msgstr "след това" #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format @@ -331,25 +323,25 @@ #. 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 "" +msgstr "Завийте %1$s%2$s %3$s%4$s" #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|left" -msgstr "" +msgstr "след това обърнете" #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|left" -msgstr "" +msgstr "Обърнете %1$s" #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|right" -msgstr "" +msgstr "след това обърнете" #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|right" -msgstr "" +msgstr "Обърнете %1$s" #. An empty placeholder that we can use in the future for #. * some motorway commands that are now suppressed but we @@ -379,7 +371,7 @@ msgstr "" msgid "Exit" -msgstr "" +msgstr "Изход" #. Android resource: @strings/position_popup_title msgid "Position" Modified: trunk/navit/po/bs.po.in =================================================================== --- trunk/navit/po/bs.po.in 2015-07-27 16:14:48 UTC (rev 6128) +++ trunk/navit/po/bs.po.in 2015-07-27 17:34:32 UTC (rev 6129) @@ -4,13 +4,14 @@ # Many thanks to the contributors of this translation: # KaZeR https://launchpad.net/~kazer # Kenan https://launchpad.net/~kahrickenan +# Michael von Glasow https://launchpad.net/~michael-vonglasow 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: KaZeR <Unknown>\n" +"PO-Revision-Date: 2015-07-19 03:57+0000\n" +"Last-Translator: Michael von Glasow <Unknown>\n" "Language-Team: Bosnian <bs...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -71,14 +72,6 @@ msgstr "" #, c-format -msgid "%d m" -msgstr "%d m" - -#, c-format -msgid "in %d m" -msgstr "u %d m" - -#, c-format msgid "%d feet" msgstr "" @@ -87,14 +80,6 @@ msgstr "" #, c-format -msgid "%d meters" -msgstr "%d metara" - -#, c-format -msgid "in %d meters" -msgstr "u %d metara" - -#, c-format msgid "%d.%d miles" msgstr "" @@ -103,14 +88,6 @@ msgstr "" #, c-format -msgid "%d.%d kilometers" -msgstr "%d.%d kilometara" - -#, c-format -msgid "in %d.%d kilometers" -msgstr "u %d.%d kilometara" - -#, c-format msgid "one mile" msgid_plural "%d miles" msgstr[0] "" @@ -123,6 +100,22 @@ msgstr[1] "" #, c-format +msgid "%d meters" +msgstr "%d metara" + +#, c-format +msgid "in %d meters" +msgstr "u %d metara" + +#, c-format +msgid "%d.%d kilometers" +msgstr "%d.%d kilometara" + +#, c-format +msgid "in %d.%d kilometers" +msgstr "u %d.%d kilometara" + +#, c-format msgid "one kilometer" msgid_plural "%d kilometers" msgstr[0] "%d kilometar" @@ -163,7 +156,7 @@ #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. msgid "onto the motorway ramp" -msgstr "" +msgstr "u rampu" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format @@ -378,7 +371,7 @@ msgstr "" msgid "Exit" -msgstr "" +msgstr "Izlaz" #. Android resource: @strings/position_popup_title msgid "Position" Modified: trunk/navit/po/ca.po.in =================================================================== --- trunk/navit/po/ca.po.in 2015-07-27 16:14:48 UTC (rev 6128) +++ trunk/navit/po/ca.po.in 2015-07-27 17:34:32 UTC (rev 6129) @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2014-07-09 18:11+0000\n" +"PO-Revision-Date: 2015-07-19 03:57+0000\n" "Last-Translator: Sergi Gomis <pa...@gm...>\n" "Language-Team: Catalan <ca...@li...>\n" "MIME-Version: 1.0\n" @@ -80,14 +80,6 @@ msgstr "sisena sortida" #, c-format -msgid "%d m" -msgstr "%d m" - -#, c-format -msgid "in %d m" -msgstr "d'aquí a %d m" - -#, c-format msgid "%d feet" msgstr "%d peus" @@ -96,14 +88,6 @@ msgstr "en %d peus" #, c-format -msgid "%d meters" -msgstr "%d metres" - -#, c-format -msgid "in %d meters" -msgstr "d'aquí a %d metres" - -#, c-format msgid "%d.%d miles" msgstr "%d.%d milles" @@ -112,14 +96,6 @@ msgstr "en %d.%d milles" #, c-format -msgid "%d.%d kilometers" -msgstr "%d,%d quilòmetres" - -#, c-format -msgid "in %d.%d kilometers" -msgstr "d'aquí a %d,%d quilòmetres" - -#, c-format msgid "one mile" msgid_plural "%d miles" msgstr[0] "una milla" @@ -132,6 +108,22 @@ msgstr[1] "en %d milles" #, c-format +msgid "%d meters" +msgstr "%d metres" + +#, c-format +msgid "in %d meters" +msgstr "d'aquí a %d metres" + +#, c-format +msgid "%d.%d kilometers" +msgstr "%d,%d quilòmetres" + +#, c-format +msgid "in %d.%d kilometers" +msgstr "d'aquí a %d,%d quilòmetres" + +#, c-format msgid "one kilometer" msgid_plural "%d kilometers" msgstr[0] "un quilòmetre" @@ -175,27 +167,27 @@ #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format msgid "%sinto %s%s%s" -msgstr "" +msgstr "%sal carrer %s%s%s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|masculine form" -msgstr "" +msgstr "%sal %s%s%s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|feminine form" -msgstr "" +msgstr "%sa la %s%s%s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|neuter form" -msgstr "" +msgstr "%sa %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" -msgstr "%s cap a la %s" +msgstr "%scap a la %s" msgid "When possible, please turn around" msgstr "Quan sigui possible, doneu mitja volta" @@ -203,7 +195,7 @@ #. TRANSLATORS: the argument is the destination to follow #, c-format msgid "towards %s" -msgstr "" +msgstr "cap a %s" #, c-format msgid "Follow the road for the next %s" @@ -215,17 +207,17 @@ #. TRANSLATORS: %s is the distance to the roundabout #, c-format msgid "Enter the roundabout %s" -msgstr "" +msgstr "Entreu a la rotonda %s" #. 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 "" +msgstr "aleshores deixeu la rotonda a la %1$s %2$s" #. 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 "" +msgstr "Deixeu la rotonda a la %1$s %2$s" msgid "soon" msgstr "aviat" @@ -234,7 +226,7 @@ msgstr "ara" msgid "then" -msgstr "" +msgstr "aleshores" #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format @@ -257,27 +249,27 @@ msgstr "" msgid "on your left" -msgstr "" +msgstr "a l'esquerra" msgid "on your right" -msgstr "" +msgstr "a la dreta" #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format msgid "Take exit %1$s %2$s %3$s" -msgstr "" +msgstr "Preneu la sortida %1$s %2$s %3$s" #. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format msgid "Take the exit %1$s %2$s%3$s" -msgstr "" +msgstr "Preneu la sortida %1$s %2$s%3$s" #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" msgid "at interchange" -msgstr "" +msgstr "a l'intersecció" msgid "at exit" -msgstr "" +msgstr "a la sortida" #. TRANSLATORS: the arg. is where to do the maneuver #, c-format @@ -337,25 +329,25 @@ #. 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 "" +msgstr "Gireu %1$s%2$s %3$s%4$s" #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|left" -msgstr "" +msgstr "després, doneu mitja volta" #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|left" -msgstr "" +msgstr "Doneu mitja volta %1$s" #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|right" -msgstr "" +msgstr "després, doneu mitja volta" #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|right" -msgstr "" +msgstr "Doneu mitja volta %1$s" #. An empty placeholder that we can use in the future for #. * some motorway commands that are now suppressed but we @@ -370,7 +362,7 @@ #. * #. msgid "follow" -msgstr "" +msgstr "seguiu" msgid "then you have reached your destination." msgstr "aleshores heu arribat a destí" @@ -382,10 +374,10 @@ #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" msgid "Interchange" -msgstr "" +msgstr "Intersecció" msgid "Exit" -msgstr "" +msgstr "Sortida" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1673,7 +1665,7 @@ msgstr "" msgid "Justice" -msgstr "" +msgstr "Jutjats" msgid "Taxi" msgstr "" Modified: trunk/navit/po/ckb.po.in =================================================================== --- trunk/navit/po/ckb.po.in 2015-07-27 16:14:48 UTC (rev 6128) +++ trunk/navit/po/ckb.po.in 2015-07-27 17:34:32 UTC (rev 6129) @@ -15,7 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: \n" +"Language: ckb\n" msgid "Running from source directory\n" msgstr "" @@ -69,35 +69,39 @@ msgstr "" #, c-format -msgid "%d m" +msgid "%d feet" msgstr "" #, c-format -msgid "in %d m" +msgid "in %d feet" msgstr "" #, c-format -msgid "%d feet" +msgid "%d.%d miles" msgstr "" #, c-format -msgid "in %d feet" +msgid "in %d.%d miles" msgstr "" #, c-format -msgid "%d meters" -msgstr "" +msgid "one mile" +msgid_plural "%d miles" +msgstr[0] "" +msgstr[1] "" #, c-format -msgid "in %d meters" -msgstr "" +msgid "in one mile" +msgid_plural "in %d miles" +msgstr[0] "" +msgstr[1] "" #, c-format -msgid "%d.%d miles" +msgid "%d meters" msgstr "" #, c-format -msgid "in %d.%d miles" +msgid "in %d meters" msgstr "" #, c-format @@ -109,18 +113,6 @@ msgstr "" #, c-format -msgid "one mile" -msgid_plural "%d miles" -msgstr[0] "" -msgstr[1] "" - -#, c-format -msgid "in one mile" -msgid_plural "in %d miles" -msgstr[0] "" -msgstr[1] "" - -#, c-format msgid "one kilometer" msgid_plural "%d kilometers" msgstr[0] "" Modified: trunk/navit/po/cs.po.in =================================================================== --- trunk/navit/po/cs.po.in 2015-07-27 16:14:48 UTC (rev 6128) +++ trunk/navit/po/cs.po.in 2015-07-27 17:34:32 UTC (rev 6129) @@ -20,14 +20,14 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2015-03-15 14:56+0000\n" +"PO-Revision-Date: 2015-07-19 03:57+0000\n" "Last-Translator: Jakuje <ja...@gm...>\n" "Language-Team: Čeština\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"Language: \n" +"Language: cs\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -82,14 +82,6 @@ msgstr "šestý výjezd" #, c-format -msgid "%d m" -msgstr "%d m" - -#, c-format -msgid "in %d m" -msgstr "za %d m" - -#, c-format msgid "%d feet" msgstr "%d stop" @@ -98,14 +90,6 @@ msgstr "za %d stop" #, c-format -msgid "%d meters" -msgstr "%d metrů" - -#, c-format -msgid "in %d meters" -msgstr "za %d metrů" - -#, c-format msgid "%d.%d miles" msgstr "%d.%d mílí" @@ -114,14 +98,6 @@ msgstr "za %d.%d mílí" #, c-format -msgid "%d.%d kilometers" -msgstr "%d.%d kilometrů" - -#, c-format -msgid "in %d.%d kilometers" -msgstr "za %d.%d kilometrů" - -#, c-format msgid "one mile" msgid_plural "%d miles" msgstr[0] "%d míle" @@ -136,6 +112,22 @@ msgstr[2] "za %d mílí" #, c-format +msgid "%d meters" +msgstr "%d metrů" + +#, c-format +msgid "in %d meters" +msgstr "za %d metrů" + +#, c-format +msgid "%d.%d kilometers" +msgstr "%d.%d kilometrů" + +#, c-format +msgid "in %d.%d kilometers" +msgstr "za %d.%d kilometrů" + +#, c-format msgid "one kilometer" msgid_plural "%d kilometers" msgstr[0] "%d kilometr" @@ -152,51 +144,51 @@ #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name #, c-format msgid "%1$sonto the %2$s%3$s%4$s" -msgstr "" +msgstr "%1$sna %2$s%3$s%4$s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name #, c-format msgid "%1$sonto %2$s" -msgstr "" +msgstr "%1$sna %2$s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%1$sonto %2$s|masculine form" -msgstr "" +msgstr "%1$sna %2$s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%1$sonto %2$s|feminine form" -msgstr "" +msgstr "%1$sna %2$s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%1$sonto %2$s|neuter form" -msgstr "" +msgstr "%1$sna %2$s" #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. msgid "onto the motorway ramp" -msgstr "" +msgstr "na přivadeč" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format msgid "%sinto %s%s%s" -msgstr "" +msgstr "%sdo %s%s%s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|masculine form" -msgstr "" +msgstr "%sdo %s%s%s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|feminine form" -msgstr "" +msgstr "%sdo %s%s%s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|neuter form" -msgstr "" +msgstr "%sdo %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format @@ -226,12 +218,12 @@ #. 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 "" +msgstr "pak sjeďte na %1$s %2$s" #. 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 "" +msgstr "Sjeďte na %1$s %2$s" msgid "soon" msgstr "brzy" @@ -240,7 +232,7 @@ msgstr "nyní" msgid "then" -msgstr "" +msgstr "pak" #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format @@ -343,25 +335,25 @@ #. 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 "" +msgstr "Zabočte %1$s%2$s %3$s%4$s" #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|left" -msgstr "" +msgstr "pak otočte se" #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|left" -msgstr "" +msgstr "Otočte se %1$s" #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|right" -msgstr "" +msgstr "pak otočte se" #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|right" -msgstr "" +msgstr "Otočte se %1$s" #. An empty placeholder that we can use in the future for #. * some motorway commands that are now suppressed but we @@ -391,7 +383,7 @@ msgstr "" msgid "Exit" -msgstr "" +msgstr "Ukončit" #. Android resource: @strings/position_popup_title msgid "Position" Modified: trunk/navit/po/cy.po.in =================================================================== --- trunk/navit/po/cy.po.in 2015-07-27 16:14:48 UTC (rev 6128) +++ trunk/navit/po/cy.po.in 2015-07-27 17:34:32 UTC (rev 6129) @@ -2,6 +2,7 @@ # Copyright (C) 2006-2015 The Navit Team # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: +# Michael von Glasow https://launchpad.net/~michael-vonglasow # Padi Phillips https://launchpad.net/~padi # Simon Hewison https://launchpad.net/~simon-hewison-6 @@ -9,8 +10,8 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2015-01-18 20:41+0000\n" -"Last-Translator: Padi Phillips <Unknown>\n" +"PO-Revision-Date: 2015-07-19 03:57+0000\n" +"Last-Translator: Michael von Glasow <Unknown>\n" "Language-Team: Welsh <cy...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -71,35 +72,39 @@ msgstr "allanfa chweched" #, c-format -msgid "%d m" +msgid "%d feet" msgstr "" #, c-format -msgid "in %d m" +msgid "in %d feet" msgstr "" #, c-format -msgid "%d feet" +msgid "%d.%d miles" msgstr "" #, c-format -msgid "in %d feet" +msgid "in %d.%d miles" msgstr "" #, c-format -msgid "%d meters" -msgstr "" +msgid "one mile" +msgid_plural "%d miles" +msgstr[0] "" +msgstr[1] "" #, c-format -msgid "in %d meters" -msgstr "" +msgid "in one mile" +msgid_plural "in %d miles" +msgstr[0] "" +msgstr[1] "" #, c-format -msgid "%d.%d miles" +msgid "%d meters" msgstr "" #, c-format -msgid "in %d.%d miles" +msgid "in %d meters" msgstr "" #, c-format @@ -111,18 +116,6 @@ msgstr "" #, c-format -msgid "one mile" -msgid_plural "%d miles" -msgstr[0] "" -msgstr[1] "" - -#, c-format -msgid "in one mile" -msgid_plural "in %d miles" -msgstr[0] "" -msgstr[1] "" - -#, c-format msgid "one kilometer" msgid_plural "%d kilometers" msgstr[0] "un cilometr" @@ -378,7 +371,7 @@ msgstr "" msgid "Exit" -msgstr "" +msgstr "Allanfa" #. Android resource: @strings/position_popup_title msgid "Position" Modified: trunk/navit/po/da.po.in =================================================================== --- trunk/navit/po/da.po.in 2015-07-27 16:14:48 UTC (rev 6128) +++ trunk/navit/po/da.po.in 2015-07-27 17:34:32 UTC (rev 6129) @@ -16,14 +16,14 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2013-09-28 01:40+0000\n" +"PO-Revision-Date: 2015-07-19 03:57+0000\n" "Last-Translator: Lasse Luttermann <lut...@si...>\n" "Language-Team: Glenn Sommer <gl...@gm...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: \n" +"Language: da\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -78,14 +78,6 @@ msgstr "sjette afkørsel" #, c-format -msgid "%d m" -msgstr "%d m" - -#, c-format -msgid "in %d m" -msgstr "om %d m" - -#, c-format msgid "%d feet" msgstr "" @@ -94,14 +86,6 @@ msgstr "" #, c-format -msgid "%d meters" -msgstr "%d meter" - -#, c-format -msgid "in %d meters" -msgstr "om %d meter" - -#, c-format msgid "%d.%d miles" msgstr "" @@ -110,14 +94,6 @@ msgstr "" #, c-format -msgid "%d.%d kilometers" -msgstr "%d.%d kilometer" - -#, c-format -msgid "in %d.%d kilometers" -msgstr "om %d.%d kilometer" - -#, c-format msgid "one mile" msgid_plural "%d miles" msgstr[0] "" @@ -130,6 +106,22 @@ msgstr[1] "" #, c-format +msgid "%d meters" +msgstr "%d meter" + +#, c-format +msgid "in %d meters" +msgstr "om %d meter" + +#, c-format +msgid "%d.%d kilometers" +msgstr "%d.%d kilometer" + +#, c-format +msgid "in %d.%d kilometers" +msgstr "om %d.%d kilometer" + +#, c-format msgid "one kilometer" msgid_plural "%d kilometers" msgstr[0] "én kilometer" @@ -168,27 +160,27 @@ #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. msgid "onto the motorway ramp" -msgstr "" +msgstr "op på rampen" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format msgid "%sinto %s%s%s" -msgstr "" +msgstr "%sind i %s%s%s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|masculine form" -msgstr "" +msgstr "%sind i %s%s%s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|feminine form" -msgstr "" +msgstr "%sind i %s%s%s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|neuter form" -msgstr "" +msgstr "%sind i %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format @@ -213,17 +205,17 @@ #. TRANSLATORS: %s is the distance to the roundabout #, c-format msgid "Enter the roundabout %s" -msgstr "" +msgstr "Kør ind i rundkørslen %s" #. 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 "" +msgstr "forlad så rundkørslen ved den %1$s %2$s" #. 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 "" +msgstr "Forlad rundkørslen ved den %1$s %2$s" msgid "soon" msgstr "snart" @@ -232,7 +224,7 @@ msgstr "nu" msgid "then" -msgstr "" +msgstr "så" #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format @@ -263,12 +255,12 @@ #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format msgid "Take exit %1$s %2$s %3$s" -msgstr "" +msgstr "Tag den afkørslen %1$s %2$s %3$s" #. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format msgid "Take the exit %1$s %2$s%3$s" -msgstr "" +msgstr "Tag den afkørslen %1$s %2$s%3$s" #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" msgid "at interchange" @@ -335,25 +327,25 @@ #. 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 "" +msgstr "Drej %1$s%2$s %3$s%4$s" #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|left" -msgstr "" +msgstr "vend så om" #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|left" -msgstr "" +msgstr "Vend om %1$s" #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|right" -msgstr "" +msgstr "vend så om" #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|right" -msgstr "" +msgstr "Vend om %1$s" #. An empty placeholder that we can use in the future for #. * some motorway commands that are now suppressed but we @@ -368,7 +360,7 @@ #. * #. msgid "follow" -msgstr "" +msgstr "følg" msgid "then you have reached your destination." msgstr "og så ankommer du til din destination" @@ -380,10 +372,10 @@ #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" msgid "Interchange" -msgstr "" +msgstr "Motorvejskryds" msgid "Exit" -msgstr "" +msgstr "Afkørsel" #. Android resource: @strings/position_popup_title msgid "Position" Modified: trunk/navit/po/de.po.in =================================================================== --- trunk/navit/po/de.po.in 2015-07-27 16:14:48 UTC (rev 6128) +++ trunk/navit/po/de.po.in 2015-07-27 17:34:32 UTC (rev 6129) @@ -22,6 +22,7 @@ # Mathias Klein https://launchpad.net/~ma-klein # Paulodile https://launchpad.net/~stuff4tschaka # Roadrunner IN https://launchpad.net/~online +# Robotaxi https://launchpad.net/~robotaxi # Roschkor https://launchpad.net/~bound-one2000 # S.E. https://launchpad.net/~stephan-evert # Stefan Sordon https://launchpad.net/~stefan-sordon @@ -39,14 +40,14 @@ msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2015-04-22 22:10+0000\n" +"PO-Revision-Date: 2015-07-20 21:54+0000\n" "Last-Translator: Mathias Klein <ma_...@gm...>\n" "Language-Team: Martin Schaller <mar...@so...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: \n" +"Language: de\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -101,22 +102,34 @@ msgstr "sechsten Ausfahrt" #, c-format -msgid "%d m" -msgstr "%d m" +msgid "%d feet" +msgstr "%d Fuss" #, c-format -msgid "in %d m" -msgstr "in %d m" +msgid "in %d feet" +msgstr "In %d Fuss" #, c-format -msgid "%d feet" -msgstr "%d Fuss" +msgid "%d.%d miles" +msgstr "%d,%d Meilen" #, c-format -msgid "in %d feet" -msgstr "in %d Fuss" +msgid "in %d.%d miles" +msgstr "In %d,%d Meilen" #, c-format +msgid "one mile" +msgid_plural "%d miles" +msgstr[0] "eine Meile" +msgstr[1] "%d Meilen" + +#, c-format +msgid "in one mile" +msgid_plural "in %d miles" +msgstr[0] "In einer Meile" +msgstr[1] "In %d Meilen" + +#, c-format msgid "%d meters" msgstr "%d Meter" @@ -125,14 +138,6 @@ msgstr "In %d Metern" #, c-format -msgid "%d.%d miles" -msgstr "%d.%d Meilen" - -#, c-format -msgid "in %d.%d miles" -msgstr "in %d.%d Meilen" - -#, c-format msgid "%d.%d kilometers" msgstr "%d,%d Kilometer" @@ -141,18 +146,6 @@ msgstr "In %d,%d Kilometern" #, c-format -msgid "one mile" -msgid_plural "%d miles" -msgstr[0] "eine Meile" -msgstr[1] "%d Meilen" - -#, c-format -msgid "in one mile" -msgid_plural "in %d miles" -msgstr[0] "in einer Meile" -msgstr[1] "in %d Meilen" - -#, c-format msgid "one kilometer" msgid_plural "%d kilometers" msgstr[0] "einen Kilometer" @@ -167,51 +160,51 @@ #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name #, c-format msgid "%1$sonto the %2$s%3$s%4$s" -msgstr "" +msgstr "%1$sauf die %2$s%3$s%4$s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name #, c-format msgid "%1$sonto %2$s" -msgstr "" +msgstr "%1$sauf die Straße %2$s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%1$sonto %2$s|masculine form" -msgstr "" +msgstr "%1$sauf den %2$s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%1$sonto %2$s|feminine form" -msgstr "" +msgstr "%1$sauf die %2$s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%1$sonto %2$s|neuter form" -msgstr "" +msgstr "%1$sauf das %2$s" #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. msgid "onto the motorway ramp" -msgstr "" +msgstr "auf die Auffahrt" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format msgid "%sinto %s%s%s" -msgstr "" +msgstr "%sauf die Straße %s%s%s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|masculine form" -msgstr "" +msgstr "%sauf den %s%s%s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|feminine form" -msgstr "" +msgstr "%sauf die %s%s%s" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|neuter form" -msgstr "" +msgstr "%sauf das %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format @@ -225,7 +218,7 @@ #. TRANSLATORS: the argument is the destination to follow #, c-format msgid "towards %s" -msgstr "" +msgstr "Richtung %s" #, c-format msgid "Follow the road for the next %s" @@ -237,17 +230,17 @@ #. TRANSLATORS: %s is the distance to the roundabout #, c-format msgid "Enter the roundabout %s" -msgstr "" +msgstr "%s in den Kreisverkehr einfahren" #. 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 "" +msgstr "anschließend verlassen Sie den Kreisverkehr an der %1$s %2$s" #. 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 "" +msgstr "Verlassen Sie den Kreisverkehr an der %1$s %2$s" msgid "soon" msgstr "Demnächst" @@ -256,80 +249,80 @@ msgstr "Jetzt" msgid "then" -msgstr "" +msgstr "dann" #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format msgid "then merge%1$s|right" -msgstr "" +msgstr "dann auf die%1$s auffahren" #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format msgid "Merge %1$s%2$s|right" -msgstr "" +msgstr "Fahren Sie %1$s%2$s auf" #. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format msgid "then merge%1$s|left" -msgstr "" +msgstr "dann auf die%1$s auffahren" #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format msgid "Merge %1$s%2$s|left" -msgstr "" +msgstr "Fahren Sie %1$s%2$s auf" msgid "on your left" -msgstr "" +msgstr "links" msgid "on your right" -msgstr "" +msgstr "rechts" #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format msgid "Take exit %1$s %2$s %3$s" -msgstr "" +msgstr "%3$s nehmen Sie %2$s die Ausfahrt %1$s" #. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format msgid "Take the exit %1$s %2$s%3$s" -msgstr "" +msgstr "%2$s nehmen Sie %1$s die Ausfahrt %3$s" #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" msgid "at interchange" -msgstr "" +msgstr "am Autobahnknoten" msgid "at exit" -msgstr "" +msgstr "an der Ausfahrt" #. TRANSLATORS: the arg. is where to do the maneuver #, c-format msgid "then continue straight%1$s" -msgstr "" +msgstr "dann%1$s geradeaus fahren" #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format msgid "Continue straight %1$s%2$s%3$s" -msgstr "" +msgstr "%1$s%2$s geradeaus fahren%3$s" #. TRANSLATORS: the arg. is where to do the maneuver #, c-format msgid "then keep right%1$s" -msgstr "" +msgstr "dann rechts halten%1$s" #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format msgid "Keep right %1$s%2$s%3$s" -msgstr "" +msgstr "%1$s rechts halten%2$s%3$s" #. TRANSLATORS: the arg. is where to do the maneuver #, c-format msgid "then keep left%1$s" -msgstr "" +msgstr "dann links halten%1$s" #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format msgid "Keep left %1$s%2$s%3$s" -msgstr "" +msgstr "%1$s links halten%2$s%3$s" #. TRANSLATORS: "right" as in "turn right" msgid "right" @@ -363,21 +356,21 @@ #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|left" -msgstr "" +msgstr "dann wenden" #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|left" -msgstr "" +msgstr "Wenden Sie %1$s" #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|right" -msgstr "" +msgstr "dann wenden" #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|right" -msgstr "" +msgstr "Wenden Sie %1$s" #. An empty placeholder that we can use in the future for #. * some motorway commands that are now suppressed but we @@ -392,7 +385,7 @@ #. * #. msgid "follow" -msgstr "" +msgstr "folgen" msgid "then you have reached your destination." msgstr "dann haben Sie Ihr Ziel erreicht." @@ -404,10 +397,10 @@ #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" msgid "Interchange" -msgstr "" +msgstr "Autobahnknoten" msgid "Exit" -msgstr "" +msgstr "Ausfahrt" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1477,6 +1470,16 @@ "\t-h: print this usage info and exit.\n" "\t-v: print the version and exit.\n" msgstr "" +"navit Verwendung:\n" +"navit [Option] [configfile]\n" +"\t-c <Datei>: benutze <Datei> als Konfigurationsdatei, anstatt der " +"Standardkonfigurationsdatei.\n" +"\t-d <n>: setze den globalen debug-level auf <n> (0=Fehler, 1=Warnung, " +"2=Info, 3=Debug).\n" +"\tEinstellungen der Konfigurationsdatei werden weiterhin gültig sein, wenn " +"sie einen höheren Wert angeben.\n" +"\t-h: zeige diesen Hilfetext und beende.\n" +"\t-v: zeige die Version und beende.\n" #. We have not found an existing config file from all possibilities msgid "No config file navit.xml, navit.xml.local found\n" @@ -2074,6 +2077,9 @@ "Please restart Navit after you attach an SD card or select a different map " "location." msgstr "" +"Der Speicherpfad für die Karte ist nicht verfügbar.\n" +"Setzen Sie eine SD Karte ein und starten Sie Navit erneut\n" +"oder wählen Sie einen anderen Pfad aus." msgid "Downloaded maps" msgstr "Heruntergeladene Karten" @@ -2095,6 +2101,8 @@ "New location set to %s\n" "Restart Navit to apply the changes." msgstr "" +"Karten-Speicherort ist %s\n" +"Starten Sie Navit erneut." msgid "Whole Planet" msgstr "Ganze Welt" @@ -2657,7 +2665,7 @@ #. Android resource: @strings/optionsmenu_set_map_location msgid "Set map location" -msgstr "" +msgstr "Kartenort festlegen" #. Android resource: @strings/map_delete msgid "Delete this map?" @@ -2745,7 +2753,7 @@ #. Android resource: @strings/backup_failed msgid "Backup failed" -msgstr "Sicherung Fehlgeschlagen" +msgstr "Sicherung fehlgeschlagen" #. Android resource: @strings/no_backup_found msgid "No backup found" @@ -2797,3 +2805,12 @@ "currently selected engine reports it is unable to speak in your language. " "Should we ask the system to show voice download dialog?" msgstr "" +"Navit kann jede text-to-speech engine nutzen, die installiert ist. Die\r\n" +"derzeit angewählte engine kann Ihre Sprache nicht wiedergeben.\r\n" +"Soll das System den Voice-Download Dialog öffnen?" + +#~ msgid "%d m" +#~ msgstr "%d m" + +#~ msgid "in %d m" +#~ msgstr... [truncated message content] |
From: <md...@us...> - 2015-07-27 16:14:51
|
Revision: 6128 http://sourceforge.net/p/navit/code/6128 Author: mdankov Date: 2015-07-27 16:14:48 +0000 (Mon, 27 Jul 2015) Log Message: ----------- Fix:maptool:Properly handle (ignore, but report) unknown o5m tags, silently ignore o5m file timestamp (0xdc). Modified Paths: -------------- trunk/navit/navit/maptool/osm_o5m.c Modified: trunk/navit/navit/maptool/osm_o5m.c =================================================================== --- trunk/navit/navit/maptool/osm_o5m.c 2015-07-14 23:04:05 UTC (rev 6127) +++ trunk/navit/navit/maptool/osm_o5m.c 2015-07-27 16:14:48 UTC (rev 6128) @@ -335,7 +335,17 @@ break; default: fprintf(stderr,"Unknown tag 0x%x\n",c); - return 0; + /* Fall through */ + case 0xdc: /* File timestamp: silently ignore it */ + len=get_uval(&o.buffer_start); + if (o.buffer_start > o.buffer_end) { + return 0; + } + if (buffer_end(&o, len)) { + return 0; + } + o.buffer_start+=len; + break; } } return 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2015-07-16 01:46:08
|
Revision: 6128 http://sourceforge.net/p/navit/code/6128 Author: kazer_ Date: 2015-07-16 01:46:05 +0000 (Thu, 16 Jul 2015) Log Message: ----------- Update:Vehicle:handle gpsd >= 3.11, thanks greg42 for the patch Modified Paths: -------------- trunk/navit/navit/vehicle/gpsd/vehicle_gpsd.c Modified: trunk/navit/navit/vehicle/gpsd/vehicle_gpsd.c =================================================================== --- trunk/navit/navit/vehicle/gpsd/vehicle_gpsd.c 2015-07-14 23:04:05 UTC (rev 6127) +++ trunk/navit/navit/vehicle/gpsd/vehicle_gpsd.c 2015-07-16 01:46:05 UTC (rev 6128) @@ -130,7 +130,11 @@ #else for( i=0;i<data->satellites;i++) { #endif +#if GPSD_API_MAJOR_VERSION >= 6 + if (data->skyview[i].ss > 0) +#else if (data->ss[i] > 0) +#endif sats_signal++; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2015-07-14 23:04:07
|
Revision: 6127 http://sourceforge.net/p/navit/code/6127 Author: kazer_ Date: 2015-07-14 23:04:05 +0000 (Tue, 14 Jul 2015) Log Message: ----------- Fix:Core:Merge Robotaxi's PR for imperial units Modified Paths: -------------- trunk/navit/navit/navigation.c trunk/navit/navit/navigation.h trunk/navit/navit/osd/core/osd_core.c Modified: trunk/navit/navit/navigation.c =================================================================== --- trunk/navit/navit/navigation.c 2015-07-05 15:00:40 UTC (rev 6126) +++ trunk/navit/navit/navigation.c 2015-07-14 23:04:05 UTC (rev 6127) @@ -193,6 +193,9 @@ int flags; }; +/** @brief Set of simplified distance values that are easy to be pronounced. +* Used for the 'vocabulary_distances' configuration. +*/ int distances[]={1,2,3,4,5,10,25,50,75,100,150,200,250,300,400,500,750,-1}; @@ -916,109 +919,161 @@ return dist*10000; } +/** @brief Returns the last element of the simplified numbers containing a distance value. +* @return value with the highest distance. +*/ static int -round_for_vocabulary(int vocabulary, int dist, int factor) +distance_set_last() { - if (!(vocabulary & 256)) { - if (factor != 1) - dist=(dist+factor/2)/factor; - } else - factor=1; - if (!(vocabulary & 255)) { - int i=0,d=0,m=0; - while (distances[i] > 0) { - if (!i || abs(distances[i]-dist) <= d) { - d=abs(distances[i]-dist); - m=i; - } - if (distances[i] > dist) - break; + static int i=0; + if (i == 0) { + while (distances[i] > 0) i++; - } - dbg(lvl_debug,"converted %d to %d with factor %d\n",dist,distances[m],factor); - dist=distances[m]; } - return dist*factor; + return distances[i-1]; } +/** @brief Restricts the distance value to a simple set of pronounceable numbers. +* @param dist The distance to be processed +* @return distance Simplified distance value +*/ static int -vocabulary_last(int vocabulary) +round_distance_reduced( int dist ) { - int i=0; - if (vocabulary == 65535) - return 1000; - while (distances[i] > 0) + int factor = 1; + if (dist > distance_set_last()) + { + dist=(dist+500)/1000; + factor = 1000; + } + + int i=0,d=0,m=0; + while (distances[i] > 0) { + if (!i || abs(distances[i]-dist) <= d) { + d=abs(distances[i]-dist); + m=i; + } + if (distances[i] > dist) + break; i++; - return distances[i-1]; + } + dbg(lvl_debug,"converted %d to %d with factor %d\n",dist,distances[m],factor); + return distances[m] * factor; + } + +/** @brief Generates the distance string. +* Considers the configuration of 'imperial' units and 'vocabulary_distances'. +* 'imperial' if set distinguishes the distance statement between miles and feet. Maximum distance in feet is 500. +* 'vocabulary_distances' if set constrains the distance values to a set of simple pronounceable numbers. +* +* @param nav The navigation object. +* @param dist Distance in meters. +* @param type The type of announcement precision. +* @param is_length 1 for length statement, 0 for distance statement. +* @return String with length/distance statement. +*/ static char * -get_distance(struct navigation *nav, int dist, enum attr_type type, int is_length) +get_distance_str(struct navigation *nav, int dist_meters, enum attr_type type, int is_length) { - int imperial=0,vocabulary=65535; + int imperial=0,vocabulary=1; /* default configuration */ + + /* Get configuration */ struct attr attr; - - if (type == attr_navigation_long_exact) { - if (is_length) - return g_strdup_printf(_("%d m"), dist); - else - return g_strdup_printf(_("in %d m"), dist); - } if (navit_get_attr(nav->navit, attr_imperial, &attr, NULL)) imperial=attr.u.num; if (nav->speech && speech_get_attr(nav->speech, attr_vocabulary_distances, &attr, NULL)) vocabulary=attr.u.num; + /****************************/ + if (imperial) { - if (dist*FEET_PER_METER < vocabulary_last(vocabulary)) { - dist=round_for_vocabulary(vocabulary, dist*FEET_PER_METER, 1); + + int dist_feet = dist_meters * FEET_PER_METER; + + if (vocabulary > 0) + { + /* normal statement */ + if (type != attr_navigation_long_exact) + dist_feet = round_distance(dist_feet); + } + else + { + /* statement with reduced vocabularies */ + dist_feet = round_distance_reduced(dist_feet); + } + + // check for statement in feet + if (dist_feet <= 500) + { if (is_length) - return g_strdup_printf(_("%d feet"), dist); + return g_strdup_printf(_("%d feet"), dist_feet); else - return g_strdup_printf(_("in %d feet"), dist); + return g_strdup_printf(_("in %d feet"), dist_feet); } + + int dist_miles = (double) dist_meters / (double)METERS_PER_MILE + 0.5; + + if (vocabulary == 0) + { + /* statement with reduced vocabularies */ + dist_miles = round_distance_reduced(dist_miles); + } + + if ((dist_meters < METERS_PER_MILE) && (vocabulary > 0)) + { + /* values smaller than one need extra treatment for one decimal place. For reduced vocabulary it shall remain 'one'. */ + int rem = (((double)dist_meters / (double)METERS_PER_MILE) + 0.05) * 10.0; + dist_miles= 0; + if (is_length) + return g_strdup_printf(_("%d.%d miles"), dist_miles, rem); + else + return g_strdup_printf(_("in %d.%d miles"), dist_miles, rem); + } + + if (is_length) + return g_strdup_printf(navit_nls_ngettext("one mile","%d miles", dist_miles), dist_miles); + else + return g_strdup_printf(navit_nls_ngettext("in one mile","in %d miles", dist_miles), dist_miles); + } else { - if (dist < vocabulary_last(vocabulary)) { - dist=round_for_vocabulary(vocabulary, dist, 1); + + if (vocabulary > 0) + { + /* normal statement */ + if (type != attr_navigation_long_exact) + dist_meters = round_distance(dist_meters); + } + else + { + /* statement with reduced vocabularies */ + dist_meters = round_distance_reduced(dist_meters); + } + + if (dist_meters < 1000) + { if (is_length) - return g_strdup_printf(_("%d meters"), dist); + return g_strdup_printf(_("%d meters"), dist_meters); else - return g_strdup_printf(_("in %d meters"), dist); + return g_strdup_printf(_("in %d meters"), dist_meters); } - } - if (imperial) - dist=round_for_vocabulary(vocabulary, dist*FEET_PER_METER*1000/FEET_PER_MILE, 1000); - else - dist=round_for_vocabulary(vocabulary, dist, 1000); - if (dist < 5000) { - int rem=(dist/100)%10; - if (rem) { - if (imperial) { + if (dist_meters < 5000) { + /* Distances below 5 km shall be announced with one decimal place. */ + int rem=(dist_meters/100)%10; + if (rem) { if (is_length) - return g_strdup_printf(_("%d.%d miles"), dist/1000, rem); + return g_strdup_printf(_("%d.%d kilometers"), dist_meters/1000, rem); else - return g_strdup_printf(_("in %d.%d miles"), dist/1000, rem); - } else { - if (is_length) - return g_strdup_printf(_("%d.%d kilometers"), dist/1000, rem); - else - return g_strdup_printf(_("in %d.%d kilometers"), dist/1000, rem); + return g_strdup_printf(_("in %d.%d kilometers"), dist_meters/1000, rem); } } - } - if (imperial) { - if (is_length) - return g_strdup_printf(navit_nls_ngettext("one mile","%d miles", dist/1000), dist/1000); + if (is_length) + return g_strdup_printf(navit_nls_ngettext("one kilometer","%d kilometers", dist_meters/1000), dist_meters/1000); else - return g_strdup_printf(navit_nls_ngettext("in one mile","in %d miles", dist/1000), dist/1000); - } else { - if (is_length) - return g_strdup_printf(navit_nls_ngettext("one kilometer","%d kilometers", dist/1000), dist/1000); - else - return g_strdup_printf(navit_nls_ngettext("in one kilometer","in %d kilometers", dist/1000), dist/1000); + return g_strdup_printf(navit_nls_ngettext("in one kilometer","in %d kilometers", dist_meters/1000), dist_meters/1000); } } - /** * @brief Initializes a navigation_way * @@ -1727,7 +1782,7 @@ mselexit.order = 18; map_rect_destroy(mr); - mr = map_rect_new (tmap, &mselexit); + mr = map_rect_new(tmap, &mselexit); while ((rampitem=map_rect_get_item(mr))) { @@ -2750,7 +2805,7 @@ { struct navigation_command *ret=g_new0(struct navigation_command, 1); struct navigation_way *w; /* the way in which to turn. */ - int more_ways_for_strength = 0; /* Counts the number of ways of the current node that turn + int more_ways_for_strength = 0; /* Counts the number of ways of the current node that turn to the same direction as the route way. Strengthening criterion. */ int turn_no_of_route_way = 0; /* The number of the route way of all ways that turn to the same direction. Count direction from abs(0 degree) up to abs(180 degree). Strengthening criterion. */ @@ -3257,12 +3312,12 @@ switch (level) { case 3: - d=get_distance(nav, distance, type, 1); + d=get_distance_str(nav, distance, type, 1); return g_strdup_printf(_("Follow the road for the next %s"), d); case 2: return g_strdup(_("Enter the roundabout soon")); case 1: - d = get_distance(nav, distance, type, 0); + d = get_distance_str(nav, distance, attr_navigation_short, 0); /* TRANSLATORS: %s is the distance to the roundabout */ ret = g_strdup_printf(_("Enter the roundabout %s"), d); g_free(d); @@ -3308,7 +3363,7 @@ d=g_strdup(_("soon")); break; case 1 : - d=get_distance(nav, distance, attr_navigation_short, 0); + d=get_distance_str(nav, distance, attr_navigation_short, 0); break; case 0 : d=g_strdup(_("now")); @@ -3518,7 +3573,7 @@ switch (level) { case 3: - d=get_distance(nav, distance, type, 1); + d=get_distance_str(nav, distance, type, 1); ret=g_strdup_printf(_("Follow the road for the next %s"), d); break; case 2: Modified: trunk/navit/navit/navigation.h =================================================================== --- trunk/navit/navit/navigation.h 2015-07-05 15:00:40 UTC (rev 6126) +++ trunk/navit/navit/navigation.h 2015-07-14 23:04:05 UTC (rev 6127) @@ -20,8 +20,9 @@ #ifndef NAVIT_NAVIGATION_H #define NAVIT_NAVIGATION_H -#define FEET_PER_METER 3.2808399 -#define FEET_PER_MILE 5280 +#define FEET_PER_METER 3.2808399 +#define FEET_PER_MILE 5280 +#define METERS_PER_MILE 1609 #ifdef __cplusplus extern "C" { Modified: trunk/navit/navit/osd/core/osd_core.c =================================================================== --- trunk/navit/navit/osd/core/osd_core.c 2015-07-05 15:00:40 UTC (rev 6126) +++ trunk/navit/navit/osd/core/osd_core.c 2015-07-14 23:04:05 UTC (rev 6127) @@ -150,7 +150,7 @@ { if (imperial){ distance *= FEET_PER_METER; - if(distance <= 1500){ + if(distance <= 500){ return g_strdup_printf("%.0f%sft", round(distance / 10) * 10, sep); } else { return g_strdup_printf("%.1f%smi", distance / FEET_PER_MILE, sep); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <md...@us...> - 2015-07-05 15:00:43
|
Revision: 6126 http://sourceforge.net/p/navit/code/6126 Author: mdankov Date: 2015-07-05 15:00:40 +0000 (Sun, 05 Jul 2015) Log Message: ----------- Add:port_android:Support raster maps on Android as described in #1285.|Thank you jandegr Modified Paths: -------------- trunk/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java trunk/navit/navit/graphics/android/graphics_android.c Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java =================================================================== --- trunk/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java 2015-07-04 23:27:12 UTC (rev 6125) +++ trunk/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java 2015-07-05 15:00:40 UTC (rev 6126) @@ -27,6 +27,7 @@ import android.content.Context; import android.graphics.Bitmap; import android.graphics.Canvas; +import android.graphics.Matrix; import android.graphics.Paint; import android.graphics.Path; import android.graphics.PointF; @@ -931,6 +932,48 @@ draw_canvas.drawBitmap(bitmap, x, y, paint); } + /* takes an image and draws it on the screen as a prerendered maptile + * + * + * + * @param paint Paint object used to draw the image + * @param count the number of points specified + * @param p0x and p0y specifying the top left point + * @param p1x and p1y specifying the top right point + * @param p2x and p2y specifying the bottom left point, not yet used but kept + * for compatibility with the linux port + * @param bitmap Bitmap object holding the image to draw + * + * TODO make it work with 4 points specified to make it work for 3D mapview, so it can be used + * for small but very detailed maps as well as for large maps with very little detail but large + * coverage. + * TODO make it work with rectangular tiles as well ? + */ + protected void draw_image_warp(Paint paint, int count, int p0x, int p0y, int p1x, int p1y, int p2x, int p2y, Bitmap bitmap) + { + + float width; + float scale; + float deltaY; + float deltaX; + float angle; + Matrix matrix; + + if (count == 3) + { + matrix = new Matrix(); + deltaX = p1x - p0x; + deltaY = p1y - p0y; + width = (float) (Math.sqrt((deltaX * deltaX) + (deltaY * deltaY))); + angle = (float) (Math.atan2(deltaY, deltaX) * 180d / Math.PI); + scale = width / bitmap.getWidth(); + matrix.preScale(scale, scale); + matrix.postTranslate(p0x, p0y); + matrix.postRotate(angle, p0x, p0y); + draw_canvas.drawBitmap(bitmap, matrix, paint); + } + } + /* These constants must be synchronized with enum draw_mode_num in graphics.h. */ public static final int draw_mode_begin = 0; public static final int draw_mode_end = 1; Modified: trunk/navit/navit/graphics/android/graphics_android.c =================================================================== --- trunk/navit/navit/graphics/android/graphics_android.c 2015-07-04 23:27:12 UTC (rev 6125) +++ trunk/navit/navit/graphics/android/graphics_android.c 2015-07-05 15:00:40 UTC (rev 6126) @@ -36,7 +36,10 @@ struct graphics_priv { jclass NavitGraphicsClass; - jmethodID NavitGraphics_draw_polyline, NavitGraphics_draw_polygon, NavitGraphics_draw_rectangle, NavitGraphics_draw_circle, NavitGraphics_draw_text, NavitGraphics_draw_image, NavitGraphics_draw_mode, NavitGraphics_draw_drag, NavitGraphics_overlay_disable, NavitGraphics_overlay_resize, NavitGraphics_SetCamera; + jmethodID NavitGraphics_draw_polyline, NavitGraphics_draw_polygon, NavitGraphics_draw_rectangle, + NavitGraphics_draw_circle, NavitGraphics_draw_text, NavitGraphics_draw_image, + NavitGraphics_draw_image_warp, NavitGraphics_draw_mode, NavitGraphics_draw_drag, + NavitGraphics_overlay_disable, NavitGraphics_overlay_resize, NavitGraphics_SetCamera; jclass PaintClass; jmethodID Paint_init,Paint_setStrokeWidth,Paint_setARGB; @@ -373,6 +376,28 @@ } +static void +draw_image_warp (struct graphics_priv *gr, struct graphics_gc_priv *fg, struct point *p, int count, struct graphics_image_priv *img) +{ + + /* + * + * + * if coord count==3 then top.left top.right bottom.left + * + */ + + if (count==3) + { + initPaint(gr, fg); + (*jnienv)->CallVoidMethod(jnienv, gr->NavitGraphics, gr->NavitGraphics_draw_image_warp, fg->gra->Paint, + count, p[0].x, p[0].y,p[1].x, p[1].y, p[2].x, p[2].y, img->Bitmap); + } else + dbg(lvl_debug,"draw_image_warp is called with unsupported count parameter value %d\n", count); +} + + + static void draw_drag(struct graphics_priv *gra, struct point *p) { (*jnienv)->CallVoidMethod(jnienv, gra->NavitGraphics, gra->NavitGraphics_draw_drag, p ? p->x : 0, p ? p->y : 0); @@ -452,7 +477,7 @@ draw_circle, draw_text, draw_image, - NULL, + draw_image_warp, draw_drag, font_new, gc_new, @@ -642,6 +667,8 @@ return 0; if (!find_method(ret->NavitGraphicsClass, "draw_image", "(Landroid/graphics/Paint;IILandroid/graphics/Bitmap;)V", &ret->NavitGraphics_draw_image)) return 0; + if (!find_method(ret->NavitGraphicsClass, "draw_image_warp", "(Landroid/graphics/Paint;IIIIIIILandroid/graphics/Bitmap;)V", &ret->NavitGraphics_draw_image_warp)) + return 0; if (!find_method(ret->NavitGraphicsClass, "draw_mode", "(I)V", &ret->NavitGraphics_draw_mode)) return 0; if (!find_method(ret->NavitGraphicsClass, "draw_drag", "(II)V", &ret->NavitGraphics_draw_drag)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <md...@us...> - 2015-07-04 23:27:15
|
Revision: 6125 http://sourceforge.net/p/navit/code/6125 Author: mdankov Date: 2015-07-04 23:27:12 +0000 (Sat, 04 Jul 2015) Log Message: ----------- Add:core:Allow shell variables to be used in image names. Related to #1285. Modified Paths: -------------- trunk/navit/navit/graphics.c Modified: trunk/navit/navit/graphics.c =================================================================== --- trunk/navit/navit/graphics.c 2015-07-01 21:24:19 UTC (rev 6124) +++ trunk/navit/navit/graphics.c 2015-07-04 23:27:12 UTC (rev 6125) @@ -727,6 +727,9 @@ { struct graphics_image *this_; char* hash_key = g_strdup_printf("%s*%d*%d*%d",path,w,h,rotate); + struct file_wordexp *we; + int i; + char **paths; if ( g_hash_table_lookup_extended( gra->image_cache_hash, hash_key, NULL, (gpointer)&this_) ) { g_free(hash_key); @@ -738,15 +741,19 @@ this_->height=h; this_->width=w; - if(!this_->priv) { + we=file_wordexp_new(path); + paths=file_wordexp_get_array(we); + + for(i=0;i<file_wordexp_get_count(we) && !this_->priv;i++) { char *ext; char *s, *name; - int len=strlen(path); + char *pathi=paths[i]; + int len=strlen(pathi); int i,k; int newwidth=-1, newheight=-1; - ext=g_utf8_strrchr(path,-1,'.'); - i=path-ext+len; + ext=g_utf8_strrchr(pathi,-1,'.'); + i=pathi-ext+len; /* Dont allow too long or too short file name extensions*/ if(ext && ((i>5) || (i<1))) @@ -756,10 +763,10 @@ if(ext) s=ext-1; else - s=path+len; + s=pathi+len; k=1; - while(s>path && g_ascii_isdigit(*s)) { + while(s>pathi && g_ascii_isdigit(*s)) { if(newheight<0) newheight=0; newheight+=(*s-'0')*k; @@ -767,10 +774,10 @@ s--; } - if(k>1 && s>path && *s=='_') { + if(k>1 && s>pathi && *s=='_') { k=1; s--; - while(s>path && g_ascii_isdigit(*s)) { + while(s>pathi && g_ascii_isdigit(*s)) { if(newwidth<0) newwidth=0; newwidth+=(*s-'0')*k;; @@ -779,13 +786,13 @@ } } - if(k==1 || s<=path || *s!='_') { + if(k==1 || s<=pathi || *s!='_') { newwidth=-1; newheight=-1; if(ext) s=ext; else - s=path+len; + s=pathi+len; } @@ -795,16 +802,18 @@ if(h!=-1) newheight=h; - name=g_strndup(path,s-path); + name=g_strndup(pathi,s-pathi); #if 0 if (!strstr(name,"test.zip")) #endif - image_new_helper(gra, this_, path, name, newwidth, newheight, rotate, 0); - if (!this_->priv && strstr(path, ".zip/")) - image_new_helper(gra, this_, path, name, newwidth, newheight, rotate, 1); + image_new_helper(gra, this_, pathi, name, newwidth, newheight, rotate, 0); + if (!this_->priv && strstr(pathi, ".zip/")) + image_new_helper(gra, this_, pathi, name, newwidth, newheight, rotate, 1); g_free(name); } + file_wordexp_destroy(we); + if (! this_->priv) { dbg(lvl_error,"No image for '%s'\n", path); g_free(this_); @@ -2132,7 +2141,7 @@ if (img) dc->img=img; else - dbg(lvl_error,"failed to load icon '%s'\n", path); + dbg(lvl_debug,"failed to load icon '%s'\n", path); g_free(path); } if (img) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sl...@us...> - 2015-07-01 21:24:21
|
Revision: 6124 http://sourceforge.net/p/navit/code/6124 Author: sleske Date: 2015-07-01 21:24:19 +0000 (Wed, 01 Jul 2015) Log Message: ----------- Refactor:graphics_gtk_drawing_area:Remove out-ifdef-ed code (which was never active). Modified Paths: -------------- trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c Modified: trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c =================================================================== --- trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c 2015-06-28 21:57:52 UTC (rev 6123) +++ trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c 2015-07-01 21:24:19 UTC (rev 6124) @@ -318,7 +318,6 @@ { g=*gp++; if (g->w && g->h && bg ) { -#if 1 stride=g->w+2; shadow=g_malloc(stride*(g->h+2)); if (gr->freetype_methods.get_shadow(g, shadow, 8, stride, &white, &transparent)) @@ -331,17 +330,7 @@ gdk_draw_rgb_image(gr->drawable, fg->gc, ((x+g->x)>>6)-1, ((y+g->y)>>6)-1, g->w+2, g->h+2, GDK_RGB_DITHER_NONE, shadow, stride); g_free(shadow); } -#else - GdkImage *image; - stride=(g->w+9)/8; - shadow=malloc(stride*(g->h+2)); - gr->freetype_methods.get_shadow(g, shadow, 1, stride); - image=gdk_image_new_bitmap(gdk_visual_get_system(),shadow,g->w+2, g->h+2); - gdk_draw_image(gr->drawable, bg->gc, image, 0, 0, ((x+g->x)>>6)-1, ((y+g->y)>>6)-1, g->w+2, g->h+2); - g_object_unref(image); -#endif - } x+=g->dx; y+=g->dy; @@ -421,19 +410,6 @@ gdk_gc_set_function(fg->gc, GDK_COPY); if (bg) gdk_gc_set_function(bg->gc, GDK_COPY); -#if 0 - { - struct point pnt[5]; - int i; - gr->freetype_methods.get_text_bbox(gr, font, text, dx, dy, pnt, 1); - for (i = 0 ; i < 4 ; i++) { - pnt[i].x+=p->x; - pnt[i].y+=p->y; - } - pnt[4]=pnt[0]; - gdk_draw_lines(gr->drawable, fg->gc, (GdkPoint *)pnt, 5); - } -#endif } static void @@ -461,11 +437,6 @@ h = img->h; if (!img->image) { int x,y; -#if 0 - if (!gdk_pixbuf_get_has_alpha(img->pixbuf)) { - img->pixbuf=gdk_pixbuf_add_alpha(img->pixbuf, FALSE, 0, 0, 0); - } -#endif img->image=imlib_create_image(w, h); imlib_context_set_image(img->image); if (gdk_pixbuf_get_colorspace(img->pixbuf) != GDK_COLORSPACE_RGB || gdk_pixbuf_get_bits_per_sample(img->pixbuf) != 8) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <md...@us...> - 2015-06-28 21:57:54
|
Revision: 6123 http://sourceforge.net/p/navit/code/6123 Author: mdankov Date: 2015-06-28 21:57:52 +0000 (Sun, 28 Jun 2015) Log Message: ----------- Fix:core:Do not crash when attempting to set log_gpx_desc, also enable position marking with any vehicle. Fixes http://forum.navit-project.org/viewtopic.php?f=12&t=567, related to #542. Modified Paths: -------------- trunk/navit/navit/vehicle.c Modified: trunk/navit/navit/vehicle.c =================================================================== --- trunk/navit/navit/vehicle.c 2015-06-26 19:19:23 UTC (rev 6122) +++ trunk/navit/navit/vehicle.c 2015-06-28 21:57:52 UTC (rev 6123) @@ -212,15 +212,15 @@ vehicle_get_attr(struct vehicle *this_, enum attr_type type, struct attr *attr, struct attr_iter *iter) { int ret; + if (type == attr_log_gpx_desc) { + attr->u.str = this_->gpx_desc; + return 1; + } if (this_->meth.position_attr_get) { ret=this_->meth.position_attr_get(this_->priv, type, attr); if (ret) return ret; } - if (type == attr_log_gpx_desc) { - attr->u.str = this_->gpx_desc; - return 1; - } return attr_generic_get_attr(this_->attrs, NULL, type, attr, iter); } @@ -235,16 +235,15 @@ vehicle_set_attr(struct vehicle *this_, struct attr *attr) { int ret=1; - if (this_->meth.set_attr) + if (attr->type == attr_log_gpx_desc) { + g_free(this_->gpx_desc); + this_->gpx_desc = g_strdup(attr->u.str); + } else if (this_->meth.set_attr) ret=this_->meth.set_attr(this_->priv, attr); /* attr_profilename probably is never used by vehicle itself but it's used to control the routing engine. So any vehicle should allow to set and read it. */ if(attr->type == attr_profilename) ret=1; - if (ret == 1 && attr->type == attr_log_gpx_desc) { - g_free(this_->gpx_desc); - this_->gpx_desc = attr->u.str; - } if (ret == 1 && attr->type != attr_navit && attr->type != attr_pdl_gps_update) this_->attrs=attr_generic_set_attr(this_->attrs, attr); return ret != 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2015-06-26 19:19:25
|
Revision: 6122 http://sourceforge.net/p/navit/code/6122 Author: kazer_ Date: 2015-06-26 19:19:23 +0000 (Fri, 26 Jun 2015) Log Message: ----------- Fix:CI:Fixed typo Modified Paths: -------------- trunk/navit/circle.yml Modified: trunk/navit/circle.yml =================================================================== --- trunk/navit/circle.yml 2015-06-26 18:53:21 UTC (rev 6121) +++ trunk/navit/circle.yml 2015-06-26 19:19:23 UTC (rev 6122) @@ -26,7 +26,7 @@ - bash ci/build.sh - sed -i '/INTEGER/d' bin/po/navit.pot - cp bin/po/navit.pot $CIRCLE_ARTIFACTS/ - - "curl \"https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload]\" -H \"$lp_cookie\" -H \"Referer: https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload\" -F file=@bin/po/navit.pot | grep title" + - "curl \"https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload\" -H \"$lp_cookie\" -H \"Referer: https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload\" -F file=@bin/po/navit.pot | grep title" # 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2015-06-26 18:53:22
|
Revision: 6121 http://sourceforge.net/p/navit/code/6121 Author: kazer_ Date: 2015-06-26 18:53:21 +0000 (Fri, 26 Jun 2015) Log Message: ----------- Fix:CI:Fixed typo Modified Paths: -------------- trunk/navit/circle.yml Modified: trunk/navit/circle.yml =================================================================== --- trunk/navit/circle.yml 2015-06-26 18:50:35 UTC (rev 6120) +++ trunk/navit/circle.yml 2015-06-26 18:53:21 UTC (rev 6121) @@ -26,7 +26,7 @@ - bash ci/build.sh - sed -i '/INTEGER/d' bin/po/navit.pot - cp bin/po/navit.pot $CIRCLE_ARTIFACTS/ - - "curl \"https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload]" -H \"$lp_cookie\" -H \"Referer: https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload\" -F file=@bin/po/navit.pot | grep title" + - "curl \"https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload]\" -H \"$lp_cookie\" -H \"Referer: https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload\" -F file=@bin/po/navit.pot | grep title" # 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2015-06-26 18:50:36
|
Revision: 6120 http://sourceforge.net/p/navit/code/6120 Author: kazer_ Date: 2015-06-26 18:50:35 +0000 (Fri, 26 Jun 2015) Log Message: ----------- Fix:CI:Working on a better ci/launchpad integration Modified Paths: -------------- trunk/navit/circle.yml Modified: trunk/navit/circle.yml =================================================================== --- trunk/navit/circle.yml 2015-06-26 17:58:52 UTC (rev 6119) +++ trunk/navit/circle.yml 2015-06-26 18:50:35 UTC (rev 6120) @@ -26,7 +26,7 @@ - bash ci/build.sh - sed -i '/INTEGER/d' bin/po/navit.pot - cp bin/po/navit.pot $CIRCLE_ARTIFACTS/ - - "curl 'https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload' -H \"$lp_cookie\" -H 'Referer: https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload' -F file=@bin/po/navit.pot" + - "curl \"https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload]" -H \"$lp_cookie\" -H \"Referer: https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload\" -F file=@bin/po/navit.pot | grep title" # 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2015-06-26 17:58:53
|
Revision: 6119 http://sourceforge.net/p/navit/code/6119 Author: kazer_ Date: 2015-06-26 17:58:52 +0000 (Fri, 26 Jun 2015) Log Message: ----------- Fix:CI:upload the translation template to the correct launchpad branch Modified Paths: -------------- trunk/navit/circle.yml Modified: trunk/navit/circle.yml =================================================================== --- trunk/navit/circle.yml 2015-06-13 01:01:07 UTC (rev 6118) +++ trunk/navit/circle.yml 2015-06-26 17:58:52 UTC (rev 6119) @@ -26,7 +26,7 @@ - bash ci/build.sh - sed -i '/INTEGER/d' bin/po/navit.pot - cp bin/po/navit.pot $CIRCLE_ARTIFACTS/ - - "curl 'https://translations.launchpad.net/navit/trunk/+translations-upload' -H \"$lp_cookie\" -H 'Referer: https://translations.launchpad.net/navit/trunk/+translations-upload' -F file=@bin/po/navit.pot" + - "curl 'https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload' -H \"$lp_cookie\" -H 'Referer: https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload' -F file=@bin/po/navit.pot" # 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2015-06-13 01:01:10
|
Revision: 6118 http://sourceforge.net/p/navit/code/6118 Author: kazer_ Date: 2015-06-13 01:01:07 +0000 (Sat, 13 Jun 2015) Log Message: ----------- Update:Translations:multiple imports from launchpad Modified Paths: -------------- trunk/navit/po/cs.po.in trunk/navit/po/es.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/ko.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/cs.po.in =================================================================== --- trunk/navit/po/cs.po.in 2015-06-12 22:29:29 UTC (rev 6117) +++ trunk/navit/po/cs.po.in 2015-06-13 01:01:07 UTC (rev 6118) @@ -1,5 +1,5 @@ # Čeština translations for navit -# Copyright (C) 2006-2014 The Navit Team +# Copyright (C) 2006-2015 The Navit Team # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # 72ka https://launchpad.net/~2hp @@ -15,19 +15,19 @@ # Vojtěch Látal https://launchpad.net/~vojtik # stritek https://launchpad.net/~stritek # talmik https://launchpad.net/~mikatom + msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2015-03-15 14:56+0000\n" "Last-Translator: Jakuje <ja...@gm...>\n" "Language-Team: Čeština\n" -"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"Language: \n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -152,51 +152,51 @@ #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name #, c-format msgid "%1$sonto the %2$s%3$s%4$s" -msgstr "%1$sna %2$s%3$s%4$s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name #, c-format msgid "%1$sonto %2$s" -msgstr "%1$sna %2$s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%1$sonto %2$s|masculine form" -msgstr "%1$sna %2$s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%1$sonto %2$s|feminine form" -msgstr "%1$sna %2$s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%1$sonto %2$s|neuter form" -msgstr "%1$sna %2$s" +msgstr "" #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. msgid "onto the motorway ramp" -msgstr "na přivadeč" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format msgid "%sinto %s%s%s" -msgstr "%sdo %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|masculine form" -msgstr "%sdo %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|feminine form" -msgstr "%sdo %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|neuter form" -msgstr "%sdo %s%s%s" +msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format @@ -221,17 +221,17 @@ #. TRANSLATORS: %s is the distance to the roundabout #, c-format msgid "Enter the roundabout %s" -msgstr "Najeďte na kruhový objezd %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 "pak sjeďte na %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 "Sjeďte na %1$s %2$s" +msgstr "" msgid "soon" msgstr "brzy" @@ -240,7 +240,7 @@ msgstr "nyní" msgid "then" -msgstr "pak" +msgstr "" #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format @@ -343,25 +343,25 @@ #. 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 "Zabočte %1$s%2$s %3$s%4$s" +msgstr "" #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|left" -msgstr "pak otočte se" +msgstr "" #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|left" -msgstr "Otočte se %1$s" +msgstr "" #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|right" -msgstr "pak otočte se" +msgstr "" #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|right" -msgstr "Otočte se %1$s" +msgstr "" #. An empty placeholder that we can use in the future for #. * some motorway commands that are now suppressed but we @@ -374,7 +374,7 @@ #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -391,7 +391,7 @@ msgstr "" msgid "Exit" -msgstr "Ukončit" +msgstr "" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1948,10 +1948,10 @@ msgid "Enter Coordinates" msgstr "Zadejte souřadnice" -#. +#. #. 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" Modified: trunk/navit/po/es.po.in =================================================================== --- trunk/navit/po/es.po.in 2015-06-12 22:29:29 UTC (rev 6117) +++ trunk/navit/po/es.po.in 2015-06-13 01:01:07 UTC (rev 6118) @@ -1,5 +1,5 @@ # Spanish translations for navit -# Copyright (C) 2006-2014 The Navit Team +# Copyright (C) 2006-2015 The Navit Team # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # Benjamín Valero Espinosa https://launchpad.net/~benjavalero @@ -19,19 +19,19 @@ # marZiano https://launchpad.net/~m3marte # pataquets https://launchpad.net/~pataquets # singesang https://launchpad.net/~singesang + msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-12-18 16:54+0000\n" "Last-Translator: iceman75 <Unknown>\n" "Language-Team: Chris Eubank <cte...@gm...>\n" -"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"Language: \n" msgid "Running from source directory\n" msgstr "Ejecutando desde el directorio fuente\n" @@ -151,56 +151,56 @@ #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name #, c-format msgid "%1$sonto the %2$s%3$s%4$s" -msgstr "%1$sen la %2$s%3$s%4$s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name #, c-format msgid "%1$sonto %2$s" -msgstr "%1$sen la carretera %2$s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%1$sonto %2$s|masculine form" -msgstr "%1$sen el %2$s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%1$sonto %2$s|feminine form" -msgstr "%1$sen la %2$s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%1$sonto %2$s|neuter form" -msgstr "%1$sen la carretera %2$s" +msgstr "" #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. msgid "onto the motorway ramp" -msgstr "en el carril de entrada" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format msgid "%sinto %s%s%s" -msgstr "%sen la calle %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|masculine form" -msgstr "%sen el %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|feminine form" -msgstr "%sen la %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|neuter form" -msgstr "%sen la calle %s%s%s" +msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" -msgstr "%sen la %s" +msgstr "%s en la %s" msgid "When possible, please turn around" msgstr "Dé la vuelta cuando sea posible" @@ -208,7 +208,7 @@ #. TRANSLATORS: the argument is the destination to follow #, c-format msgid "towards %s" -msgstr "hacia %s" +msgstr "" #, c-format msgid "Follow the road for the next %s" @@ -220,17 +220,17 @@ #. TRANSLATORS: %s is the distance to the roundabout #, c-format msgid "Enter the roundabout %s" -msgstr "Entre en la rotonda %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 "después salga de la rotonda por la %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 "Salga de la rotonda por la %1$s %2$s" +msgstr "" msgid "soon" msgstr "próximamente" @@ -239,80 +239,80 @@ msgstr "ahora" msgid "then" -msgstr "luego" +msgstr "" #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format msgid "then merge%1$s|right" -msgstr "luego entre%1$s" +msgstr "" #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format msgid "Merge %1$s%2$s|right" -msgstr "Entre%2$s %1$s" +msgstr "" #. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format msgid "then merge%1$s|left" -msgstr "luego entre%1$s" +msgstr "" #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format msgid "Merge %1$s%2$s|left" -msgstr "Entre%2$s %1$s" +msgstr "" msgid "on your left" -msgstr "a la izquierda" +msgstr "" msgid "on your right" -msgstr "a la derecha" +msgstr "" #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format msgid "Take exit %1$s %2$s %3$s" -msgstr "Tome la salida %1$s %2$s %3$s" +msgstr "" #. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format msgid "Take the exit %1$s %2$s%3$s" -msgstr "Tome la salida %1$s %2$s%3$s" +msgstr "" #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" msgid "at interchange" -msgstr "al enlace" +msgstr "" msgid "at exit" -msgstr "a la salida" +msgstr "" #. TRANSLATORS: the arg. is where to do the maneuver #, c-format msgid "then continue straight%1$s" -msgstr "luego continúe todo recto%1$s" +msgstr "" #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format msgid "Continue straight %1$s%2$s%3$s" -msgstr "Continúe todo recto %1$s%2$s%3$s" +msgstr "" #. TRANSLATORS: the arg. is where to do the maneuver #, c-format msgid "then keep right%1$s" -msgstr "luego manténgase por la derecha%1$s" +msgstr "" #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format msgid "Keep right %1$s%2$s%3$s" -msgstr "Manténgase por la derecha %1$s%2$s%3$s" +msgstr "" #. TRANSLATORS: the arg. is where to do the maneuver #, c-format msgid "then keep left%1$s" -msgstr "luego manténgase por la izquierda%1$s" +msgstr "" #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format msgid "Keep left %1$s%2$s%3$s" -msgstr "Manténgase por la izquierda %1$s%2$s%3$s" +msgstr "" #. TRANSLATORS: "right" as in "turn right" msgid "right" @@ -342,25 +342,25 @@ #. 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 "Gire %1$s%2$s %3$s%4$s" +msgstr "" #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|left" -msgstr "luego dé la vuelta" +msgstr "" #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|left" -msgstr "Dé la vuelta %1$s" +msgstr "" #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|right" -msgstr "luego dé la vuelta" +msgstr "" #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|right" -msgstr "Dé la vuelta %1$s" +msgstr "" #. An empty placeholder that we can use in the future for #. * some motorway commands that are now suppressed but we @@ -373,9 +373,9 @@ #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" -msgstr "continúe" +msgstr "" msgid "then you have reached your destination." msgstr "entonces ha llegado a su destino." @@ -387,10 +387,10 @@ #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" msgid "Interchange" -msgstr "Enlace" +msgstr "" msgid "Exit" -msgstr "Salida" +msgstr "" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1645,19 +1645,19 @@ msgstr "Datos" msgid "Pharmacy" -msgstr "Farmacia" +msgstr "" msgid "Restaurant" -msgstr "Restaurante" +msgstr "" msgid "Restaurant. Fast food" msgstr "" msgid "Hotel" -msgstr "Hotel" +msgstr "" msgid "Car parking" -msgstr "Estacionamiento" +msgstr "" msgid "Fuel station" msgstr "" @@ -1669,19 +1669,19 @@ msgstr "" msgid "Cinema" -msgstr "Cine" +msgstr "" msgid "Train station" msgstr "" msgid "School" -msgstr "Escuela" +msgstr "" msgid "Police" -msgstr "Policía" +msgstr "" msgid "Justice" -msgstr "Juzgado" +msgstr "" msgid "Taxi" msgstr "" @@ -1948,10 +1948,10 @@ msgid "Enter Coordinates" msgstr "Introduzca coordenadas" -#. +#. #. 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" @@ -2025,7 +2025,7 @@ #. warning told msgid "Look out! Camera!" -msgstr "¡Atención! Radar" +msgstr "!Atención! Radar" #. warning told msgid "Please decrease your speed" @@ -2189,16 +2189,16 @@ msgstr "Baden-Wuerttemberg" msgid "Bayern" -msgstr "Baviera" +msgstr "Bayern" msgid "Mittelfranken" msgstr "Franconia Media" msgid "Niederbayern" -msgstr "Baja Baviera" +msgstr "Bajo Bayern" msgid "Oberbayern" -msgstr "Alta Baviera" +msgstr "Alto Bayern" msgid "Oberfranken" msgstr "Alta Franconia" Modified: trunk/navit/po/fo.po.in =================================================================== --- trunk/navit/po/fo.po.in 2015-06-12 22:29:29 UTC (rev 6117) +++ trunk/navit/po/fo.po.in 2015-06-13 01:01:07 UTC (rev 6118) @@ -1,22 +1,22 @@ # Faroese translations for navit -# Copyright (C) 2006-2014 The Navit Team +# Copyright (C) 2006-2015 The Navit Team # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # Cyberish https://launchpad.net/~cyberish # Gunleif Joensen https://launchpad.net/~gunleif + msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:42+0000\n" "Last-Translator: Cyberish <ka...@gm...>\n" "Language-Team: Faroese <fo...@li...>\n" -"Language: fo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"Language: fo\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -161,27 +161,27 @@ #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. msgid "onto the motorway ramp" -msgstr "uppá rampuna" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format msgid "%sinto %s%s%s" -msgstr "%sinná gøtuna %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|masculine form" -msgstr "%sinná %s%s%sur" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|feminine form" -msgstr "%sinná %s%s%sa" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|neuter form" -msgstr "%sinná %s%s%si" +msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format @@ -189,7 +189,7 @@ msgstr "%sinná %s" msgid "When possible, please turn around" -msgstr "Vend um skótast tilber" +msgstr "vend um skótast tilber" #. TRANSLATORS: the argument is the destination to follow #, c-format @@ -211,12 +211,12 @@ #. 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 "far so út úr rundkoyring við %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 "Far so út úr rundkoyring við %1$s %2$s" +msgstr "" msgid "soon" msgstr "skjótt" @@ -225,7 +225,7 @@ msgstr "nú" msgid "then" -msgstr "so" +msgstr "" #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format @@ -328,25 +328,25 @@ #. 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 "dreya %1$s%2$s %3$s%4$s" +msgstr "" #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|left" -msgstr "vend so um" +msgstr "" #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|left" -msgstr "Vend um %1$s" +msgstr "" #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|right" -msgstr "vend so um" +msgstr "" #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|right" -msgstr "Vend um %1$s" +msgstr "" #. An empty placeholder that we can use in the future for #. * some motorway commands that are now suppressed but we @@ -359,7 +359,7 @@ #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -376,7 +376,7 @@ msgstr "" msgid "Exit" -msgstr "Avkoyring" +msgstr "" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1931,10 +1931,10 @@ 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" Modified: trunk/navit/po/fr.po.in =================================================================== --- trunk/navit/po/fr.po.in 2015-06-12 22:29:29 UTC (rev 6117) +++ trunk/navit/po/fr.po.in 2015-06-13 01:01:07 UTC (rev 6118) @@ -8,7 +8,7 @@ # Elodie https://launchpad.net/~elodie # Fred https://launchpad.net/~jelk # Gaël Ecorchard https://launchpad.net/~galou-breizh -# Jean Marc https://launchpad.net/~m-balthazar +# Jean-Marc https://launchpad.net/~m-balthazar # Jérôme BLUM https://launchpad.net/~jblum # KaZeR https://launchpad.net/~kazer # Roadrunner IN https://launchpad.net/~online @@ -18,24 +18,23 @@ # alfred002 https://launchpad.net/~alfred002 # boism https://launchpad.net/~boism # cyp https://launchpad.net/~cyprien-d -# icaunais https://launchpad.net/~linux4cyril # mercier133 https://launchpad.net/~mercierdamien # metehyi https://launchpad.net/~metehyi # pierre https://launchpad.net/~pmghost4 # yannick56 https://launchpad.net/~yleny + msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2015-04-21 18:51+0000\n" -"Last-Translator: Jean Marc <Unknown>\n" +"Last-Translator: Jean-Marc <Unknown>\n" "Language-Team: KaZeR <ka...@al...>\n" -"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" +"Language: fr\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -156,51 +155,51 @@ #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name #, c-format msgid "%1$sonto the %2$s%3$s%4$s" -msgstr "%1$svers %2$s%3$s%4$s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name #, c-format msgid "%1$sonto %2$s" -msgstr "%1$svers %2$s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%1$sonto %2$s|masculine form" -msgstr "%1$svers le %2$s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%1$sonto %2$s|feminine form" -msgstr "%1$svers la %2$s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%1$sonto %2$s|neuter form" -msgstr "%1$svers l'%2$s" +msgstr "" #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. msgid "onto the motorway ramp" -msgstr "vers la bretelle" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format msgid "%sinto %s%s%s" -msgstr "%ssur %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|masculine form" -msgstr "%ssur le %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|feminine form" -msgstr "%ssur la %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|neuter form" -msgstr "%ssur l'%s%s%s" +msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format @@ -213,7 +212,7 @@ #. TRANSLATORS: the argument is the destination to follow #, c-format msgid "towards %s" -msgstr "vers %s" +msgstr "" #, c-format msgid "Follow the road for the next %s" @@ -225,17 +224,17 @@ #. TRANSLATORS: %s is the distance to the roundabout #, c-format msgid "Enter the roundabout %s" -msgstr "Entrer dans le rond-point %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 "puis sortez du rond-point à la %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 "Sortez du rond-point à la %1$s %2$s" +msgstr "" msgid "soon" msgstr "bientôt" @@ -244,7 +243,7 @@ msgstr "maintenant" msgid "then" -msgstr "puis" +msgstr "" #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format @@ -275,19 +274,19 @@ #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format msgid "Take exit %1$s %2$s %3$s" -msgstr "Prenez la sortie %1$s %2$s %3$s" +msgstr "" #. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format msgid "Take the exit %1$s %2$s%3$s" -msgstr "Prenez la sortie %1$s %2$s%3$s" +msgstr "" #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" msgid "at interchange" -msgstr "à l'èchangeur" +msgstr "" msgid "at exit" -msgstr "à la sortie" +msgstr "" #. TRANSLATORS: the arg. is where to do the maneuver #, c-format @@ -329,6 +328,7 @@ msgid "left" msgstr "à gauche" +# utilisé pour les changements de voie pour les sorties? #. TRANSLATORS: as in "turn easily right" msgid "easily " msgstr "légèrement " @@ -345,7 +345,6 @@ msgid "after %i roads" msgstr "après %i rues" -# espace important après le 2 #. cave: no else - may come from 'if (skip_roads)' above ! #. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format @@ -354,21 +353,21 @@ #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|left" -msgstr "puis faites demi-tour" +msgstr "" #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|left" -msgstr "Faites demi-tour %1$s" +msgstr "" #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|right" -msgstr "puis faites demi-tour" +msgstr "" #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|right" -msgstr "Faites demi-tour %1$s" +msgstr "" #. An empty placeholder that we can use in the future for #. * some motorway commands that are now suppressed but we @@ -381,9 +380,9 @@ #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" -msgstr "suivez" +msgstr "" msgid "then you have reached your destination." msgstr "puis vous arriverez à destination" @@ -391,14 +390,14 @@ #. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" -msgstr "Vous êtes arrivé à destination %s" +msgstr "Vous êtes arrivé à destination : %s" #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" msgid "Interchange" -msgstr "Echangeur" +msgstr "" msgid "Exit" -msgstr "Sortie" +msgstr "" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1955,10 +1954,10 @@ msgid "Enter Coordinates" msgstr "Saisissez les coordonnées" -#. +#. #. 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" Modified: trunk/navit/po/fr_CH.po.in =================================================================== --- trunk/navit/po/fr_CH.po.in 2015-06-12 22:29:29 UTC (rev 6117) +++ trunk/navit/po/fr_CH.po.in 2015-06-13 01:01:07 UTC (rev 6118) @@ -1,21 +1,21 @@ # French/Switzerland translations for navit -# Copyright (C) 2006-2014 The Navit Team +# Copyright (C) 2006-2015 The Navit Team # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # KaZeR https://launchpad.net/~kazer + msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:42+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: KaZeR <ka...@al...>\n" -"Language: fr_CH\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" +"Language: \n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -136,51 +136,51 @@ #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name #, c-format msgid "%1$sonto the %2$s%3$s%4$s" -msgstr "%1$svers %2$s%3$s%4$s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name #, c-format msgid "%1$sonto %2$s" -msgstr "%1$svers %2$s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%1$sonto %2$s|masculine form" -msgstr "%1$svers le %2$s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%1$sonto %2$s|feminine form" -msgstr "%1$svers la %2$s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%1$sonto %2$s|neuter form" -msgstr "%1$svers l'%2$s" +msgstr "" #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. msgid "onto the motorway ramp" -msgstr "vers la bretelle" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format msgid "%sinto %s%s%s" -msgstr "%ssur %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|masculine form" -msgstr "%ssur le %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|feminine form" -msgstr "%ssur la %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|neuter form" -msgstr "%ssur l'%s%s%s" +msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format @@ -193,7 +193,7 @@ #. TRANSLATORS: the argument is the destination to follow #, c-format msgid "towards %s" -msgstr "vers %s" +msgstr "" #, c-format msgid "Follow the road for the next %s" @@ -210,12 +210,12 @@ #. 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 "puis sortez du rond-point à la %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 "Sortez du rond-point à la %1$s %2$s" +msgstr "" msgid "soon" msgstr "bientôt" @@ -224,7 +224,7 @@ msgstr "maintenant" msgid "then" -msgstr "puis" +msgstr "" #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format @@ -255,19 +255,19 @@ #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format msgid "Take exit %1$s %2$s %3$s" -msgstr "Prenez la sortie %1$s %2$s %3$s" +msgstr "" #. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format msgid "Take the exit %1$s %2$s%3$s" -msgstr "Prenez la sortie %1$s %2$s%3$s" +msgstr "" #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" msgid "at interchange" -msgstr "à l'èchangeur" +msgstr "" msgid "at exit" -msgstr "à la sortie" +msgstr "" #. TRANSLATORS: the arg. is where to do the maneuver #, c-format @@ -326,7 +326,6 @@ msgid "after %i roads" msgstr "après %i rues" -# espace important après le 2 #. cave: no else - may come from 'if (skip_roads)' above ! #. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format @@ -335,21 +334,21 @@ #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|left" -msgstr "puis faites demi-tour" +msgstr "" #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|left" -msgstr "Faites demi-tour %1$s" +msgstr "" #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|right" -msgstr "puis faites demi-tour" +msgstr "" #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|right" -msgstr "Faites demi-tour %1$s" +msgstr "" #. An empty placeholder that we can use in the future for #. * some motorway commands that are now suppressed but we @@ -362,9 +361,9 @@ #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" -msgstr "suivez" +msgstr "" msgid "then you have reached your destination." msgstr "ensuite vous serez à destination" @@ -372,14 +371,14 @@ #. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" -msgstr "Vous êtes arrivé à destination %s" +msgstr "Vous êtes arrivé à destination : %s" #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" msgid "Interchange" -msgstr "Echangeur" +msgstr "" msgid "Exit" -msgstr "Sortie" +msgstr "" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1934,10 +1933,10 @@ 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" Modified: trunk/navit/po/fy.po.in =================================================================== --- trunk/navit/po/fy.po.in 2015-06-12 22:29:29 UTC (rev 6117) +++ trunk/navit/po/fy.po.in 2015-06-13 01:01:07 UTC (rev 6118) @@ -1,21 +1,21 @@ # Frisian translations for navit -# Copyright (C) 2006-2014 The Navit Team +# Copyright (C) 2006-2015 The Navit Team # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # 205 https://launchpad.net/~205-z + msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2011-08-12 12:18+0000\n" "Last-Translator: 205 <Unknown>\n" "Language-Team: Frisian <fy...@li...>\n" -"Language: fy\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"Language: \n" msgid "Running from source directory\n" msgstr "" @@ -357,7 +357,7 @@ #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -1929,10 +1929,10 @@ 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" Modified: trunk/navit/po/gl.po.in =================================================================== --- trunk/navit/po/gl.po.in 2015-06-12 22:29:29 UTC (rev 6117) +++ trunk/navit/po/gl.po.in 2015-06-13 01:01:07 UTC (rev 6118) @@ -1,24 +1,24 @@ # Galician translations for navit -# Copyright (C) 2006-2014 The Navit Team +# Copyright (C) 2006-2015 The Navit Team # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # Iván Pérez https://launchpad.net/~ivan.perez-keera.es # Miguel Anxo Bouzada https://launchpad.net/~mbouzada # Xosé https://launchpad.net/~ubuntu-galizaweb # andreout https://launchpad.net/~andre-outeiro + msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:42+0000\n" "Last-Translator: andreout <an...@ou...>\n" "Language-Team: Galician <gl...@li...>\n" -"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"Language: gl\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -163,27 +163,27 @@ #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. msgid "onto the motorway ramp" -msgstr "na rampa" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format msgid "%sinto %s%s%s" -msgstr "%s na rúa %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|masculine form" -msgstr "%s no %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|feminine form" -msgstr "%s na %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|neuter form" -msgstr "%s no %s%s%s" +msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format @@ -213,12 +213,12 @@ #. 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 "logo saia da rotonda pola %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 "Saia da rotonda pola %1$s %2$s" +msgstr "" msgid "soon" msgstr "cedo" @@ -227,7 +227,7 @@ msgstr "agora" msgid "then" -msgstr "logo" +msgstr "" #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format @@ -258,12 +258,12 @@ #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format msgid "Take exit %1$s %2$s %3$s" -msgstr "Tome a saida %1$s %2$s %3$s" +msgstr "" #. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format msgid "Take the exit %1$s %2$s%3$s" -msgstr "Tome a saida %1$s %2$s%3$s" +msgstr "" #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" msgid "at interchange" @@ -330,25 +330,25 @@ #. 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 "Xire %1$s%2$s %3$s%4$s" +msgstr "" #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|left" -msgstr "logo dea a volta" +msgstr "" #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|left" -msgstr "Dea a volta %1$s" +msgstr "" #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|right" -msgstr "logo dea a volta" +msgstr "" #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|right" -msgstr "Dea a volta %1$s" +msgstr "" #. An empty placeholder that we can use in the future for #. * some motorway commands that are now suppressed but we @@ -361,7 +361,7 @@ #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -378,7 +378,7 @@ msgstr "" msgid "Exit" -msgstr "Saída" +msgstr "" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1933,10 +1933,10 @@ 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" Modified: trunk/navit/po/he.po.in =================================================================== --- trunk/navit/po/he.po.in 2015-06-12 22:29:29 UTC (rev 6117) +++ trunk/navit/po/he.po.in 2015-06-13 01:01:07 UTC (rev 6118) @@ -1,5 +1,5 @@ # Hebrew translations for navit -# Copyright (C) 2006-2014 The Navit Team +# Copyright (C) 2006-2015 The Navit Team # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # Evgeniy Ginzburg https://launchpad.net/~nad-oby @@ -8,19 +8,19 @@ # Nadav https://launchpad.net/~nadavz # Yaron https://launchpad.net/~sh-yaron # rintintin https://launchpad.net/~yonatanhak-gmail + msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2014-05-26 10:31+0000\n" "Last-Translator: Yaron <sh....@gm...>\n" "Language-Team: Hebrew <he...@li...>\n" -"Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"Language: he\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -165,27 +165,27 @@ #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. msgid "onto the motorway ramp" -msgstr "אל הרמפה" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format msgid "%sinto %s%s%s" -msgstr "%s אל רחוב %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|masculine form" -msgstr "%s אל רחוב %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|feminine form" -msgstr "%s אל רחוב %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|neuter form" -msgstr "%s אל רחוב %s%s%s" +msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format @@ -215,12 +215,12 @@ #. 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 "אחר כך צא מהכיכר ב%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 "צא מהכיכר ב%1$s %2$s" +msgstr "" msgid "soon" msgstr "בקרוב" @@ -332,7 +332,7 @@ #. 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 "פנה %1$s %2$s %4$s %3$s" +msgstr "" #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|left" @@ -363,7 +363,7 @@ #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -380,7 +380,7 @@ msgstr "" msgid "Exit" -msgstr "יציאה" +msgstr "" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1935,10 +1935,10 @@ 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" Modified: trunk/navit/po/hi.po.in =================================================================== --- trunk/navit/po/hi.po.in 2015-06-12 22:29:29 UTC (rev 6117) +++ trunk/navit/po/hi.po.in 2015-06-13 01:01:07 UTC (rev 6118) @@ -1,22 +1,22 @@ # Hindi translations for navit -# Copyright (C) 2006-2014 The Navit Team +# Copyright (C) 2006-2015 The Navit Team # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # KaZeR https://launchpad.net/~kazer # desh deep https://launchpad.net/~singhdeepdesh + msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2014-11-15 22:03+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Hindi <hi...@li...>\n" -"Language: hi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"Language: hi\n" msgid "Running from source directory\n" msgstr "" @@ -160,27 +160,27 @@ #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. msgid "onto the motorway ramp" -msgstr "dhalan mein" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format msgid "%sinto %s%s%s" -msgstr "%ssheher mein %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|masculine form" -msgstr "%ssheher mein %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|feminine form" -msgstr "%ssheher mein %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|neuter form" -msgstr "%ssheher mein %s%s%s" +msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format @@ -210,12 +210,12 @@ #. 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 "तो %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 "%1$s %2$s के राउंडअबाउट छोड़ें" +msgstr "" msgid "soon" msgstr "जल्दी" @@ -224,7 +224,7 @@ msgstr "अब" msgid "then" -msgstr "तो" +msgstr "" #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format @@ -331,21 +331,21 @@ #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|left" -msgstr "तो चारों ओर मोड़" +msgstr "" #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|left" -msgstr "चारों ओर मोड़ %1$s" +msgstr "" #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|right" -msgstr "तो चारों ओर मोड़" +msgstr "" #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|right" -msgstr "चारों ओर मोड़ %1$s" +msgstr "" #. An empty placeholder that we can use in the future for #. * some motorway commands that are now suppressed but we @@ -358,7 +358,7 @@ #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -375,7 +375,7 @@ msgstr "" msgid "Exit" -msgstr "Nikas" +msgstr "" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1930,10 +1930,10 @@ 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" Modified: trunk/navit/po/hr.po.in =================================================================== --- trunk/navit/po/hr.po.in 2015-06-12 22:29:29 UTC (rev 6117) +++ trunk/navit/po/hr.po.in 2015-06-13 01:01:07 UTC (rev 6118) @@ -1,25 +1,25 @@ # Croatian translations for navit -# Copyright (C) 2006-2014 The Navit Team +# Copyright (C) 2006-2015 The Navit Team # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # KaZeR https://launchpad.net/~kazer # Marjan Vrban https://launchpad.net/~mvrban # gogo https://launchpad.net/~trebelnik-stefina # klajo https://launchpad.net/~klaudio + msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2015-03-06 22:33+0000\n" "Last-Translator: gogo <tre...@gm...>\n" "Language-Team: Croatian <hr...@li...>\n" -"Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Language: hr\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -166,27 +166,27 @@ #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. msgid "onto the motorway ramp" -msgstr "na rampu" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format msgid "%sinto %s%s%s" -msgstr "%su ulicu %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|masculine form" -msgstr "%su %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|feminine form" -msgstr "%su %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|neuter form" -msgstr "%su %s%s%s" +msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format @@ -216,12 +216,12 @@ #. 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 "onda napustite kružni tok na %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 "Napustite kružni tok na %1$s %2$s" +msgstr "" msgid "soon" msgstr "uskoro" @@ -230,7 +230,7 @@ msgstr "sada" msgid "then" -msgstr "onda" +msgstr "" #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format @@ -333,25 +333,25 @@ #. 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 "Krenite %1$s%2$s %3$s%4$s" +msgstr "" #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|left" -msgstr "onda okrenite se" +msgstr "" #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|left" -msgstr "Okrenite se %1$s" +msgstr "" #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|right" -msgstr "onda okrenite se" +msgstr "" #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|right" -msgstr "Okrenite se %1$s" +msgstr "" #. An empty placeholder that we can use in the future for #. * some motorway commands that are now suppressed but we @@ -364,7 +364,7 @@ #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -381,7 +381,7 @@ msgstr "" msgid "Exit" -msgstr "Izlaz" +msgstr "" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1936,10 +1936,10 @@ 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" Modified: trunk/navit/po/hu.po.in =================================================================== --- trunk/navit/po/hu.po.in 2015-06-12 22:29:29 UTC (rev 6117) +++ trunk/navit/po/hu.po.in 2015-06-13 01:01:07 UTC (rev 6118) @@ -1,5 +1,5 @@ # Hungarian translations for navit -# Copyright (C) 2006-2014 The Navit Team +# Copyright (C) 2006-2015 The Navit Team # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # Bernath Marci https://launchpad.net/~bernath-marci @@ -9,19 +9,19 @@ # WintermuteHun https://launchpad.net/~wintermute-valodi # dandor https://launchpad.net/~dandorfs # kalmarzs https://launchpad.net/~kalmarzs + msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2014-05-12 16:58+0000\n" "Last-Translator: György Balló <bal...@gm...>\n" "Language-Team: Hungarian <hu...@li...>\n" -"Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"Language: hu\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -166,27 +166,27 @@ #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. msgid "onto the motorway ramp" -msgstr "a felhajtóra" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format msgid "%sinto %s%s%s" -msgstr "%sa(z) %s%s%s utcába" +msgstr "" #. ... [truncated message content] |
From: <ka...@us...> - 2015-06-12 22:29:31
|
Revision: 6117 http://sourceforge.net/p/navit/code/6117 Author: kazer_ Date: 2015-06-12 22:29:29 +0000 (Fri, 12 Jun 2015) Log Message: ----------- Update:Translations:Updated Filipino translation from launchpad Modified Paths: -------------- trunk/navit/po/fil.po.in Modified: trunk/navit/po/fil.po.in =================================================================== --- trunk/navit/po/fil.po.in 2015-06-12 22:29:03 UTC (rev 6116) +++ trunk/navit/po/fil.po.in 2015-06-12 22:29:29 UTC (rev 6117) @@ -1,21 +1,21 @@ # Filipino translations for navit -# Copyright (C) 2006-2014 The Navit Team +# Copyright (C) 2006-2015 The Navit Team # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # chito https://launchpad.net/~cnuarin + msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2012-09-26 07:21+0000\n" "Last-Translator: chito <cn...@gm...>\n" "Language-Team: Filipino <fi...@li...>\n" -"Language: fil\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" +"Language: fil\n" msgid "Running from source directory\n" msgstr "" @@ -164,22 +164,22 @@ #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format msgid "%sinto %s%s%s" -msgstr "%s sa kalyeng %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|masculine form" -msgstr "%s sa kalyeng %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|feminine form" -msgstr "%s sa kalyeng %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|neuter form" -msgstr "%s sa kalyeng %s%s%s" +msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format @@ -187,7 +187,7 @@ msgstr "" msgid "When possible, please turn around" -msgstr "Kung maari ay bumalik" +msgstr "kung maari ay bumalik" #. TRANSLATORS: the argument is the destination to follow #, c-format @@ -209,12 +209,12 @@ #. 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 "pagkatapos ay lumabas sa rotonda sa may %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 "Lisanin ang rotonda sa may %1$s %2$s" +msgstr "" msgid "soon" msgstr "" @@ -357,7 +357,7 @@ #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -374,7 +374,7 @@ msgstr "" msgid "Exit" -msgstr "Labasan" +msgstr "" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1929,10 +1929,10 @@ 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" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2015-06-12 22:29:05
|
Revision: 6116 http://sourceforge.net/p/navit/code/6116 Author: kazer_ Date: 2015-06-12 22:29:03 +0000 (Fri, 12 Jun 2015) Log Message: ----------- Update:Translations:Updated Finnish translation from launchpad Modified Paths: -------------- trunk/navit/po/fi.po.in Modified: trunk/navit/po/fi.po.in =================================================================== --- trunk/navit/po/fi.po.in 2015-06-12 22:28:55 UTC (rev 6115) +++ trunk/navit/po/fi.po.in 2015-06-12 22:29:03 UTC (rev 6116) @@ -1,5 +1,5 @@ # Finnish translations for navit -# Copyright (C) 2006-2014 The Navit Team +# Copyright (C) 2006-2015 The Navit Team # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # Eero https://launchpad.net/~eero+launchpad @@ -9,19 +9,19 @@ # Ossi Berg https://launchpad.net/~fso-polonez # Roadrunner IN https://launchpad.net/~online # Timo Jyrinki https://launchpad.net/~timo-jyrinki + msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:42+0000\n" "Last-Translator: Timo Jyrinki <tim...@ca...>\n" "Language-Team: Ossi Berg <o....@ma...>\n" -"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"Language: \n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -166,27 +166,27 @@ #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. msgid "onto the motorway ramp" -msgstr "rampille" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format msgid "%sinto %s%s%s" -msgstr "%skadulle %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|masculine form" -msgstr "%skadulle %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|feminine form" -msgstr "%skadulle %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|neuter form" -msgstr "%skadulle %s%s%s" +msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format @@ -230,7 +230,7 @@ msgstr "nyt" msgid "then" -msgstr "sitten" +msgstr "" #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format @@ -333,25 +333,25 @@ #. 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 "Käänny %1$s%2$s %3$s%4$s" +msgstr "" #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|left" -msgstr "tee sitten u-käännös" +msgstr "" #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|left" -msgstr "Tee u-käännös %1$s" +msgstr "" #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|right" -msgstr "tee sitten u-käännös" +msgstr "" #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|right" -msgstr "Tee u-käännös %1$s" +msgstr "" #. An empty placeholder that we can use in the future for #. * some motorway commands that are now suppressed but we @@ -364,7 +364,7 @@ #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -381,7 +381,7 @@ msgstr "" msgid "Exit" -msgstr "Poistumistie" +msgstr "" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1628,7 +1628,8 @@ msgstr "Autom. suurennus" msgid "Enable/disable automatic zoom level changing" -msgstr "Ota automaattinen lähennystason muuttaminen käyttöön tai pois käytöstä" +msgstr "" +"Ota automaattinen lähennystason muuttaminen käyttöön tai pois käytöstä" msgid "_Fullscreen" msgstr "Koko ruutu" @@ -1940,10 +1941,10 @@ 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" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2015-06-12 22:28:57
|
Revision: 6115 http://sourceforge.net/p/navit/code/6115 Author: kazer_ Date: 2015-06-12 22:28:55 +0000 (Fri, 12 Jun 2015) Log Message: ----------- Update:Translations:Updated Persian translation from launchpad Modified Paths: -------------- trunk/navit/po/fa.po.in Modified: trunk/navit/po/fa.po.in =================================================================== --- trunk/navit/po/fa.po.in 2015-06-12 22:28:42 UTC (rev 6114) +++ trunk/navit/po/fa.po.in 2015-06-12 22:28:55 UTC (rev 6115) @@ -1,22 +1,21 @@ # Persian translations for navit -# Copyright (C) 2006-2014 The Navit Team +# Copyright (C) 2006-2015 The Navit Team # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: -# salix https://launchpad.net/~s-shahsa # the_cephalex https://launchpad.net/~ali-rashidi + msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2014-06-28 21:57+0000\n" "Last-Translator: the_cephalex <Unknown>\n" "Language-Team: Persian <fa...@li...>\n" -"Language: fa\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" +"Language: fa\n" msgid "Running from source directory\n" msgstr "" @@ -160,7 +159,7 @@ #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. msgid "onto the motorway ramp" -msgstr "به سوی شیب" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format @@ -358,7 +357,7 @@ #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -375,7 +374,7 @@ msgstr "" msgid "Exit" -msgstr "بیرون" +msgstr "" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1930,10 +1929,10 @@ 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" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2015-06-12 22:28:45
|
Revision: 6114 http://sourceforge.net/p/navit/code/6114 Author: kazer_ Date: 2015-06-12 22:28:42 +0000 (Fri, 12 Jun 2015) Log Message: ----------- Update:Translations:Updated Basque translation from launchpad Modified Paths: -------------- trunk/navit/po/eu.po.in Modified: trunk/navit/po/eu.po.in =================================================================== --- trunk/navit/po/eu.po.in 2015-06-12 22:28:36 UTC (rev 6113) +++ trunk/navit/po/eu.po.in 2015-06-12 22:28:42 UTC (rev 6114) @@ -1,22 +1,22 @@ # Basque translations for navit -# Copyright (C) 2006-2014 The Navit Team +# Copyright (C) 2006-2015 The Navit Team # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # Inaki Saez https://launchpad.net/~inaki-saez # mikel https://launchpad.net/~mikel85 + msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:42+0000\n" "Last-Translator: Inaki Saez <Ina...@gm...>\n" "Language-Team: Basque <eu...@li...>\n" -"Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"Language: eu\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -161,27 +161,27 @@ #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. msgid "onto the motorway ramp" -msgstr "maldan" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format msgid "%sinto %s%s%s" -msgstr "%s %s %s %s kalean" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|masculine form" -msgstr "%s %s%s%s-an" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|feminine form" -msgstr "%s %s%s%s-an" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|neuter form" -msgstr "%s %s%s%s-en" +msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format @@ -211,12 +211,12 @@ #. 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 "gero, irten errotondatik %1$s-ean %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 "Irten errotondatik %1$s-ean %2$s" +msgstr "" msgid "soon" msgstr "hurrengotan" @@ -328,7 +328,7 @@ #. 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 "Biratu %1$s%2$s-ra %3$s%4$s-tan" +msgstr "" #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|left" @@ -359,7 +359,7 @@ #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -376,7 +376,7 @@ msgstr "" msgid "Exit" -msgstr "Irteera" +msgstr "" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1931,10 +1931,10 @@ 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" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2015-06-12 22:28:37
|
Revision: 6113 http://sourceforge.net/p/navit/code/6113 Author: kazer_ Date: 2015-06-12 22:28:36 +0000 (Fri, 12 Jun 2015) Log Message: ----------- Update:Translations:Updated Estonian translation from launchpad Modified Paths: -------------- trunk/navit/po/et.po.in Modified: trunk/navit/po/et.po.in =================================================================== --- trunk/navit/po/et.po.in 2015-06-12 22:23:42 UTC (rev 6112) +++ trunk/navit/po/et.po.in 2015-06-12 22:28:36 UTC (rev 6113) @@ -1,5 +1,5 @@ # Estonian translations for navit -# Copyright (C) 2006-2014 The Navit Team +# Copyright (C) 2006-2015 The Navit Team # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # Andres Kaaber https://launchpad.net/~imapi @@ -7,19 +7,19 @@ # Manuel Hohmann https://launchpad.net/~mhohmann # lyyser https://launchpad.net/~lyyser # thucar https://launchpad.net/~rait + msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2015-04-13 06:57+0000\n" "Last-Translator: Manuel Hohmann <mho...@ph...>\n" "Language-Team: Estonian <et...@li...>\n" -"Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"Language: et\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -164,27 +164,27 @@ #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. msgid "onto the motorway ramp" -msgstr "kaldteele" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format msgid "%sinto %s%s%s" -msgstr "%s %s%s%s tänavale" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|masculine form" -msgstr "%s %s%s%s tänavale" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|feminine form" -msgstr "%s %s%s%s tänavale" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|neuter form" -msgstr "%s %s%s%s tänavale" +msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format @@ -209,17 +209,17 @@ #. TRANSLATORS: %s is the distance to the roundabout #, c-format msgid "Enter the roundabout %s" -msgstr "Ringteeni %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 "siis lahku ringteelt %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 "Lahku ringteelt %1$s %2$s" +msgstr "" msgid "soon" msgstr "varsti" @@ -228,7 +228,7 @@ msgstr "nüüd" msgid "then" -msgstr "siis" +msgstr "" #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format @@ -335,21 +335,21 @@ #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|left" -msgstr "siis pööra ümber" +msgstr "" #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|left" -msgstr "Pööra ümber %1$s" +msgstr "" #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|right" -msgstr "siis pööra ümber" +msgstr "" #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|right" -msgstr "Pööra ümber %1$s" +msgstr "" #. An empty placeholder that we can use in the future for #. * some motorway commands that are now suppressed but we @@ -362,7 +362,7 @@ #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" msgstr "" @@ -379,7 +379,7 @@ msgstr "" msgid "Exit" -msgstr "Mahasõit" +msgstr "" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1936,10 +1936,10 @@ msgid "Enter Coordinates" msgstr "Sisesta koordinaadid" -#. +#. #. 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" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2015-06-12 22:23:44
|
Revision: 6112 http://sourceforge.net/p/navit/code/6112 Author: kazer_ Date: 2015-06-12 22:23:42 +0000 (Fri, 12 Jun 2015) Log Message: ----------- Update:Translations:Updated Esperanto translation from launchpad Modified Paths: -------------- trunk/navit/po/eo.po.in Modified: trunk/navit/po/eo.po.in =================================================================== --- trunk/navit/po/eo.po.in 2015-06-12 22:23:30 UTC (rev 6111) +++ trunk/navit/po/eo.po.in 2015-06-12 22:23:42 UTC (rev 6112) @@ -1,24 +1,24 @@ # Esperanto translations for navit -# Copyright (C) 2006-2014 The Navit Team +# Copyright (C) 2006-2015 The Navit Team # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # KaZeR https://launchpad.net/~kazer # Lucas Larson https://launchpad.net/~lucaslarson # Michael Moroni https://launchpad.net/~airon90 # OlivierWeb https://launchpad.net/~olivierweb + msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-27 21:43+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Esperanto <eo...@li...>\n" -"Language: eo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"Language: eo\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -163,27 +163,27 @@ #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. msgid "onto the motorway ramp" -msgstr "al la ramplon" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format msgid "%sinto %s%s%s" -msgstr "%sal la %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|masculine form" -msgstr "%sal la %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|feminine form" -msgstr "%sal la %s%s%s" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format msgid "%sinto %s%s%s|neuter form" -msgstr "%sal la %s%s%s" +msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format @@ -213,12 +213,12 @@ #. 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 "do lasu la trafikcirklon ĉe la %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 "Lasu la trafikcirklon ĉe la %1$s %2$s" +msgstr "" msgid "soon" msgstr "baldaŭ" @@ -227,7 +227,7 @@ msgstr "nun" msgid "then" -msgstr "do" +msgstr "" #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format @@ -330,25 +330,25 @@ #. 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 "Turnu %1$s%2$s %3$s%4$s" +msgstr "" #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|left" -msgstr "do ĉirkaŭturnu" +msgstr "" #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|left" -msgstr "Ĉirkaŭturnu %1$s" +msgstr "" #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|right" -msgstr "do ĉirkaŭturnu" +msgstr "" #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|right" -msgstr "Ĉirkaŭturnu %1$s" +msgstr "" #. An empty placeholder that we can use in the future for #. * some motorway commands that are now suppressed but we @@ -361,9 +361,9 @@ #. * #. * UNTESTED ! #. * -#. +#. msgid "follow" -msgstr "sekvu" +msgstr "" msgid "then you have reached your destination." msgstr "do vi atingis la celon" @@ -378,7 +378,7 @@ msgstr "" msgid "Exit" -msgstr "Eliro" +msgstr "" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1933,10 +1933,10 @@ 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" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |