From 1bad323f4ce145d0167c2f082974f7f488721c3b Mon Sep 17 00:00:00 2001
From: Michael Dankov <tryagain@navit-project.org>
Date: Mon, 16 Nov 2015 23:32:37 +0300
Subject: Merge the translations

---
 po/fr_CH.po.in | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'po/fr_CH.po.in')

diff --git a/po/fr_CH.po.in b/po/fr_CH.po.in
index 070441b6f..8619100ee 100644
--- a/po/fr_CH.po.in
+++ b/po/fr_CH.po.in
@@ -200,10 +200,8 @@ msgstr "Préparez vous à vous engager dans le rond-point"
 msgid "Enter the roundabout %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"
+msgid "then enter the roundabout"
+msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
@@ -311,6 +309,10 @@ msgstr "légèrement "
 msgid "strongly "
 msgstr "fortement "
 
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Prenez la %1$s route vers la %2$s"
@@ -319,7 +321,6 @@ msgstr "Prenez la %1$s route vers la %2$s"
 msgid "after %i roads"
 msgstr "après %i rues"
 
-#. 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
 msgid "Turn %1$s%2$s %3$s%4$s"
@@ -350,7 +351,7 @@ msgstr "Faites demi-tour %1$s"
 #. * in cases where relevant destination info is available.
 #. * Even if there is no driving command to be announced, in some cases
 #. * there is an overhead roadsign in preparation of an upcoming road-split,
-#. * and then we can give usefull info to the driver.
+#. * and then we can give useful info to the driver.
 #. *
 #. *  UNTESTED !
 #. *
@@ -2736,3 +2737,7 @@ 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 "then leave the roundabout at the %1$s %2$s"
+#~ msgstr "puis sortez du rond-point à la %1$s %2$s"
-- 
cgit v1.2.1