1 files changed, 126 insertions, 59 deletions
diff --git a/po/fr_CH.po.in b/po/fr_CH.po.in
index db53bf36..34445cc3 100644
--- a/po/fr_CH.po.in
+++ b/po/fr_CH.po.in
@@ -133,8 +133,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "dans un kilomètre"
 msgstr[1] "dans %d kilomètres"
 
-msgid "exit"
-msgstr "sortie"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "vers la sortie"
@@ -164,37 +166,18 @@ msgstr "%ssur l'%s%s%s|neutral form"
 msgid "%sinto the %s"
 msgstr "%svers la %s"
 
-# tournez à droite
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "à droite"
-
-# tournez à gauche
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "à gauche"
-
-# utilisé pour les changements de voie pour les sorties?
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "légèrement "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "fortement "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "très fortement "
-
-# attention à l'espace à la fin
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "inconnu "
-
 msgid "When possible, please turn around"
 msgstr "Dès que possible, faites demi-tour"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Suivez la route sur %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Préparez vous à vous engager dans le rond-point"
 
@@ -203,57 +186,136 @@ 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 %s"
-msgstr "puis sortez du rond-point à la %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Sortez du rond-point à la %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Suivez la route sur %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "bientôt"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "maintenant"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Prenez la %1$s route vers la %2$s"
 
+# tournez à droite
+msgid "right"
+msgstr "à droite"
+
 #, c-format
 msgid "after %i roads"
 msgstr "après %i rues"
 
-msgid "now"
-msgstr "maintenant"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "puis prenez la %1$s route à %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "erreur"
+# utilisé pour les changements de voie pour les sorties?
+msgid "easily "
+msgstr "légèrement "
 
-# espace important après le 2
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "fortement "
+
+# tournez à gauche
+msgid "left"
+msgstr "à gauche"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "%3$s, tournez %1$s%2$s %4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "puis tournez %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
+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"
 
-msgid "then you have reached your destination."
-msgstr "ensuite vous serez à destination"
+msgid "exit"
+msgstr "sortie"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1313,11 +1375,13 @@ msgstr "Inconnu, ajoutez des étiquettes d'is_in à ces villes"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1681,6 +1745,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""