Update:Translations:Massive translation update from launchpad. Mostly fixing high five merge updatesv0.5.0-beta.1

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6129 ffa7fe5e-494d-0410-b361-a75ebd5db220

1 files changed, 42 insertions, 50 deletions

diff --git a/po/ca.po.in b/po/ca.po.in
index 157cbe075..75316a4a7 100644
--- a/po/ca.po.in
+++ b/po/ca.po.in
@@ -18,7 +18,7 @@ msgid ""
 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 <paloky3@gmail.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -80,14 +80,6 @@ msgid "sixth exit"
 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 @@ msgid "in %d feet"
 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 @@ msgid "in %d.%d miles"
 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[0] "en una milla"
 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 @@ 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 "%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 @@ msgstr "Quan sigui possible, doneu mitja volta"
 #. 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 @@ msgstr "Entreu a la rotonda vinent"
 #. 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 @@ msgid "now"
 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 @@ msgid "Merge %1$s%2$s|left"
 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 @@ msgstr "després de %i carrers"
 #. 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 @@ msgstr ""
 #. *
 #. 
 msgid "follow"
-msgstr ""
+msgstr "seguiu"
 
 msgid "then you have reached your destination."
 msgstr "aleshores heu arribat a destí"
@@ -382,10 +374,10 @@ msgstr "Heu arribat a la destinació %s"
 
 #. 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 @@ msgid "Police"
 msgstr ""
 
 msgid "Justice"
-msgstr ""
+msgstr "Jutjats"
 
 msgid "Taxi"
 msgstr ""