From 4512c8bd4050b46446c33fa3caba8b459408d6a5 Mon Sep 17 00:00:00 2001 From: kazer_ Date: Tue, 4 Aug 2015 20:47:30 +0000 Subject: Fix:Android:Default to 0 if we can't find the svn rev of the last commit git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6135 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- po/de.po.in | 12 ++---- po/pt_BR.po.in | 116 ++++++++++++++++++++------------------------------------- 2 files changed, 44 insertions(+), 84 deletions(-) (limited to 'po') diff --git a/po/de.po.in b/po/de.po.in index 2d8fa932..d49324e5 100644 --- a/po/de.po.in +++ b/po/de.po.in @@ -40,8 +40,8 @@ msgid "" 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 \n" +"PO-Revision-Date: 2015-07-23 12:34+0000\n" +"Last-Translator: Robotaxi \n" "Language-Team: Martin Schaller \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -393,7 +393,7 @@ msgstr "dann haben Sie Ihr Ziel erreicht." #. 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 @@ 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 "in %d m" diff --git a/po/pt_BR.po.in b/po/pt_BR.po.in index d534039d..2a53b913 100644 --- a/po/pt_BR.po.in +++ b/po/pt_BR.po.in @@ -85,14 +85,6 @@ msgstr "quinta saída" msgid "sixth exit" 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" @@ -101,14 +93,6 @@ msgstr "%d pés" msgid "in %d feet" 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" @@ -117,14 +101,6 @@ msgstr "%d.%d milhas" msgid "in %d.%d miles" 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" @@ -137,6 +113,22 @@ msgid_plural "in %d miles" msgstr[0] "em uma milha" 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" @@ -218,10 +210,10 @@ msgstr "Continue na via por %s" 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 @@ msgstr "agora" 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 @@ msgstr "após %i vias" 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 @@ msgid "" "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" -- cgit v1.2.1