Merge pull request #45 from navit-gps/i18n/tryagainR6382

Automatic translation import

75 files changed, 832 insertions, 512 deletions

diff --git a/po/af.po.in b/po/af.po.in
index 8736cb982..1db7d22aa 100644
--- a/po/af.po.in
+++ b/po/af.po.in
@@ -205,10 +205,8 @@ msgstr "Gaan kortliks in die sirkel in"
 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 "verlaat dan die sirkel by die %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
@@ -314,6 +312,10 @@ msgid "strongly "
 msgstr "skerp "
 
 #, 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 "Neem die %1$s pad na %2$s"
 
@@ -321,7 +323,6 @@ msgstr "Neem die %1$s pad na %2$s"
 msgid "after %i roads"
 msgstr "na %i paaie"
 
-#. 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"
@@ -352,7 +353,7 @@ msgstr "Draai om %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 !
 #. *
@@ -2738,3 +2739,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 "verlaat dan die sirkel by die %1$s %2$s"
diff --git a/po/ar.po.in b/po/ar.po.in
index 03f545071..83acf2b97 100644
--- a/po/ar.po.in
+++ b/po/ar.po.in
@@ -220,10 +220,8 @@ msgstr "قريباً الدخول إلى المستديرة"
 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 "ثم أخرج من المستديرة عند الــ%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
@@ -329,6 +327,10 @@ msgid "strongly "
 msgstr "بكل شدة "
 
 #, 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 "خذ الطريق %1$s إلى ال%2$s"
 
@@ -336,7 +338,6 @@ msgstr "خذ الطريق %1$s إلى ال%2$s"
 msgid "after %i roads"
 msgstr "بعد %i طرقات"
 
-#. 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"
@@ -367,7 +368,7 @@ msgstr ""
 #. * 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 !
 #. *
@@ -2753,3 +2754,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 "ثم أخرج من المستديرة عند الــ%1$s %2$s"
diff --git a/po/ast.po.in b/po/ast.po.in
index edf0efbc0..42ecf6209 100644
--- a/po/ast.po.in
+++ b/po/ast.po.in
@@ -199,10 +199,8 @@ msgstr "Entre ceo na rotonda"
 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 "llueu dexe la rotonda pola %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
@@ -308,6 +306,10 @@ msgid "strongly "
 msgstr "enforma "
 
 #, 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 "Tome la carretera %1$s dica %2$s"
 
@@ -315,7 +317,6 @@ msgstr "Tome la carretera %1$s dica %2$s"
 msgid "after %i roads"
 msgstr "tres %i carreteres"
 
-#. 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"
@@ -346,7 +347,7 @@ msgstr "De la vuelta %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 !
 #. *
@@ -2732,3 +2733,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 "llueu dexe la rotonda pola %1$s %2$s"
diff --git a/po/be.po.in b/po/be.po.in
index 4bab57e6c..e02daf6bc 100644
--- a/po/be.po.in
+++ b/po/be.po.in
@@ -202,9 +202,7 @@ msgstr ""
 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"
+msgid "then enter the roundabout"
 msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
@@ -311,6 +309,10 @@ msgid "strongly "
 msgstr "мацней "
 
 #, 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 ""
 
@@ -318,7 +320,6 @@ msgstr ""
 msgid "after %i roads"
 msgstr ""
 
-#. 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"
@@ -349,7 +350,7 @@ msgstr "Развярніцеся %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 !
 #. *
diff --git a/po/bg.po.in b/po/bg.po.in
index fe6372582..9da4a8820 100644
--- a/po/bg.po.in
+++ b/po/bg.po.in
@@ -203,10 +203,8 @@ msgstr "Скоро навлизате в кръгово"
 msgid "Enter the roundabout %s"
 msgstr "Навлизате в кръгово %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 "след това излезте от кръговото на %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
@@ -312,6 +310,10 @@ msgid "strongly "
 msgstr "силно "
 
 #, 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 "Тръгнете по %1$s път към %2$s"
 
@@ -319,7 +321,6 @@ msgstr "Тръгнете по %1$s път към %2$s"
 msgid "after %i roads"
 msgstr "след %i пресечки"
 
-#. 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 "Обърнете %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 "след това излезте от кръговото на %1$s %2$s"
diff --git a/po/bs.po.in b/po/bs.po.in
index 633e37369..0fccf3047 100644
--- a/po/bs.po.in
+++ b/po/bs.po.in
@@ -203,9 +203,7 @@ msgstr ""
 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"
+msgid "then enter the roundabout"
 msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
@@ -312,6 +310,10 @@ msgid "strongly "
 msgstr ""
 
 #, 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 ""
 
@@ -319,7 +321,6 @@ msgstr ""
 msgid "after %i roads"
 msgstr ""
 
-#. 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 ""
 #. * 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 !
 #. *
diff --git a/po/ca.po.in b/po/ca.po.in
index 75316a4a7..1e3295650 100644
--- a/po/ca.po.in
+++ b/po/ca.po.in
@@ -209,10 +209,8 @@ msgstr "Entreu a la rotonda vinent"
 msgid "Enter the roundabout %s"
 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 "aleshores deixeu la rotonda a 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
@@ -318,6 +316,10 @@ msgid "strongly "
 msgstr "fortament "
 
 #, 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 "Preneu el %1$s carrer a la %2$s"
 
@@ -325,7 +327,6 @@ msgstr "Preneu el %1$s carrer a la %2$s"
 msgid "after %i roads"
 msgstr "després de %i carrers"
 
-#. 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"
@@ -356,7 +357,7 @@ msgstr "Doneu mitja volta %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 !
 #. *
@@ -2742,3 +2743,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 "aleshores deixeu la rotonda a la %1$s %2$s"
diff --git a/po/ckb.po.in b/po/ckb.po.in
index d62af1831..a48992145 100644
--- a/po/ckb.po.in
+++ b/po/ckb.po.in
@@ -198,9 +198,7 @@ msgstr ""
 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"
+msgid "then enter the roundabout"
 msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
@@ -307,6 +305,10 @@ msgid "strongly "
 msgstr ""
 
 #, 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 ""
 
@@ -314,7 +316,6 @@ msgstr ""
 msgid "after %i roads"
 msgstr ""
 
-#. 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"
@@ -345,7 +346,7 @@ msgstr ""
 #. * 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 !
 #. *
diff --git a/po/cs.po.in b/po/cs.po.in
index 106124850..db0cbba29 100644
--- a/po/cs.po.in
+++ b/po/cs.po.in
@@ -215,10 +215,8 @@ msgstr "Brzy najeďte na kruhový objezd"
 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 "pak sjeďte na %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
@@ -324,6 +322,10 @@ msgid "strongly "
 msgstr "silně "
 
 #, 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 "Jeďte na %1$s silnici %2$s"
 
@@ -331,7 +333,6 @@ msgstr "Jeďte na %1$s silnici %2$s"
 msgid "after %i roads"
 msgstr "za %i silnice"
 
-#. 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"
@@ -362,7 +363,7 @@ msgstr "Otočte se %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 !
 #. *
@@ -2767,3 +2768,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 "pak sjeďte na %1$s %2$s"
diff --git a/po/cy.po.in b/po/cy.po.in
index 24046d409..2703fd1c1 100644
--- a/po/cy.po.in
+++ b/po/cy.po.in
@@ -203,9 +203,7 @@ msgstr ""
 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"
+msgid "then enter the roundabout"
 msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
@@ -312,6 +310,10 @@ msgid "strongly "
 msgstr "yn cryf "
 
 #, 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 ""
 
@@ -319,7 +321,6 @@ msgstr ""
 msgid "after %i roads"
 msgstr ""
 
-#. 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 ""
 #. * 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 !
 #. *
diff --git a/po/da.po.in b/po/da.po.in
index 939f07445..4100c8f30 100644
--- a/po/da.po.in
+++ b/po/da.po.in
@@ -207,10 +207,8 @@ msgstr "Kør snart ind i rundkørslen"
 msgid "Enter the roundabout %s"
 msgstr "Kør ind i rundkørslen %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 "forlad så rundkørslen ved den %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
@@ -316,6 +314,10 @@ msgid "strongly "
 msgstr "skarpt "
 
 #, 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 "Tag den %1$s vej til %2$s"
 
@@ -323,7 +325,6 @@ msgstr "Tag den %1$s vej til %2$s"
 msgid "after %i roads"
 msgstr "efter %i veje"
 
-#. 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"
@@ -354,7 +355,7 @@ msgstr "Vend om %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 !
 #. *
@@ -2740,3 +2741,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 "forlad så rundkørslen ved den %1$s %2$s"
diff --git a/po/de.po.in b/po/de.po.in
index 9a6285592..0972a361d 100644
--- a/po/de.po.in
+++ b/po/de.po.in
@@ -22,6 +22,7 @@
 # Mathias Klein https://launchpad.net/~ma-klein
 # Paulodile https://launchpad.net/~stuff4tschaka
 # Roadrunner IN https://launchpad.net/~online
+# Robotaxi https://launchpad.net/~robotaxi
 # Roschkor https://launchpad.net/~bound-one2000
 # S.E. https://launchpad.net/~stephan-evert
 # Stefan Sordon https://launchpad.net/~stefan-sordon
@@ -34,20 +35,18 @@
 # singesang https://launchpad.net/~singesang
 # spaetz https://launchpad.net/~spaetz
 # vsandre https://launchpad.net/~riedel-andre
+
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-09 05:18+0000\n"
-"PO-Revision-Date: 2015-08-11 10:56+0000\n"
-"Last-Translator: Robotaxi <robotaxi@arcor.de>\n"
+"PO-Revision-Date: 2015-09-14 07:17+0000\n"
+"Last-Translator: Mathias Klein <ma_klein@gmx.de>\n"
 "Language-Team: Martin Schaller <martin-s@sourceforge.net>\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"
-"X-Launchpad-Export-Date: 2015-09-11 16:12+0000\n"
-"X-Generator: Launchpad (build 17720)\n"
 "Language: de\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -116,7 +115,7 @@ msgstr "%d,%d Meilen"
 
 #, c-format
 msgid "in %d.%d miles"
-msgstr "In %d,%d Meilen"
+msgstr "in %d,%d Meilen"
 
 #, c-format
 msgid "one mile"
@@ -340,6 +339,10 @@ msgid "strongly "
 msgstr "scharf "
 
 #, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr "dann die %1$s Straße %2$s abbiegen"
+
+#, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Die %1$s Straße %2$s abbiegen"
 
@@ -347,7 +350,6 @@ msgstr "Die %1$s Straße %2$s abbiegen"
 msgid "after %i roads"
 msgstr "nach %i Straßen"
 
-#. 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"
@@ -378,7 +380,7 @@ msgstr "Wenden Sie %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 !
 #. *
@@ -1618,10 +1620,10 @@ msgid "Opens address search dialog"
 msgstr "Öffnet Adresssuche-Dialog"
 
 msgid "_POI search"
-msgstr ""
+msgstr "_POI Suche"
 
 msgid "Opens POI search dialog"
-msgstr ""
+msgstr "Öffnet POI Suche"
 
 msgid "_Stop Navigation"
 msgstr "Navigation be_enden"
@@ -1716,7 +1718,7 @@ msgstr "Entfernung vom Bildschirmmittelpunkt (km)"
 
 #, c-format
 msgid "POI %s. %s"
-msgstr ""
+msgstr "POI %s. %s"
 
 #, c-format
 msgid "Set destination to %ld, %ld \n"
@@ -2094,7 +2096,7 @@ msgid "Cancel"
 msgstr "Abbrechen"
 
 msgid "filenamePath"
-msgstr ""
+msgstr "Dateipfad"
 
 msgid ""
 "New location set to %s\n"
@@ -2305,7 +2307,7 @@ msgid "Cumbria"
 msgstr "Cumbria"
 
 msgid "East yorkshire with hull"
-msgstr ""
+msgstr "East Yorkshire und Hull"
 
 msgid "Essex"
 msgstr "Essex"
@@ -2475,6 +2477,7 @@ msgstr "Fertig in"
 
 msgid "Media selected for map storage is not available"
 msgstr ""
+"Der eingestellte Speicherort für das Kartenmaterial ist nicht verfügbar."
 
 #. Android resource: @strings/map_download_not_enough_free_space
 msgid "Not enough free space"
@@ -2796,7 +2799,7 @@ msgstr "Wiederherstellen"
 
 #. Android resource: @strings/TTS_title_data_missing
 msgid "System text to speech engine data is missing"
-msgstr ""
+msgstr "System-Sprachausgabedaten sind nicht verfügbar"
 
 #. Android resource: @strings/TTS_qery_install_data
 msgid ""
@@ -2807,3 +2810,15 @@ msgstr ""
 "Navit kann jede text-to-speech Engine nutzen, die installiert ist. Die "
 "derzeit angewählte Engine kann Ihre Sprache nicht wiedergeben. Soll das "
 "System den Voice-Download Dialog öffnen?"
+
+#, c-format
+#~ msgid "then leave the roundabout at the %1$s %2$s"
+#~ msgstr "anschließend verlassen Sie den Kreisverkehr an der %1$s %2$s"
+
+#, c-format
+#~ msgid "in %d m"
+#~ msgstr "in %d m"
+
+#, c-format
+#~ msgid "%d m"
+#~ msgstr "%d m"
diff --git a/po/de_CH.po.in b/po/de_CH.po.in
index f2cdef943..84f3abf63 100644
--- a/po/de_CH.po.in
+++ b/po/de_CH.po.in
@@ -198,9 +198,7 @@ msgstr ""
 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"
+msgid "then enter the roundabout"
 msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
@@ -307,6 +305,10 @@ msgid "strongly "
 msgstr ""
 
 #, 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 ""
 
@@ -314,7 +316,6 @@ msgstr ""
 msgid "after %i roads"
 msgstr ""
 
-#. 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"
@@ -345,7 +346,7 @@ msgstr ""
 #. * 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 !
 #. *
diff --git a/po/el.po.in b/po/el.po.in
index 086bf3f16..f85f6d63e 100644
--- a/po/el.po.in
+++ b/po/el.po.in
@@ -205,10 +205,8 @@ msgstr "Μπές στη κυκλική πορεία άμεσα"
 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 "και βγείτε απο την κυκλική πορεία στην %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
@@ -314,6 +312,10 @@ msgid "strongly "
 msgstr "κλειστά "
 
 #, 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 "Πάρτε τον %1$s δρόμο για το %2$s"
 
@@ -321,7 +323,6 @@ msgstr "Πάρτε τον %1$s δρόμο για το %2$s"
 msgid "after %i roads"
 msgstr "μετά από %i δρόμους"
 
-#. 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"
@@ -352,7 +353,7 @@ msgstr "Κάνε αναστροφή %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 "και βγείτε απο την κυκλική πορεία στην %1$s %2$s"
diff --git a/po/en_AU.po.in b/po/en_AU.po.in
index 46f141317..e6e8a2c61 100644
--- a/po/en_AU.po.in
+++ b/po/en_AU.po.in
@@ -201,9 +201,7 @@ msgstr ""
 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"
+msgid "then enter the roundabout"
 msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
@@ -310,6 +308,10 @@ msgid "strongly "
 msgstr "strongly "
 
 #, 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 "Take the %1$s road to the %2$s"
 
@@ -317,7 +319,6 @@ msgstr "Take the %1$s road to the %2$s"
 msgid "after %i roads"
 msgstr "after %i roads"
 
-#. 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"
@@ -348,7 +349,7 @@ msgstr "Make a U-turn %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 !
 #. *
diff --git a/po/en_CA.po.in b/po/en_CA.po.in
index 97ec63eb8..67b3066e1 100644
--- a/po/en_CA.po.in
+++ b/po/en_CA.po.in
@@ -198,9 +198,7 @@ msgstr ""
 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"
+msgid "then enter the roundabout"
 msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
@@ -307,6 +305,10 @@ msgid "strongly "
 msgstr "strongly "
 
 #, 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 "Take the %1$s road to the %2$s"
 
@@ -314,7 +316,6 @@ msgstr "Take the %1$s road to the %2$s"
 msgid "after %i roads"
 msgstr "after %i roads"
 
-#. 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"
@@ -345,7 +346,7 @@ msgstr "Make a U-turn %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 !
 #. *
diff --git a/po/en_GB.po.in b/po/en_GB.po.in
index a9494c875..993dffe48 100644
--- a/po/en_GB.po.in
+++ b/po/en_GB.po.in
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-07-19 03:58+0000\n"
-"Last-Translator: jan <jandegr1@hotmail.com>\n"
+"PO-Revision-Date: 2015-08-29 12:36+0000\n"
+"Last-Translator: Andi Chandler <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -136,12 +136,12 @@ msgstr[1] "in %d kilometres"
 #. 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$sonto the %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$sonto %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
@@ -165,7 +165,7 @@ msgstr "onto the slip road"
 #. 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 "%sinto %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
@@ -193,7 +193,7 @@ msgstr "When possible, please turn around"
 #. TRANSLATORS: the argument is the destination to follow
 #, c-format
 msgid "towards %s"
-msgstr ""
+msgstr "towards %s"
 
 #, c-format
 msgid "Follow the road for the next %s"
@@ -205,17 +205,15 @@ msgstr "Enter the roundabout soon"
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
 msgid "Enter the roundabout %s"
-msgstr ""
+msgstr "Enter the roundabout %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"
+msgid "then enter the roundabout"
 msgstr ""
 
 #. 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 "Leave the roundabout at the %1$s %2$s"
 
 msgid "soon"
 msgstr "soon"
@@ -224,7 +222,7 @@ msgid "now"
 msgstr "now"
 
 msgid "then"
-msgstr ""
+msgstr "then"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -247,57 +245,57 @@ msgid "Merge %1$s%2$s|left"
 msgstr "Merge %1$s%2$s"
 
 msgid "on your left"
-msgstr ""
+msgstr "on your left"
 
 msgid "on your right"
-msgstr ""
+msgstr "on your right"
 
 #. 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 "Take exit %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 "Take the exit %1$s %2$s%3$s"
 
 #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
 msgid "at interchange"
 msgstr "at interchange"
 
 msgid "at exit"
-msgstr ""
+msgstr "at exit"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then continue straight%1$s"
-msgstr ""
+msgstr "then continue straight%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Continue straight %1$s%2$s%3$s"
-msgstr ""
+msgstr "Continue straight %1$s%2$s%3$s"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then keep right%1$s"
-msgstr ""
+msgstr "then keep right%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Keep right %1$s%2$s%3$s"
-msgstr ""
+msgstr "Keep right %1$s%2$s%3$s"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then keep left%1$s"
-msgstr ""
+msgstr "then keep left%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Keep left %1$s%2$s%3$s"
-msgstr ""
+msgstr "Keep left %1$s%2$s%3$s"
 
 #. TRANSLATORS: "right" as in "turn right"
 msgid "right"
@@ -316,6 +314,10 @@ msgid "strongly "
 msgstr "strongly "
 
 #, 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 "Take the %1$s road to the %2$s"
 
@@ -323,7 +325,6 @@ msgstr "Take the %1$s road to the %2$s"
 msgid "after %i roads"
 msgstr "after %i roads"
 
-#. 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"
@@ -354,13 +355,13 @@ msgstr "Make a U-turn %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 !
 #. *
 #. 
 msgid "follow"
-msgstr ""
+msgstr "follow"
 
 msgid "then you have reached your destination."
 msgstr "then you have reached your destination"
@@ -1443,6 +1444,15 @@ msgid ""
 "\t-h: print this usage info and exit.\n"
 "\t-v: print the version and exit.\n"
 msgstr ""
+"navit usage:\n"
+"navit [options] [configfile]\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"
 
 #. We have not found an existing config file from all possibilities
 msgid "No config file navit.xml, navit.xml.local found\n"
@@ -2037,6 +2047,9 @@ msgid ""
 "Please restart Navit after you attach an SD card or select a different map "
 "location."
 msgstr ""
+"Current map location %s is not available\n"
+"Please restart Navit after you attach an SD card or select a different map "
+"location."
 
 msgid "Downloaded maps"
 msgstr "Downloaded maps"
@@ -2045,17 +2058,21 @@ msgid ""
 "Sorry, we currently do not support maps above 3.8G on Android, please select "
 "a smaller one."
 msgstr ""
+"Sorry, we currently do not support maps above 3.8G on Android, please select "
+"a smaller one."
 
 msgid "Cancel"
 msgstr "Cancel"
 
 msgid "filenamePath"
-msgstr ""
+msgstr "filenamePath"
 
 msgid ""
 "New location set to %s\n"
 "Restart Navit to apply the changes."
 msgstr ""
+"New location set to %s\n"
+"Restart Navit to apply the changes."
 
 msgid "Whole Planet"
 msgstr "Whole Planet"
@@ -2428,7 +2445,7 @@ msgid "ready"
 msgstr "ready"
 
 msgid "Media selected for map storage is not available"
-msgstr ""
+msgstr "Media selected for map storage is not available"
 
 #. Android resource: @strings/map_download_not_enough_free_space
 msgid "Not enough free space"
@@ -2613,7 +2630,7 @@ msgstr "Backup / Restore"
 
 #. Android resource: @strings/optionsmenu_set_map_location
 msgid "Set map location"
-msgstr ""
+msgstr "Set map location"
 
 #. Android resource: @strings/map_delete
 msgid "Delete this map?"
@@ -2745,7 +2762,7 @@ msgstr "Restore"
 
 #. Android resource: @strings/TTS_title_data_missing
 msgid "System text to speech engine data is missing"
-msgstr ""
+msgstr "System text to speech engine data is missing"
 
 #. Android resource: @strings/TTS_qery_install_data
 msgid ""
@@ -2753,3 +2770,10 @@ msgid ""
 "currently selected engine reports it is unable to speak in your language. "
 "Should we ask the system to show voice download dialog?"
 msgstr ""
+"Navit can use any text to speech engine installed on your device. The "
+"currently selected engine reports it is unable to speak in your language. "
+"Should we ask the system to show voice download dialog?"
+
+#, c-format
+#~ msgid "then leave the roundabout at the %1$s %2$s"
+#~ msgstr "then leave the roundabout at the %1$s %2$s"
diff --git a/po/eo.po.in b/po/eo.po.in
index c31ea5c2c..265ed1601 100644
--- a/po/eo.po.in
+++ b/po/eo.po.in
@@ -203,10 +203,8 @@ msgstr ""
 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 "do lasu la trafikcirklon ĉe 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
@@ -312,6 +310,10 @@ msgid "strongly "
 msgstr "forte "
 
 #, 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 "Turnu %2$s ĉe la strato %1$s"
 
@@ -319,7 +321,6 @@ msgstr "Turnu %2$s ĉe la strato %1$s"
 msgid "after %i roads"
 msgstr "post %i stratoj"
 
-#. 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 "Ĉirkaŭturnu %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 "do lasu la trafikcirklon ĉe la %1$s %2$s"
diff --git a/po/es.po.in b/po/es.po.in
index 1c2082c61..09a91ae6f 100644
--- a/po/es.po.in
+++ b/po/es.po.in
@@ -215,10 +215,8 @@ msgstr "Entre en la próxima rotonda"
 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 "después salga de la rotonda por 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
@@ -324,6 +322,10 @@ msgid "strongly "
 msgstr "bruscamente "
 
 #, 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 "Tome la %1$s carretera %2$s"
 
@@ -331,7 +333,6 @@ msgstr "Tome la %1$s carretera %2$s"
 msgid "after %i roads"
 msgstr "después de %i carreteras"
 
-#. 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"
@@ -362,7 +363,7 @@ msgstr "Dé la vuelta %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 !
 #. *
@@ -2768,3 +2769,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 "después salga de la rotonda por la %1$s %2$s"
diff --git a/po/et.po.in b/po/et.po.in
index d802ab548..5a70ca072 100644
--- a/po/et.po.in
+++ b/po/et.po.in
@@ -203,10 +203,8 @@ msgstr "Sõida varsti ringteele"
 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 "siis lahku ringteelt %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
@@ -312,6 +310,10 @@ msgid "strongly "
 msgstr "järsult "
 
 #, 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 "Vali %1$s tee, mis viib %2$s"
 
@@ -319,7 +321,6 @@ msgstr "Vali %1$s tee, mis viib %2$s"
 msgid "after %i roads"
 msgstr "pärast %i teed"
 
-#. 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 "Pööra ümber %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 !
 #. *
@@ -2754,3 +2755,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 "siis lahku ringteelt %1$s %2$s"
diff --git a/po/eu.po.in b/po/eu.po.in
index 49128aacf..7d8b37eea 100644
--- a/po/eu.po.in
+++ b/po/eu.po.in
@@ -200,10 +200,8 @@ msgstr ""
 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 "gero, irten errotondatik %1$s-ean %2$s"
+msgid "then enter the roundabout"
+msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
@@ -309,6 +307,10 @@ msgid "strongly "
 msgstr "gogorki "
 
 #, 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 "Hartu %1$s bidea %2$s-ean"
 
@@ -316,7 +318,6 @@ msgstr "Hartu %1$s bidea %2$s-ean"
 msgid "after %i roads"
 msgstr "%i bideen ondoren"
 
-#. 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"
@@ -347,7 +348,7 @@ msgstr ""
 #. * 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 !
 #. *
@@ -2733,3 +2734,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 "gero, irten errotondatik %1$s-ean %2$s"
diff --git a/po/fa.po.in b/po/fa.po.in
index dd1838f3b..e4254d32a 100644
--- a/po/fa.po.in
+++ b/po/fa.po.in
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Michael von Glasow https://launchpad.net/~michael-vonglasow
+# reza ghasemirad https://launchpad.net/~regh778
 # the_cephalex https://launchpad.net/~ali-rashidi
 
 msgid ""
@@ -199,9 +200,7 @@ msgstr "به زودی به فلکه بروید"
 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"
+msgid "then enter the roundabout"
 msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
@@ -308,6 +307,10 @@ msgid "strongly "
 msgstr "به سختی "
 
 #, 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 ""
 
@@ -315,7 +318,6 @@ msgstr ""
 msgid "after %i roads"
 msgstr ""
 
-#. 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"
@@ -346,7 +348,7 @@ msgstr ""
 #. * 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 !
 #. *
diff --git a/po/fi.po.in b/po/fi.po.in
index 3f5805c9c..bbe3cda1a 100644
--- a/po/fi.po.in
+++ b/po/fi.po.in
@@ -205,9 +205,7 @@ msgstr "Liity liikenneympyrään pian"
 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"
+msgid "then enter the roundabout"
 msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
@@ -314,6 +312,10 @@ msgid "strongly "
 msgstr "jyrkästi "
 
 #, 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 "Valitse %1$s tie suuntaan %2$s"
 
@@ -321,7 +323,6 @@ msgstr "Valitse %1$s tie suuntaan %2$s"
 msgid "after %i roads"
 msgstr "%i tien jälkeen"
 
-#. 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"
@@ -352,7 +353,7 @@ msgstr "Tee u-käännös %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 !
 #. *
diff --git a/po/fil.po.in b/po/fil.po.in
index 229770a14..8178227f6 100644
--- a/po/fil.po.in
+++ b/po/fil.po.in
@@ -198,10 +198,8 @@ msgstr ""
 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 "pagkatapos ay lumabas sa rotonda sa may %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
@@ -307,6 +305,10 @@ msgid "strongly "
 msgstr ""
 
 #, 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 ""
 
@@ -314,7 +316,6 @@ msgstr ""
 msgid "after %i roads"
 msgstr ""
 
-#. 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"
@@ -345,7 +346,7 @@ msgstr ""
 #. * 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 !
 #. *
@@ -2727,3 +2728,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 "pagkatapos ay lumabas sa rotonda sa may %1$s %2$s"
diff --git a/po/fo.po.in b/po/fo.po.in
index 9c5e40c75..dff6442e8 100644
--- a/po/fo.po.in
+++ b/po/fo.po.in
@@ -200,10 +200,8 @@ msgstr "Um lítið bil verður koyrt inní rundkoyringina"
 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 "far so út úr rundkoyring við %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
@@ -309,6 +307,10 @@ msgid "strongly "
 msgstr "knapt "
 
 #, 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 "tak tann %1$s vegin til %2$s"
 
@@ -316,7 +318,6 @@ msgstr "tak tann %1$s vegin til %2$s"
 msgid "after %i roads"
 msgstr "eftir %i vegir"
 
-#. 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"
@@ -347,7 +348,7 @@ msgstr "Vend um %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 !
 #. *
@@ -2729,3 +2730,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 "far so út úr rundkoyring við %1$s %2$s"
diff --git a/po/fr.po.in b/po/fr.po.in
index 06af624c6..5ac74d876 100644
--- a/po/fr.po.in
+++ b/po/fr.po.in
@@ -30,8 +30,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-08-13 20:49+0000\n"
-"Last-Translator: tuxi <Unknown>\n"
+"PO-Revision-Date: 2015-11-09 11:15+0000\n"
+"Last-Translator: Jean-Marc <Unknown>\n"
 "Language-Team: KaZeR <kazer@altern.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,11 +45,11 @@ msgstr "Éxecution depuis le dossier d'origine\n"
 
 #, c-format
 msgid "setting '%s' to '%s'\n"
-msgstr "Paramètre '%s' changé en '%s'\n"
+msgstr "Paramètre « %s » changé en « %s »\n"
 
 #. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
-msgstr "zéroième"
+msgstr "prochaine"
 
 msgid "first"
 msgstr "première"
@@ -71,7 +71,7 @@ msgstr "sixième"
 
 #. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
-msgstr "zéroième sortie"
+msgstr "prochaine sortie"
 
 msgid "first exit"
 msgstr "première sortie"
@@ -101,11 +101,11 @@ msgstr "dans %d pieds"
 
 #, c-format
 msgid "%d.%d miles"
-msgstr "%d.%d milles"
+msgstr "%d.%d miles"
 
 #, c-format
 msgid "in %d.%d miles"
-msgstr "dans %d.%d milles"
+msgstr "dans %d.%d miles"
 
 #, c-format
 msgid "one mile"
@@ -174,7 +174,7 @@ msgstr "%1$svers l'%2$s"
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr "vers la bretelle"
+msgstr "et prendre la bretelle"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
@@ -219,12 +219,10 @@ msgstr "Préparez vous à vous engager dans le rond-point"
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
 msgid "Enter the roundabout %s"
-msgstr "à %s Entrez dans le rond-point"
+msgstr "%s Entrez dans le rond-point"
 
-#. 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 "puis engagez-vous dans le rond-point"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
@@ -243,22 +241,22 @@ msgstr "puis"
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "then merge%1$s|right"
-msgstr "Puis prendre à droite sur %1$s"
+msgstr "Puis prendre à droite %1$s"
 
 #. 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 %1$s%2$s|right"
-msgstr "à %1$s prendre à droite sur %2$s"
+msgstr "%1$s prendre à droite %2$s"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "then merge%1$s|left"
-msgstr "Puis prendre à gauche sur %1$s"
+msgstr "Puis prendre à gauche %1$s"
 
 #. 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 %1$s%2$s|left"
-msgstr "à %1$s prendre à gauche sur %2$s"
+msgstr "%1$s prendre à gauche %2$s"
 
 msgid "on your left"
 msgstr "sur votre gauche"
@@ -286,32 +284,32 @@ msgstr "à la sortie"
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then continue straight%1$s"
-msgstr "Puis continuez tout droit sur %1$s"
+msgstr "puis continuez tout droit %1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Continue straight %1$s%2$s%3$s"
-msgstr "à %1$s continuez tout droit sur %2$s en direction de %3$s"
+msgstr "%1$s continuez tout droit %2$s%3$s"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then keep right%1$s"
-msgstr "Puis restez sur la voie de droite sur %1$s"
+msgstr "puis restez sur les voies de droite %1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Keep right %1$s%2$s%3$s"
-msgstr "à %1$s Restez sur la voie de droite sur %2$s en direction de %3$s"
+msgstr "%1$s Restez sur les voies de droite %2$s%3$s"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then keep left%1$s"
-msgstr "Puis restez sur la voie de gauche sur %1$s"
+msgstr "puis restez sur les voies de gauche %1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Keep left %1$s%2$s%3$s"
-msgstr "à %1$s Restez sur la voie de gauche sur %2$s en direction de %3$s"
+msgstr "%1$s Restez sur les voies de gauche %2$s%3$s"
 
 # tournez à droite
 #. TRANSLATORS: "right" as in "turn right"
@@ -333,6 +331,10 @@ msgid "strongly "
 msgstr "fortement "
 
 #, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr "puis prenez la %1$s route à %2$s"
+
+#, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Empreintez la %1$s rue en direction de %2$s"
 
@@ -340,11 +342,10 @@ msgstr "Empreintez la %1$s rue en direction de %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"
-msgstr "à %3$s Tournez %1$s sur %2$s en direction de %4$s"
+msgstr "%3$s, tournez %1$s%2$s %4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
@@ -371,13 +372,13 @@ 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 !
 #. *
 #. 
 msgid "follow"
-msgstr "suivez"
+msgstr "suivre"
 
 msgid "then you have reached your destination."
 msgstr "puis vous arriverez à destination"
@@ -1601,7 +1602,7 @@ msgid "_POI search"
 msgstr "recherche de points d'intérêt"
 
 msgid "Opens POI search dialog"
-msgstr ""
+msgstr "Ouvrir la recherche des points d'intérêts"
 
 msgid "_Stop Navigation"
 msgstr "Annuler le trajet"
@@ -1716,7 +1717,7 @@ msgid "Select a category"
 msgstr "Sélectionnez une catégorie"
 
 msgid "Select a distance to look for (km)"
-msgstr ""
+msgstr "Sélectionnez une distance à chercher (km)"
 
 msgid "Select a POI"
 msgstr "Sélectionnez un point d'intérêt"
@@ -2022,11 +2023,11 @@ msgid "Prev"
 msgstr "Précédent"
 
 msgid "Return to route!"
-msgstr "Retour à la route!"
+msgstr "Retournez sur la route"
 
 #. warning told
 msgid "Look out! Camera!"
-msgstr "Attention! Radar!"
+msgstr "Attention ! Contrôle radar !"
 
 #. warning told
 msgid "Please decrease your speed"
@@ -2776,3 +2777,15 @@ 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"
+
+#, c-format
+#~ msgid "in %d m"
+#~ msgstr "dans %d m"
+
+#, c-format
+#~ msgid "%d m"
+#~ msgstr "%d m"
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
@@ -312,6 +310,10 @@ 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"
diff --git a/po/fy.po.in b/po/fy.po.in
index 27a8d22da..678db39dd 100644
--- a/po/fy.po.in
+++ b/po/fy.po.in
@@ -198,9 +198,7 @@ msgstr ""
 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"
+msgid "then enter the roundabout"
 msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
@@ -307,6 +305,10 @@ msgid "strongly "
 msgstr ""
 
 #, 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 ""
 
@@ -314,7 +316,6 @@ msgstr ""
 msgid "after %i roads"
 msgstr ""
 
-#. 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"
@@ -345,7 +346,7 @@ msgstr ""
 #. * 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 !
 #. *
diff --git a/po/gl.po.in b/po/gl.po.in
index b60b28614..d1a30c2f7 100644
--- a/po/gl.po.in
+++ b/po/gl.po.in
@@ -202,10 +202,8 @@ msgstr "Métase pronto na rotonda"
 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 "logo saia da rotonda pola %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 @@ msgid "strongly "
 msgstr "bruscamente "
 
 #, 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 "Tome a estrada %1$s cara o %2$s"
 
@@ -318,7 +320,6 @@ msgstr "Tome a estrada %1$s cara o %2$s"
 msgid "after %i roads"
 msgstr "despois de %i estradas"
 
-#. 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"
@@ -349,7 +350,7 @@ msgstr "Dea a volta %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 !
 #. *
@@ -2733,3 +2734,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 "logo saia da rotonda pola %1$s %2$s"
diff --git a/po/he.po.in b/po/he.po.in
index d17b4ac8c..f07d2bb07 100644
--- a/po/he.po.in
+++ b/po/he.po.in
@@ -204,10 +204,8 @@ msgstr "הכנס לכיכר הקרובה"
 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 "אחר כך צא מהכיכר ב%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
@@ -313,6 +311,10 @@ msgid "strongly "
 msgstr "בצורה חדה "
 
 #, 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 "קח את הכביש ה%1$s אל %2$s"
 
@@ -320,7 +322,6 @@ msgstr "קח את הכביש ה%1$s אל %2$s"
 msgid "after %i roads"
 msgstr "לאחר %i כבישים"
 
-#. 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"
@@ -351,7 +352,7 @@ msgstr ""
 #. * 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 !
 #. *
@@ -2737,3 +2738,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 "אחר כך צא מהכיכר ב%1$s %2$s"
diff --git a/po/hi.po.in b/po/hi.po.in
index 06eff1c0c..ceaa91806 100644
--- a/po/hi.po.in
+++ b/po/hi.po.in
@@ -200,10 +200,8 @@ msgstr ""
 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 "तो %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
@@ -309,6 +307,10 @@ msgid "strongly "
 msgstr "दृढ़ता से "
 
 #, 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 "%1$s %2$s के लिए सड़क ले लो"
 
@@ -316,7 +318,6 @@ msgstr "%1$s %2$s के लिए सड़क ले लो"
 msgid "after %i roads"
 msgstr "%i के बाद सड़कों"
 
-#. 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"
@@ -347,7 +348,7 @@ msgstr "चारों ओर मोड़ %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 !
 #. *
@@ -2729,3 +2730,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 "तो %1$s %2$s के राउंडअबाउट छोड़"
diff --git a/po/hr.po.in b/po/hr.po.in
index d6216dea8..e0e956f00 100644
--- a/po/hr.po.in
+++ b/po/hr.po.in
@@ -205,10 +205,8 @@ msgstr ""
 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 "onda napustite kružni tok na %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
@@ -314,6 +312,10 @@ msgid "strongly "
 msgstr "teško "
 
 #, 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 "Vozite cestom %1$s do %2$s"
 
@@ -321,7 +323,6 @@ msgstr "Vozite cestom %1$s do %2$s"
 msgid "after %i roads"
 msgstr "nakon %i ceste"
 
-#. 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"
@@ -352,7 +353,7 @@ msgstr "Okrenite se %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 !
 #. *
@@ -2738,3 +2739,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 "onda napustite kružni tok na %1$s %2$s"
diff --git a/po/hu.po.in b/po/hu.po.in
index 622146217..e658e77c0 100644
--- a/po/hu.po.in
+++ b/po/hu.po.in
@@ -205,10 +205,8 @@ msgstr "Hajtson be a körforgalomba hamarosan."
 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 "majd hagyja el a körforgalmat a(z) %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
@@ -314,6 +312,10 @@ msgid "strongly "
 msgstr "élesen "
 
 #, 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 "A(z) %1$s útnál forduljon %2$s"
 
@@ -321,7 +323,6 @@ msgstr "A(z) %1$s útnál forduljon %2$s"
 msgid "after %i roads"
 msgstr "%i út után"
 
-#. 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"
@@ -352,7 +353,7 @@ msgstr "Fordujon meg %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 !
 #. *
@@ -2750,3 +2751,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 "majd hagyja el a körforgalmat a(z) %1$s %2$s"
diff --git a/po/id.po.in b/po/id.po.in
index 9a6d88743..706f23f14 100644
--- a/po/id.po.in
+++ b/po/id.po.in
@@ -202,10 +202,8 @@ msgstr "segera memasuki bundaran"
 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 "kemudian tinggalkan bundaran pada %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 @@ msgid "strongly "
 msgstr "Sangat "
 
 #, 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 "Ambil %1$s jalan ke %2$s"
 
@@ -318,7 +320,6 @@ msgstr "Ambil %1$s jalan ke %2$s"
 msgid "after %i roads"
 msgstr "setelah %i jalan"
 
-#. 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"
@@ -349,7 +350,7 @@ msgstr "Balik arah %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 !
 #. *
@@ -2735,3 +2736,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 "kemudian tinggalkan bundaran pada %1$s %2$s"
diff --git a/po/it.po.in b/po/it.po.in
index c89eb9d6f..106cb19a1 100644
--- a/po/it.po.in
+++ b/po/it.po.in
@@ -215,10 +215,8 @@ msgstr "Tra poco si entrerà in rotonda"
 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 "e alla rotonda prendere 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
@@ -324,6 +322,10 @@ msgid "strongly "
 msgstr "decisamente "
 
 #, 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 "Prendere la %1$s strada a %2$s"
 
@@ -331,7 +333,6 @@ msgstr "Prendere la %1$s strada a %2$s"
 msgid "after %i roads"
 msgstr "tra %i strade"
 
-#. 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"
@@ -362,7 +363,7 @@ msgstr "Invertire il senso di marcia %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 !
 #. *
@@ -2767,3 +2768,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 "e alla rotonda prendere la %1$s %2$s"
diff --git a/po/ja.po.in b/po/ja.po.in
index 39f705243..8e9f53ce2 100644
--- a/po/ja.po.in
+++ b/po/ja.po.in
@@ -200,9 +200,7 @@ msgstr ""
 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"
+msgid "then enter the roundabout"
 msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
@@ -309,6 +307,10 @@ msgid "strongly "
 msgstr ""
 
 #, 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 ""
 
@@ -316,7 +318,6 @@ msgstr ""
 msgid "after %i roads"
 msgstr ""
 
-#. 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"
@@ -347,7 +348,7 @@ msgstr ""
 #. * 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 !
 #. *
diff --git a/po/jv.po.in b/po/jv.po.in
index 3df25ba35..b0e4df660 100644
--- a/po/jv.po.in
+++ b/po/jv.po.in
@@ -203,10 +203,8 @@ msgstr ""
 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 "terus metu soko puteran ing cawang kaping %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
@@ -309,6 +307,10 @@ msgid "strongly "
 msgstr ""
 
 #, 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 "Jupuk dalan kaping %1$s ing %2$s"
 
@@ -316,7 +318,6 @@ msgstr "Jupuk dalan kaping %1$s ing %2$s"
 msgid "after %i roads"
 msgstr "sakwise %i dalan"
 
-#. 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"
@@ -347,7 +348,7 @@ msgstr ""
 #. * 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 !
 #. *
@@ -2729,3 +2730,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 "terus metu soko puteran ing cawang kaping %1$s %2$s"
diff --git a/po/kk.po.in b/po/kk.po.in
index 428eca042..a31248f77 100644
--- a/po/kk.po.in
+++ b/po/kk.po.in
@@ -198,9 +198,7 @@ msgstr ""
 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"
+msgid "then enter the roundabout"
 msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
@@ -307,6 +305,10 @@ msgid "strongly "
 msgstr ""
 
 #, 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 ""
 
@@ -314,7 +316,6 @@ msgstr ""
 msgid "after %i roads"
 msgstr ""
 
-#. 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"
@@ -345,7 +346,7 @@ msgstr ""
 #. * 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 !
 #. *
diff --git a/po/kn.po.in b/po/kn.po.in
index 25bb0fa4e..0158067a2 100644
--- a/po/kn.po.in
+++ b/po/kn.po.in
@@ -198,9 +198,7 @@ msgstr ""
 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"
+msgid "then enter the roundabout"
 msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
@@ -307,6 +305,10 @@ msgid "strongly "
 msgstr ""
 
 #, 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 ""
 
@@ -314,7 +316,6 @@ msgstr ""
 msgid "after %i roads"
 msgstr ""
 
-#. 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"
@@ -345,7 +346,7 @@ msgstr ""
 #. * 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 !
 #. *
diff --git a/po/ko.po.in b/po/ko.po.in
index 702660e43..db73da2eb 100644
--- a/po/ko.po.in
+++ b/po/ko.po.in
@@ -195,9 +195,7 @@ msgstr "로타리에 곧 진입합니다"
 msgid "Enter the roundabout %s"
 msgstr "%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"
+msgid "then enter the roundabout"
 msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
@@ -304,6 +302,10 @@ msgid "strongly "
 msgstr "크게 "
 
 #, 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 "%1$s 번째 출구에서 %2$s 로 나가세요"
 
@@ -311,7 +313,6 @@ msgstr "%1$s 번째 출구에서 %2$s 로 나가세요"
 msgid "after %i roads"
 msgstr "%i 도로 이후에"
 
-#. 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"
@@ -342,7 +343,7 @@ msgstr ""
 #. * 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 !
 #. *
diff --git a/po/ku.po.in b/po/ku.po.in
index 29359c641..cfa547b99 100644
--- a/po/ku.po.in
+++ b/po/ku.po.in
@@ -198,9 +198,7 @@ msgstr ""
 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"
+msgid "then enter the roundabout"
 msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
@@ -307,6 +305,10 @@ msgid "strongly "
 msgstr ""
 
 #, 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 ""
 
@@ -314,7 +316,6 @@ msgstr ""
 msgid "after %i roads"
 msgstr ""
 
-#. 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"
@@ -345,7 +346,7 @@ msgstr ""
 #. * 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 !
 #. *
diff --git a/po/lb.po.in b/po/lb.po.in
index 128e4611e..95421f795 100644
--- a/po/lb.po.in
+++ b/po/lb.po.in
@@ -199,9 +199,7 @@ msgstr ""
 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"
+msgid "then enter the roundabout"
 msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
@@ -308,6 +306,10 @@ msgid "strongly "
 msgstr "schaarf "
 
 #, 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 ""
 
@@ -315,7 +317,6 @@ msgstr ""
 msgid "after %i roads"
 msgstr ""
 
-#. 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"
@@ -346,7 +347,7 @@ msgstr "Dreinen %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 !
 #. *
diff --git a/po/lt.po.in b/po/lt.po.in
index 31da2edbf..9913f8fb4 100644
--- a/po/lt.po.in
+++ b/po/lt.po.in
@@ -209,10 +209,8 @@ msgstr "Netrukus įsukite į žiedą"
 msgid "Enter the roundabout %s"
 msgstr "Įsukite į žiedą %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 "tada išsukite iš žiedo %1$s išvažiavime %2$s"
+msgid "then enter the roundabout"
+msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
@@ -318,6 +316,10 @@ msgid "strongly "
 msgstr "stipriai "
 
 #, 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 "Važiuokite %1$s keliu į %2$s"
 
@@ -325,7 +327,6 @@ msgstr "Važiuokite %1$s keliu į %2$s"
 msgid "after %i roads"
 msgstr "už %i kelių"
 
-#. 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"
@@ -356,7 +357,7 @@ msgstr "Apsisukite %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 !
 #. *
@@ -2744,3 +2745,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 "tada išsukite iš žiedo %1$s išvažiavime %2$s"
diff --git a/po/lv.po.in b/po/lv.po.in
index 142c08433..2ccd61491 100644
--- a/po/lv.po.in
+++ b/po/lv.po.in
@@ -207,10 +207,8 @@ msgstr "Drīzumā uzbraukt uz apļa"
 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 "pēc tam izbraukt no apļa pa %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
@@ -316,6 +314,10 @@ msgid "strongly "
 msgstr "strauji "
 
 #, 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 "Pagriežaties %1$s ceļā pa %2$s"
 
@@ -323,7 +325,6 @@ msgstr "Pagriežaties %1$s ceļā pa %2$s"
 msgid "after %i roads"
 msgstr "pēc %i ceļiem"
 
-#. 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"
@@ -354,7 +355,7 @@ msgstr "Apgriezieties %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 !
 #. *
@@ -2759,3 +2760,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 "pēc tam izbraukt no apļa pa %1$s %2$s"
diff --git a/po/mk.po.in b/po/mk.po.in
index 6d208fc1b..35898cc50 100644
--- a/po/mk.po.in
+++ b/po/mk.po.in
@@ -203,10 +203,8 @@ msgstr "Наскоро влегувате во кружен тек"
 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 "потоа излегувате од кружен тек на %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
@@ -312,6 +310,10 @@ msgid "strongly "
 msgstr "силно "
 
 #, 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 "Продолжи по %1$s патот до %2$s"
 
@@ -319,7 +321,6 @@ msgstr "Продолжи по %1$s патот до %2$s"
 msgid "after %i roads"
 msgstr "после %i патишта"
 
-#. 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 "Свртете %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 !
 #. *
@@ -2739,3 +2740,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 "потоа излегувате од кружен тек на %1$s %2$s"
diff --git a/po/ml.po.in b/po/ml.po.in
index 1dc2f77d8..edd428786 100644
--- a/po/ml.po.in
+++ b/po/ml.po.in
@@ -200,10 +200,8 @@ msgstr "റൗണ്ടാനയിലേക്ക് ഉടനെ കയറു�
 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 "%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
@@ -309,6 +307,10 @@ msgid "strongly "
 msgstr "നന്നായി "
 
 #, 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 "%2$s   %1$s-മത്തെ പാത  എടുക്കുക"
 
@@ -316,7 +318,6 @@ msgstr "%2$s   %1$s-മത്തെ പാത  എടുക്കുക"
 msgid "after %i roads"
 msgstr "%i വഴികൾക്കു ശേഷം"
 
-#. 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"
@@ -347,7 +348,7 @@ msgstr ""
 #. * 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 !
 #. *
@@ -2750,3 +2751,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 "%1$s- ല്‍ റൗണ്ടാനയില്‍ നിന്നും പുറത്തോട്ട് പോവുക %2$s"
diff --git a/po/mn.po.in b/po/mn.po.in
index 426878271..37f96b11d 100644
--- a/po/mn.po.in
+++ b/po/mn.po.in
@@ -198,9 +198,7 @@ msgstr ""
 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"
+msgid "then enter the roundabout"
 msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
@@ -307,6 +305,10 @@ msgid "strongly "
 msgstr ""
 
 #, 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 ""
 
@@ -314,7 +316,6 @@ msgstr ""
 msgid "after %i roads"
 msgstr ""
 
-#. 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"
@@ -345,7 +346,7 @@ msgstr ""
 #. * 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 !
 #. *
diff --git a/po/mr.po.in b/po/mr.po.in
index de286a97b..2f0e2ada8 100644
--- a/po/mr.po.in
+++ b/po/mr.po.in
@@ -198,9 +198,7 @@ msgstr ""
 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"
+msgid "then enter the roundabout"
 msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
@@ -307,6 +305,10 @@ msgid "strongly "
 msgstr ""
 
 #, 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 ""
 
@@ -314,7 +316,6 @@ msgstr ""
 msgid "after %i roads"
 msgstr ""
 
-#. 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"
@@ -345,7 +346,7 @@ msgstr ""
 #. * 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 !
 #. *
diff --git a/po/nb.po.in b/po/nb.po.in
index da29d3a3f..68d88cc74 100644
--- a/po/nb.po.in
+++ b/po/nb.po.in
@@ -205,10 +205,8 @@ msgstr "Kjør inn i rundkjøringen snart"
 msgid "Enter the roundabout %s"
 msgstr "Kjør inn i rundkjøringen %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 "forlat så rundkjøringen ut %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
@@ -314,6 +312,10 @@ msgid "strongly "
 msgstr "skarpt "
 
 #, 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 "Ta den %1$s veien mot %2$s"
 
@@ -321,7 +323,6 @@ msgstr "Ta den %1$s veien mot %2$s"
 msgid "after %i roads"
 msgstr "etter %i avkjøringer"
 
-#. 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"
@@ -352,7 +353,7 @@ msgstr "Snu %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 !
 #. *
@@ -2738,3 +2739,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 "forlat så rundkjøringen ut %1$s %2$s"
diff --git a/po/nds.po.in b/po/nds.po.in
index ca715fb50..c12167b5f 100644
--- a/po/nds.po.in
+++ b/po/nds.po.in
@@ -206,10 +206,8 @@ msgstr "In Kürze in den Kreisverkehr einfahren"
 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 "dann den Kreisverkehr an der %1$s %2$s verlassen"
+msgid "then enter the roundabout"
+msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
@@ -315,6 +313,10 @@ msgid "strongly "
 msgstr "straf "
 
 #, 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 "Die %1$s Straße zur %2$s nehmen"
 
@@ -322,7 +324,6 @@ msgstr "Die %1$s Straße zur %2$s nehmen"
 msgid "after %i roads"
 msgstr "nach %i Straßen"
 
-#. 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"
@@ -353,7 +354,7 @@ msgstr ""
 #. * 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 !
 #. *
@@ -2739,3 +2740,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 "dann den Kreisverkehr an der %1$s %2$s verlassen"
diff --git a/po/nl.po.in b/po/nl.po.in
index a7c8d71c0..e88ed9c35 100644
--- a/po/nl.po.in
+++ b/po/nl.po.in
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-07-19 03:59+0000\n"
+"PO-Revision-Date: 2015-10-05 13:45+0000\n"
 "Last-Translator: jan <jandegr1@hotmail.com>\n"
 "Language-Team: afaber\n"
 "MIME-Version: 1.0\n"
@@ -218,10 +218,8 @@ msgstr "straks de rotonde oprijden"
 msgid "Enter the roundabout %s"
 msgstr "%s de rotonde oprijden"
 
-#. 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 "daarna de rotonde verlaten bij de %1$s %2$s"
+msgid "then enter the roundabout"
+msgstr "daarna rij de rotonde op"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
@@ -324,6 +322,10 @@ msgid "strongly "
 msgstr "scherp "
 
 #, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr "neem daarna de %1$s straat naar %2$s"
+
+#, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Neem de %1$s straat naar %2$s"
 
@@ -331,7 +333,6 @@ msgstr "Neem de %1$s straat naar %2$s"
 msgid "after %i roads"
 msgstr "na %i wegen"
 
-#. 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"
@@ -362,7 +363,7 @@ msgstr "%1$s rechtsomkeren"
 #. * 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 !
 #. *
@@ -2780,3 +2781,7 @@ msgstr ""
 "Navit kan elke tekst naar spraak-engine geïnstalleerd op uw apparaat "
 "gebruiken. De momenteel geselecteerde engine meldt dat het niet in uw taal "
 "kan spreken. Wil U de spraak download dialoog van Uw toestel starten?"
+
+#, c-format
+#~ msgid "then leave the roundabout at the %1$s %2$s"
+#~ msgstr "daarna de rotonde verlaten bij de %1$s %2$s"
diff --git a/po/nn.po.in b/po/nn.po.in
index 42a64446e..002d8c334 100644
--- a/po/nn.po.in
+++ b/po/nn.po.in
@@ -201,9 +201,7 @@ msgstr ""
 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"
+msgid "then enter the roundabout"
 msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
@@ -310,6 +308,10 @@ msgid "strongly "
 msgstr "krapt "
 
 #, 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 "Ta den %1$s vegen mot %2$s"
 
@@ -317,7 +319,6 @@ msgstr "Ta den %1$s vegen mot %2$s"
 msgid "after %i roads"
 msgstr ""
 
-#. 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"
@@ -348,7 +349,7 @@ msgstr ""
 #. * 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 !
 #. *
diff --git a/po/pl.po.in b/po/pl.po.in
index dd52a22bb..e623ff6aa 100644
--- a/po/pl.po.in
+++ b/po/pl.po.in
@@ -216,10 +216,8 @@ msgstr "Wjazd na rondo wkrótce"
 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 "następnie zjedź z ronda na %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
@@ -325,6 +323,10 @@ msgid "strongly "
 msgstr "silnie "
 
 #, 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 "Jedź drogą %1$s do %2$s"
 
@@ -332,7 +334,6 @@ msgstr "Jedź drogą %1$s do %2$s"
 msgid "after %i roads"
 msgstr "po drodze %i"
 
-#. 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"
@@ -363,7 +364,7 @@ msgstr "Zawróc %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 !
 #. *
@@ -2767,3 +2768,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 "następnie zjedź z ronda na %1$s %2$s"
diff --git a/po/pms.po.in b/po/pms.po.in
index 9bfc7210f..014bb71bb 100644
--- a/po/pms.po.in
+++ b/po/pms.po.in
@@ -198,9 +198,7 @@ msgstr ""
 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"
+msgid "then enter the roundabout"
 msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
@@ -307,6 +305,10 @@ msgid "strongly "
 msgstr ""
 
 #, 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 ""
 
@@ -314,7 +316,6 @@ msgstr ""
 msgid "after %i roads"
 msgstr ""
 
-#. 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"
@@ -345,7 +346,7 @@ msgstr ""
 #. * 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 !
 #. *
diff --git a/po/pt.po.in b/po/pt.po.in
index 6fe5f8941..083416c8f 100644
--- a/po/pt.po.in
+++ b/po/pt.po.in
@@ -5,6 +5,7 @@
 # CaioNavas https://launchpad.net/~webmaster-caiomnavas
 # Carla Pita https://launchpad.net/~carla-pita
 # Diogo Lavareda https://launchpad.net/~diogolavareda
+# Ivo Xavier https://launchpad.net/~ivoxavier
 # Joel Patrão https://launchpad.net/~jpatrao
 # João Pirralha https://launchpad.net/~joaopirralha
 # Rui Correia https://launchpad.net/~rds-correia
@@ -20,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-08-19 04:46+0000\n"
-"Last-Translator: Sérgio Marques <Unknown>\n"
+"PO-Revision-Date: 2015-09-19 14:04+0000\n"
+"Last-Translator: João Pirralha <joaopirralha@gmail.com>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -211,10 +212,8 @@ msgstr "Entre na próxima rotunda"
 msgid "Enter the roundabout %s"
 msgstr "Entre na rotunda %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 "e saia da rotunda na %1$s %2$s"
+msgid "then enter the roundabout"
+msgstr "e entre na rotunda"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
@@ -320,6 +319,10 @@ msgid "strongly "
 msgstr "apertadamente "
 
 #, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr "depois apanhe a %1$s estrada para %2$s"
+
+#, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Apanhe a %1$s estrada para a %2$s"
 
@@ -327,7 +330,6 @@ msgstr "Apanhe a %1$s estrada para a %2$s"
 msgid "after %i roads"
 msgstr "depois de %i estradas"
 
-#. 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"
@@ -358,7 +360,7 @@ msgstr "Dê meia-volta à direita %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 !
 #. *
@@ -386,7 +388,7 @@ msgid "Position"
 msgstr "Posição"
 
 msgid "Command"
-msgstr "Comando"
+msgstr "Instrução"
 
 msgid "Length"
 msgstr "Distância"
@@ -414,7 +416,7 @@ msgid "Waypoint %d"
 msgstr "Ponto %d"
 
 msgid "Visit before..."
-msgstr "Visitar antes..."
+msgstr "Visitar antes de..."
 
 msgid "Set as position"
 msgstr "Definir como posição"
@@ -1460,7 +1462,8 @@ msgstr ""
 
 #. We have not found an existing config file from all possibilities
 msgid "No config file navit.xml, navit.xml.local found\n"
-msgstr "Ficheiros navit.xml, navit.xml.local não encontrados\n"
+msgstr ""
+"Ficheiros de configuração navit.xml, navit.xml.local não encontrados\n"
 
 #, c-format
 msgid "Error parsing config file '%s': %s\n"
@@ -1484,7 +1487,7 @@ msgstr "rua desconhecida"
 
 #. Safe cast: attr_generic_set_attr does not modify its parameter.
 msgid "Unnamed vehicle"
-msgstr "Viatura sem nome"
+msgstr "Veículo sem nome"
 
 msgid "Failed to write bookmarks file"
 msgstr "Erro ao escrever os marcadores"
@@ -1543,7 +1546,7 @@ msgstr "Destino"
 
 #. TRANSLATORS: These texts are for menu items in GTK GUI. The _ indicates the mnemonic key (=underlined character) for this menu item. Please place the _ before a suitable character in the translation (or omit it if no mnemonic key is desired).
 msgid "_Display"
-msgstr "E_xibir"
+msgstr "_Exibir"
 
 msgid "_Route"
 msgstr "_Rota"
@@ -1552,7 +1555,7 @@ msgid "_Former Destinations"
 msgstr "Destinos _anteriores"
 
 msgid "_Bookmarks"
-msgstr "Marcador_es"
+msgstr "_Marcadores"
 
 msgid "_Map"
 msgstr "_Mapa"
@@ -1567,13 +1570,13 @@ msgid "_Vehicle"
 msgstr "_Veículo"
 
 msgid "Zoom_Out"
-msgstr "Redu_zir"
+msgstr "_Reduzir"
 
 msgid "Decrease zoom level"
 msgstr "Diminuir nível de ampliação"
 
 msgid "Zoom_In"
-msgstr "Ampl_iar"
+msgstr "_Ampliar"
 
 msgid "Increase zoom level"
 msgstr "Aumentar nível de ampliação"
@@ -1582,7 +1585,7 @@ msgid "_Recalculate"
 msgstr "_Recalcular"
 
 msgid "Redraw map"
-msgstr "Refazer mapa"
+msgstr "Redesenhar mapa"
 
 msgid "_Info"
 msgstr "_Informação"
@@ -1615,10 +1618,10 @@ msgid "Show position _cursor"
 msgstr "Mostrar _cursor de posição"
 
 msgid "_Lock on Road"
-msgstr "B_loqueio na estrada"
+msgstr "_Bloqueio na estrada"
 
 msgid "_Keep orientation to the North"
-msgstr "Manter orientação ao _Norte"
+msgstr "Manter orientação ao _norte"
 
 msgid "Switches map orientation to the north or the vehicle"
 msgstr "Muda a orientação do mapa para o norte ou para o veículo"
@@ -1630,7 +1633,7 @@ msgid "Show/hide route description"
 msgstr "Mostrar/ocultar descrição da rota"
 
 msgid "_Autozoom"
-msgstr "Tamanho _automático"
+msgstr "_Tamanho automático"
 
 msgid "Enable/disable automatic zoom level changing"
 msgstr "Ativar/desativar tamanho automático da ampliação"
@@ -1733,7 +1736,7 @@ msgid "Name"
 msgstr "Nome"
 
 msgid "Visit Before"
-msgstr "Visitar Antes"
+msgstr "Visitar antes"
 
 msgid "N"
 msgstr "N"
@@ -1806,7 +1809,7 @@ msgid "View Attributes"
 msgstr "Atributos de vista"
 
 msgid "Set as position (and deactivate vehicle)"
-msgstr "Definir como posição (desativar viatura)"
+msgstr "Definir como posição (desativar veículo)"
 
 msgid "POIs"
 msgstr "POIs"
@@ -1967,7 +1970,7 @@ msgid "Lock on road"
 msgstr "Bloqueio na estrada"
 
 msgid "Northing"
-msgstr "Para norte"
+msgstr "Para Norte"
 
 msgid "Map follows Vehicle"
 msgstr "Mapa segue veículo"
@@ -1988,7 +1991,7 @@ msgid "Route Description"
 msgstr "Descrição da rota"
 
 msgid "Show Locale"
-msgstr "Mostrar local"
+msgstr "Exibir região e idioma"
 
 msgid "Former Destinations"
 msgstr "Destinos anteriores"
@@ -2051,9 +2054,9 @@ msgid ""
 "Please restart Navit after you attach an SD card or select a different map "
 "location."
 msgstr ""
-"A atual localização %s no mapa não está disponível\n"
+"A atual localização do mapa %s não está disponível\n"
 "Por favor reinicie o Navit após introduzir um cartão SD ou selecionar uma "
-"localização diferente no mapa."
+"localização do mapa diferente."
 
 msgid "Downloaded maps"
 msgstr "Mapas transferidos"
@@ -2508,7 +2511,7 @@ msgid ""
 "Destinations"
 msgstr ""
 "Destinos\n"
-"Anteriores"
+"anteriores"
 
 msgid "Coordinates"
 msgstr "Coordenadas"
@@ -2521,7 +2524,7 @@ msgstr ""
 "navegação"
 
 msgid "Display"
-msgstr "Mostrar"
+msgstr "Visualização"
 
 msgid "Fullscreen"
 msgstr "Ecrã completo"
@@ -2783,3 +2786,7 @@ msgstr ""
 "O Navit pode usar qualquer motor de síntese de voz no dispositivo. O motor "
 "atualmente selecionado reporta não suportar o seu idioma. Pedir ao sistema "
 "para exibir o diálogo de transferência de voz?"
+
+#, c-format
+#~ msgid "then leave the roundabout at the %1$s %2$s"
+#~ msgstr "e saia da rotunda na %1$s %2$s"
diff --git a/po/pt_BR.po.in b/po/pt_BR.po.in
index 2a53b913e..3c4d5c6d7 100644
--- a/po/pt_BR.po.in
+++ b/po/pt_BR.po.in
@@ -215,10 +215,8 @@ msgstr "Entre na rotatória em seguida"
 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
-msgid "then leave the roundabout at the %1$s %2$s"
-msgstr "então deixe a rotatória na %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
@@ -324,6 +322,10 @@ msgid "strongly "
 msgstr "fortemente "
 
 #, 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 "Pegue a %1$s via para a %2$s"
 
@@ -331,7 +333,6 @@ msgstr "Pegue a %1$s via para a %2$s"
 msgid "after %i roads"
 msgstr "após %i vias"
 
-#. 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"
@@ -362,7 +363,7 @@ msgstr "Faça o retorno a direita %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 !
 #. *
@@ -2778,3 +2779,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 "então deixe a rotatória na %1$s %2$s"
diff --git a/po/ro.po.in b/po/ro.po.in
index 3b57b1cf5..fedaa591b 100644
--- a/po/ro.po.in
+++ b/po/ro.po.in
@@ -211,10 +211,8 @@ msgstr "Intrați în curând în giratoriu"
 msgid "Enter the roundabout %s"
 msgstr "Intrați în giratoriu %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 "apoi ieșiți din giratoriu 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
@@ -320,6 +318,10 @@ msgid "strongly "
 msgstr "strâns "
 
 #, 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 "Virați %2s pe %1s stradă"
 
@@ -327,7 +329,6 @@ msgstr "Virați %2s pe %1s stradă"
 msgid "after %i roads"
 msgstr "după %i străzi"
 
-#. 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"
@@ -358,7 +359,7 @@ msgstr "Întoarceţi %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 !
 #. *
@@ -2744,3 +2745,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 "apoi ieșiți din giratoriu la %1$s %2$s"
diff --git a/po/ru.po.in b/po/ru.po.in
index b0181c93d..7a8e9b86b 100644
--- a/po/ru.po.in
+++ b/po/ru.po.in
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-07-19 04:01+0000\n"
+"PO-Revision-Date: 2015-11-15 20:38+0000\n"
 "Last-Translator: tryagain <mdankov@yandex.ru>\n"
 "Language-Team: Rustam T. Usmanov\n"
 "MIME-Version: 1.0\n"
@@ -225,10 +225,8 @@ msgstr "Скоро круговое движение"
 msgid "Enter the roundabout %s"
 msgstr "%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 "затем %2$s съезжайте с круга на %1$s"
+msgid "then enter the roundabout"
+msgstr "затем круговое движение"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
@@ -334,6 +332,10 @@ msgid "strongly "
 msgstr "круто "
 
 #, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr "затем выезжайте на дорогу %1$s в направлении %2$s"
+
+#, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Выезжайте на %1$s дорогу в направлении %2$s"
 
@@ -341,7 +343,6 @@ msgstr "Выезжайте на %1$s дорогу в направлении %2$s
 msgid "after %i roads"
 msgstr "после %i дорог"
 
-#. 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"
@@ -372,7 +373,7 @@ msgstr "%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 !
 #. *
@@ -2056,7 +2057,7 @@ msgid ""
 "Please restart Navit after you attach an SD card or select a different map "
 "location."
 msgstr ""
-"Папка s, выбранная для хранения карт, недоступна.\n"
+"Папка %s, выбранная для хранения карт, недоступна.\n"
 "Пожалуйста, перезагрузите Navit после подключения SD карты, или выберите "
 "другую папку."
 
@@ -2788,3 +2789,7 @@ msgstr ""
 "преобразования текста в речь. Выбранное сейчас приложение сообщает о "
 "невозможности работы на выбранном языке. Попросим систему показать диалог "
 "загрузки голосовых данных?"
+
+#, c-format
+#~ msgid "then leave the roundabout at the %1$s %2$s"
+#~ msgstr "затем %2$s съезжайте с круга на %1$s"
diff --git a/po/sc.po.in b/po/sc.po.in
index 58b6fd78f..a0a0be23a 100644
--- a/po/sc.po.in
+++ b/po/sc.po.in
@@ -199,10 +199,8 @@ msgstr ""
 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 "tando lassa sa rotatoria a %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
@@ -308,6 +306,10 @@ msgid "strongly "
 msgstr "fortemente "
 
 #, 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 "Pica sa %1$s istrada a %2$s"
 
@@ -315,7 +317,6 @@ msgstr "Pica sa %1$s istrada a %2$s"
 msgid "after %i roads"
 msgstr "dopu %i istradasa"
 
-#. 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"
@@ -346,7 +347,7 @@ msgstr "Torra in daesecusu %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 !
 #. *
@@ -2732,3 +2733,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 "tando lassa sa rotatoria a %1$s %2$s"
diff --git a/po/si.po.in b/po/si.po.in
index 028fd9e75..d0d98f307 100644
--- a/po/si.po.in
+++ b/po/si.po.in
@@ -198,10 +198,8 @@ msgstr ""
 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 "එවිට %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
@@ -307,6 +305,10 @@ msgid "strongly "
 msgstr "ශක්තිමත් ලෙස "
 
 #, 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 "ගන්න %1$s මාර්ගය %2$s ට"
 
@@ -314,7 +316,6 @@ msgstr "ගන්න %1$s මාර්ගය %2$s ට"
 msgid "after %i roads"
 msgstr "මාර්ග %i පසු"
 
-#. 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"
@@ -345,7 +346,7 @@ msgstr ""
 #. * 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 !
 #. *
@@ -2731,3 +2732,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 "එවිට %1$s %2$s හිදී වටරවුමෙන් ඉවත්වන්න."
diff --git a/po/sk.po.in b/po/sk.po.in
index 627a8534d..98f4c2db6 100644
--- a/po/sk.po.in
+++ b/po/sk.po.in
@@ -210,10 +210,8 @@ msgstr "Vstúpte do kruhového objazdu onedlho"
 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 "potom opustite kruhový objazd na %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
@@ -319,6 +317,10 @@ msgid "strongly "
 msgstr "prudko "
 
 #, 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 "Choďte %1$s cestou na %2$s"
 
@@ -326,7 +328,6 @@ msgstr "Choďte %1$s cestou na %2$s"
 msgid "after %i roads"
 msgstr "po %i cestách"
 
-#. 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"
@@ -357,7 +358,7 @@ msgstr "Otočte sa %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 !
 #. *
@@ -2763,3 +2764,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 "potom opustite kruhový objazd na %1$s %2$s"
diff --git a/po/sl.po.in b/po/sl.po.in
index 86edb051d..e4d03770a 100644
--- a/po/sl.po.in
+++ b/po/sl.po.in
@@ -207,9 +207,7 @@ msgstr "Kmalu zapeljite v krožišče"
 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"
+msgid "then enter the roundabout"
 msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
@@ -316,6 +314,10 @@ msgid "strongly "
 msgstr "ostro "
 
 #, 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 "Zavijte na %2$s v %1$so cesto"
 
@@ -323,7 +325,6 @@ msgstr "Zavijte na %2$s v %1$so cesto"
 msgid "after %i roads"
 msgstr "čez %i cest"
 
-#. 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"
@@ -354,7 +355,7 @@ msgstr "Obrnite čim %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 !
 #. *
diff --git a/po/sq.po.in b/po/sq.po.in
index 77b59ac58..92f1f9522 100644
--- a/po/sq.po.in
+++ b/po/sq.po.in
@@ -197,10 +197,8 @@ msgstr "Hyni në rrethrrotullim së shpejti"
 msgid "Enter the roundabout %s"
 msgstr "Hyni në rrethrrotullimin %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 "pastaj dilni nga rrethrrotullimi tek %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
@@ -306,6 +304,10 @@ msgid "strongly "
 msgstr "fuqishëm "
 
 #, 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 "Merrni rrugën %1$s për tek rruga %2$s"
 
@@ -313,7 +315,6 @@ msgstr "Merrni rrugën %1$s për tek rruga %2$s"
 msgid "after %i roads"
 msgstr "pas rrugës %i"
 
-#. 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"
@@ -344,7 +345,7 @@ msgstr "Bëni një U-kthim %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 !
 #. *
@@ -2726,3 +2727,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 "pastaj dilni nga rrethrrotullimi tek %1$s %2$s"
diff --git a/po/sr.po.in b/po/sr.po.in
index 496f68b90..b33966b56 100644
--- a/po/sr.po.in
+++ b/po/sr.po.in
@@ -209,10 +209,8 @@ msgstr "Ускоро прелазак на обилазницу"
 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 "потом напутстите обилазницу на %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
@@ -318,6 +316,10 @@ msgid "strongly "
 msgstr "јако "
 
 #, 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 "Прати %1$s пут до %2$s"
 
@@ -325,7 +327,6 @@ msgstr "Прати %1$s пут до %2$s"
 msgid "after %i roads"
 msgstr "после %i путева"
 
-#. 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"
@@ -356,7 +357,7 @@ msgstr "Променити смер %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 !
 #. *
@@ -2762,3 +2763,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 "потом напутстите обилазницу на %1$s %2$s"
diff --git a/po/sv.po.in b/po/sv.po.in
index 33448f5b8..8a4a292c4 100644
--- a/po/sv.po.in
+++ b/po/sv.po.in
@@ -9,7 +9,7 @@
 # Mikko Virkkilä https://launchpad.net/~virkkila
 # Squall Leonhart https://launchpad.net/~webmaster-square-one
 # nairobie https://launchpad.net/~samuel-ostman
-# pipatron https://launchpad.net/~pipatron
+# pipe https://launchpad.net/~pipatron
 
 msgid ""
 msgstr ""
@@ -206,10 +206,8 @@ msgstr "Kör snart in i rondellen"
 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 "kör sedan ut ur rondellen mot %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
@@ -315,6 +313,10 @@ msgid "strongly "
 msgstr "tvärt "
 
 #, 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 "Ta %1$s vägen mot %2$s"
 
@@ -322,7 +324,6 @@ msgstr "Ta %1$s vägen mot %2$s"
 msgid "after %i roads"
 msgstr "efter %i vägar"
 
-#. 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"
@@ -353,7 +354,7 @@ msgstr "Vänd %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 !
 #. *
@@ -2739,3 +2740,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 "kör sedan ut ur rondellen mot %1$s %2$s"
diff --git a/po/sw.po.in b/po/sw.po.in
index fc3a30d72..a36786e0a 100644
--- a/po/sw.po.in
+++ b/po/sw.po.in
@@ -200,10 +200,8 @@ msgstr ""
 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 "halafu toka kutoka kwenye kipilefti kwenye %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
@@ -309,6 +307,10 @@ msgid "strongly "
 msgstr ""
 
 #, 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 "fuata %1$s hadi %2$s"
 
@@ -316,7 +318,6 @@ msgstr "fuata %1$s hadi %2$s"
 msgid "after %i roads"
 msgstr "baada ya barabara %i"
 
-#. 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"
@@ -347,7 +348,7 @@ msgstr ""
 #. * 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 !
 #. *
@@ -2729,3 +2730,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 "halafu toka kutoka kwenye kipilefti kwenye %1$s %2$s"
diff --git a/po/ta.po.in b/po/ta.po.in
index 945146c73..d70ab67ca 100644
--- a/po/ta.po.in
+++ b/po/ta.po.in
@@ -200,9 +200,7 @@ msgstr ""
 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"
+msgid "then enter the roundabout"
 msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
@@ -309,6 +307,10 @@ msgid "strongly "
 msgstr ""
 
 #, 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 ""
 
@@ -316,7 +318,6 @@ msgstr ""
 msgid "after %i roads"
 msgstr ""
 
-#. 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"
@@ -347,7 +348,7 @@ msgstr ""
 #. * 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 !
 #. *
diff --git a/po/te.po.in b/po/te.po.in
index b2f92959c..fcb54cace 100644
--- a/po/te.po.in
+++ b/po/te.po.in
@@ -200,9 +200,7 @@ msgstr ""
 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"
+msgid "then enter the roundabout"
 msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
@@ -309,6 +307,10 @@ msgid "strongly "
 msgstr ""
 
 #, 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 ""
 
@@ -316,7 +318,6 @@ msgstr ""
 msgid "after %i roads"
 msgstr ""
 
-#. 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"
@@ -347,7 +348,7 @@ msgstr ""
 #. * 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 !
 #. *
diff --git a/po/th.po.in b/po/th.po.in
index e3aa88646..e4c36224f 100644
--- a/po/th.po.in
+++ b/po/th.po.in
@@ -197,9 +197,7 @@ msgstr ""
 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"
+msgid "then enter the roundabout"
 msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
@@ -306,6 +304,10 @@ msgid "strongly "
 msgstr "อย่างเคร่งคัด "
 
 #, 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 ""
 
@@ -313,7 +315,6 @@ msgstr ""
 msgid "after %i roads"
 msgstr ""
 
-#. 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"
@@ -344,7 +345,7 @@ msgstr ""
 #. * 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 !
 #. *
diff --git a/po/tr.po.in b/po/tr.po.in
index 3d2965740..028dec2aa 100644
--- a/po/tr.po.in
+++ b/po/tr.po.in
@@ -210,10 +210,8 @@ msgstr "Yakındaki kavşağa girin"
 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 "ardından %1$s'de kavşaktan çıkın %2$s"
+msgid "then enter the roundabout"
+msgstr ""
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
@@ -319,6 +317,10 @@ msgid "strongly "
 msgstr "sertçe "
 
 #, 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 "%1$s yolunda  %2$s yönüne dönün"
 
@@ -326,7 +328,6 @@ msgstr "%1$s yolunda  %2$s yönüne dönün"
 msgid "after %i roads"
 msgstr "%i yol sonra"
 
-#. 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"
@@ -357,7 +358,7 @@ msgstr ""
 #. * 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 !
 #. *
@@ -2764,3 +2765,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 "ardından %1$s'de kavşaktan çıkın %2$s"
diff --git a/po/uk.po.in b/po/uk.po.in
index 03346bafb..87002f006 100644
--- a/po/uk.po.in
+++ b/po/uk.po.in
@@ -206,10 +206,8 @@ msgstr "Скоро виїзд на дорогу з кільцевим рухом
 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 "тоді виїдьте з кільця через %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
@@ -315,6 +313,10 @@ msgid "strongly "
 msgstr "круто "
 
 #, 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 "З’їдьте на дорогу %1$s до %2$s"
 
@@ -322,7 +324,6 @@ msgstr "З’їдьте на дорогу %1$s до %2$s"
 msgid "after %i roads"
 msgstr "після %i дороги"
 
-#. 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"
@@ -353,7 +354,7 @@ msgstr "То розверніться %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 !
 #. *
@@ -2739,3 +2740,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 "тоді виїдьте з кільця через %1$s %2$s"
diff --git a/po/ur.po.in b/po/ur.po.in
index bc0820df9..2cdfbbac7 100644
--- a/po/ur.po.in
+++ b/po/ur.po.in
@@ -4,14 +4,15 @@
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
 # Michael von Glasow https://launchpad.net/~michael-vonglasow
+# Waqar Ahmed https://launchpad.net/~waqar-17a
 # asghar https://launchpad.net/~asghar144
 
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-07-19 04:01+0000\n"
-"Last-Translator: Michael von Glasow <Unknown>\n"
+"PO-Revision-Date: 2015-10-10 13:42+0000\n"
+"Last-Translator: Waqar Ahmed <waqar.17a@gmail.com>\n"
 "Language-Team: Urdu <ur@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -236,10 +237,8 @@ msgstr ""
 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 "پھر گول چوراہے کو  %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
@@ -329,6 +328,10 @@ msgid "Keep left %1$s%2$s%3$s"
 msgstr ""
 
 #, 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 "سڑک تک %1$s سے %2$s"
 
@@ -336,7 +339,6 @@ msgstr "سڑک تک %1$s سے %2$s"
 msgid "after %i roads"
 msgstr "%i سڑکوں کے بعد"
 
-#. 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"
@@ -367,7 +369,7 @@ msgstr ""
 #. * 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 !
 #. *
@@ -2467,7 +2469,7 @@ msgid "Route"
 msgstr "راستہ"
 
 msgid "About"
-msgstr "مطعلق"
+msgstr "متعلق"
 
 msgid "Quit"
 msgstr "بند"
@@ -2734,3 +2736,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 "پھر گول چوراہے کو  %1$s %2$s پے چھوڑ دیں"
diff --git a/po/vi.po.in b/po/vi.po.in
index 28c14a289..2965f91b2 100644
--- a/po/vi.po.in
+++ b/po/vi.po.in
@@ -200,10 +200,8 @@ msgstr "Sắp tới chỗ vòng"
 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 "sau đó ra khỏi đường vòng tại %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
@@ -309,6 +307,10 @@ msgid "strongly "
 msgstr "mạnh "
 
 #, 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 "Có %1$s đường đến %2$s"
 
@@ -316,7 +318,6 @@ msgstr "Có %1$s đường đến %2$s"
 msgid "after %i roads"
 msgstr "sau %i đường"
 
-#. 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"
@@ -347,7 +348,7 @@ msgstr ""
 #. * 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 !
 #. *
@@ -2729,3 +2730,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 "sau đó ra khỏi đường vòng tại %1$s %2$s"
diff --git a/po/zh_CN.po.in b/po/zh_CN.po.in
index 4c3d2efaf..bc55bcaa5 100644
--- a/po/zh_CN.po.in
+++ b/po/zh_CN.po.in
@@ -203,10 +203,8 @@ msgstr "不久将进入环形交叉路口"
 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 "然后在%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
@@ -312,6 +310,10 @@ msgid "strongly "
 msgstr "急转 "
 
 #, 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 "可以经由道路 %1$s 到 %2$s"
 
@@ -319,7 +321,6 @@ msgstr "可以经由道路 %1$s 到 %2$s"
 msgid "after %i roads"
 msgstr "之后有 %i 条道路"
 
-#. 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 ""
 #. * 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 !
 #. *
@@ -2732,3 +2733,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 "然后在%1$s %2$s处驶出环形区"
diff --git a/po/zh_HK.po.in b/po/zh_HK.po.in
index d1d6eba19..cc2604b6b 100644
--- a/po/zh_HK.po.in
+++ b/po/zh_HK.po.in
@@ -200,10 +200,8 @@ msgstr ""
 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 "然後在 %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
@@ -309,6 +307,10 @@ msgid "strongly "
 msgstr "大力轉 "
 
 #, 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 "取 %1$s 路往%2$s方向"
 
@@ -316,7 +318,6 @@ msgstr "取 %1$s 路往%2$s方向"
 msgid "after %i roads"
 msgstr "%i 條路之後"
 
-#. 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"
@@ -347,7 +348,7 @@ msgstr ""
 #. * 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 !
 #. *
@@ -2733,3 +2734,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 "然後在 %1$s %2$s 離開迴旋處"