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. |