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, 46 insertions, 53 deletions

diff --git a/po/fr_CH.po.in b/po/fr_CH.po.in
index eb68ea324..070441b6f 100644
--- a/po/fr_CH.po.in
+++ b/po/fr_CH.po.in
@@ -3,19 +3,20 @@
 # 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
+# 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: 2013-09-28 01:42+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:58+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: KaZeR <kazer@altern.org>\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: fr_CH\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -70,14 +71,6 @@ msgid "sixth exit"
 msgstr "la sixième sortie"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "dans %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -86,14 +79,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d mètres"
-
-#, c-format
-msgid "in %d meters"
-msgstr "dans %d mètres"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -102,14 +87,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d kilomètres"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "dans %d.%d kilomètres"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -122,6 +99,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d mètres"
+
+#, c-format
+msgid "in %d meters"
+msgstr "dans %d mètres"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d kilomètres"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "dans %d.%d kilomètres"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "un kilomètre"
@@ -136,51 +129,51 @@ msgstr[1] "dans %d kilomètres"
 #. 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$svers %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$svers %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$svers le %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$svers la %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$svers l'%2$s"
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "vers la bretelle"
 
 #. 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 "%ssur %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 "%ssur le %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 "%ssur 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 "%ssur l'%s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -193,7 +186,7 @@ msgstr "Dès que possible, faites demi-tour"
 #. TRANSLATORS: the argument is the destination to follow
 #, c-format
 msgid "towards %s"
-msgstr ""
+msgstr "vers %s"
 
 #, c-format
 msgid "Follow the road for the next %s"
@@ -210,12 +203,12 @@ 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 ""
+msgstr "puis sortez du rond-point à 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 "Sortez du rond-point à la %1$s %2$s"
 
 msgid "soon"
 msgstr "bientôt"
@@ -224,7 +217,7 @@ msgid "now"
 msgstr "maintenant"
 
 msgid "then"
-msgstr ""
+msgstr "puis"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -255,19 +248,19 @@ 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 ""
+msgstr "Prenez la sortie %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 "Prenez la sortie %1$s %2$s%3$s"
 
 #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
 msgid "at interchange"
-msgstr ""
+msgstr "à l'èchangeur"
 
 msgid "at exit"
-msgstr ""
+msgstr "à la sortie"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
@@ -334,21 +327,21 @@ msgstr ""
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "puis faites demi-tour"
 
 #. 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 "Faites demi-tour %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "puis faites demi-tour"
 
 #. 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 "Faites demi-tour %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -363,7 +356,7 @@ msgstr ""
 #. *
 #. 
 msgid "follow"
-msgstr ""
+msgstr "suivez"
 
 msgid "then you have reached your destination."
 msgstr "ensuite vous serez à destination"
@@ -371,14 +364,14 @@ msgstr "ensuite vous serez à destination"
 #. 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 ""
+msgstr "Echangeur"
 
 msgid "Exit"
-msgstr ""
+msgstr "Sortie"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"