Update:Core:massive translation update from launchpad

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6046 ffa7fe5e-494d-0410-b361-a75ebd5db220
author: kazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220> 2015-04-06 20:01:30 +0000
committer: kazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220> 2015-04-06 20:01:30 +0000
commit: 90a188dca4ddf8dcb02a1d69fe7226d04f41224f (patch)
tree: d2aef0223d33f1018f064c00a290de94eadde26b /po
parent: 34fc484f618e8d31bd4ff2782ce442cd8cb42d50 (diff)
download: navit-svn-90a188dca4ddf8dcb02a1d69fe7226d04f41224f.tar.gz
73 files changed, 9266 insertions, 4323 deletions
diff --git a/po/af.po.in b/po/af.po.in
index 73b58c39..01410f87 100644
--- a/po/af.po.in
+++ b/po/af.po.in
@@ -138,8 +138,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "na een kilometer"
 msgstr[1] "na %d kilometer"
 
-msgid "exit"
-msgstr "afrit"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "na die afrit"
@@ -169,33 +171,18 @@ msgstr "%sin die %s%s%s|"
 msgid "%sinto the %s"
 msgstr "%sin die %s in"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "regs"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "links"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "maklik "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "skerp "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "regtig sterk "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "onbekend "
-
 msgid "When possible, please turn around"
 msgstr "Draai asseblief om wanneer moontlik"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Volg die pad vir die volgende %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Gaan kortliks in die sirkel in"
 
@@ -204,56 +191,133 @@ 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 %s"
-msgstr "verlaat dan die sirkel by die %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Verlaat die sirkel by die %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Volg die pad vir die volgende %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "kortliks"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "nou"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Neem die %1$s pad na %2$s"
 
+msgid "right"
+msgstr "regs"
+
 #, c-format
 msgid "after %i roads"
 msgstr "na %i paaie"
 
-msgid "now"
-msgstr "nou"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "neem dan die %1$s pad na %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "fout"
+msgid "easily "
+msgstr "maklik "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "skerp "
+
+msgid "left"
+msgstr "links"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Draai %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "draai dan %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "dan het jy jou bestemming bereik."
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Jy het jou bestemming bereik %s"
 
-msgid "then you have reached your destination."
-msgstr "dan het jy jou bestemming bereik."
+msgid "exit"
+msgstr "afrit"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1313,11 +1377,13 @@ msgstr "* Onbekend, voeg is_in merkers by daai stede"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1681,6 +1747,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Sny Boekmerk"
 
diff --git a/po/ar.po.in b/po/ar.po.in
index 8ba622cc..2865ec9b 100644
--- a/po/ar.po.in
+++ b/po/ar.po.in
@@ -153,8 +153,10 @@ msgstr[3] "بعد %d كلم"
 msgstr[4] "بعد %d كلم"
 msgstr[5] "بعد %d كلم"
 
-msgid "exit"
-msgstr "خروج"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "إلى داخل الطريق المنحدر"
@@ -184,33 +186,18 @@ msgstr "%sإلى داخل %s%s%s|غير محدد الجنس"
 msgid "%sinto the %s"
 msgstr "%s إلى داخل %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "إلى اليمين"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "إلى اليسار"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "بسهولة "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "بكل شدة "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "بشدة حادة "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "غير معروف "
-
 msgid "When possible, please turn around"
 msgstr "حيث ممكن الرجاء اللف"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "تابع الطريق لل- %s التالية"
+
 msgid "Enter the roundabout soon"
 msgstr "قريباً الدخول إلى المستديرة"
 
@@ -219,56 +206,133 @@ 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 %s"
-msgstr "ثم أخرج من المستديرة عند الــ%s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "أخرج من المستديرة عند الــ  %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "تابع الطريق لل- %s التالية"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "قريبا"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "الآن"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "خذ الطريق %1$s إلى ال%2$s"
 
+msgid "right"
+msgstr "إلى اليمين"
+
 #, c-format
 msgid "after %i roads"
 msgstr "بعد %i طرقات"
 
-msgid "now"
-msgstr "الآن"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "ثم خذ الطريق %1$s إلى ال- %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "خطء"
+msgid "easily "
+msgstr "بسهولة "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "بكل شدة "
+
+msgid "left"
+msgstr "إلى اليسار"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "حوّل %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "ثم حوّل %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "و بعدها تكون قد وصلت إلى هدفك"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "لقد وصلت إلى هدفك %s"
 
-msgid "then you have reached your destination."
-msgstr "و بعدها تكون قد وصلت إلى هدفك"
+msgid "exit"
+msgstr "خروج"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1328,11 +1392,13 @@ msgstr "* غير معروف، أضف تسميات  is_in إلى تلك المد�
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1696,6 +1762,9 @@ msgstr "أحذف نتائج البحث من الخريطة"
 msgid "Show results on the map"
 msgstr "أعرض النتائج على الخريطة"
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "قص العلامة"
 
diff --git a/po/ast.po.in b/po/ast.po.in
index 034577a8..aa8ac18c 100644
--- a/po/ast.po.in
+++ b/po/ast.po.in
@@ -133,8 +133,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "nun quilómetru"
 msgstr[1] "en %d quilómetros"
 
-msgid "exit"
-msgstr "salida"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "pal enllaz"
@@ -164,33 +166,18 @@ msgstr "%s pal %s%s%s|neutral form"
 msgid "%sinto the %s"
 msgstr "%s pa la %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "drecha"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "izquierda"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "selemente "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "enforma "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "dafechu "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "desconocío "
-
 msgid "When possible, please turn around"
 msgstr "Cuando seya posible, de la vuelta"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Siga pela carretera los siguientes %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Entre ceo na rotonda"
 
@@ -199,56 +186,133 @@ 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 %s"
-msgstr "llueu dexe la rotonda pola %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Dexe la rotonda pola %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Siga pela carretera los siguientes %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "aína"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "agora"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Tome la carretera %1$s dica %2$s"
 
+msgid "right"
+msgstr "drecha"
+
 #, c-format
 msgid "after %i roads"
 msgstr "tres %i carreteres"
 
-msgid "now"
-msgstr "agora"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "llueu tome la carretera %1$s dica %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "error"
+msgid "easily "
+msgstr "selemente "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "enforma "
+
+msgid "left"
+msgstr "izquierda"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Xire %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "llueu xire %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "entós llegará al destín."
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Llegó al destín %s"
 
-msgid "then you have reached your destination."
-msgstr "entós llegará al destín."
+msgid "exit"
+msgstr "salida"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1308,11 +1372,13 @@ msgstr "* Desconocíes, amestar etiquetes is_in a eses ciudaes"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1676,6 +1742,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Cortar marcador"
 
diff --git a/po/be.po.in b/po/be.po.in
index 3fb5e8d4..45954de5 100644
--- a/po/be.po.in
+++ b/po/be.po.in
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Anatoli Putseyeu https://launchpad.net/~st-shadow-by
+# KaZeR https://launchpad.net/~kazer
 
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2011-10-11 19:19+0000\n"
-"Last-Translator: Anatoli Putseyeu <Unknown>\n"
+"PO-Revision-Date: 2014-11-15 22:06+0000\n"
+"Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Belarusian <be@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -134,8 +135,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "exit"
-msgstr "выхад"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr ""
@@ -165,90 +168,152 @@ msgstr ""
 msgid "%sinto the %s"
 msgstr ""
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "направа"
+msgid "When possible, please turn around"
+msgstr "Развярніцеся, калі будзе магчымасць"
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "налева"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "мацней "
+msgid "Enter the roundabout soon"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
 
-msgid "When possible, please turn around"
-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 ""
 
-msgid "Enter the roundabout soon"
+msgid "soon"
+msgstr "скора"
+
+msgid "now"
+msgstr "зараз"
+
+msgid "then"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "%1$s merge right %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "%1$s left exit %2$s %3$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
+msgid "%1$s right exit %2$s %3$s"
 msgstr ""
 
-msgid "soon"
-msgstr "скора"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
+msgid "right"
+msgstr "направа"
+
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-msgid "now"
-msgstr "зараз"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
+
+msgid "easily "
 msgstr ""
 
-msgid "error"
-msgstr "памылка"
+msgid "strongly "
+msgstr "мацней "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "left"
+msgstr "налева"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
 msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
 msgstr ""
 
+msgid "then you have reached your destination."
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr ""
 
-msgid "then you have reached your destination."
+msgid "exit"
+msgstr "выхад"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
 msgstr ""
 
 #. Android resource: @strings/position_popup_title
@@ -1309,11 +1374,13 @@ msgstr "Невядома, дадайце is_in тэгі да гэтых гара
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1677,6 +1744,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/bg.po.in b/po/bg.po.in
index 1fab1ec7..90ac6617 100644
--- a/po/bg.po.in
+++ b/po/bg.po.in
@@ -137,8 +137,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "след един километър"
 msgstr[1] "след %d километра"
 
-msgid "exit"
-msgstr "изход"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "на рампата"
@@ -168,33 +170,18 @@ msgstr ""
 msgid "%sinto the %s"
 msgstr ""
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "надясно"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "наляво"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "леко "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "силно "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "наистина силно "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "непознат "
-
 msgid "When possible, please turn around"
 msgstr "Когато е възможно обърнете"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Следвайте пътя през следващите %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Скоро навлизате в кръгово"
 
@@ -203,56 +190,133 @@ 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 %s"
-msgstr "след това излезте от кръговото на %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Излезте от кръговото на %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Следвайте пътя през следващите %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "скоро"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "сега"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Тръгнете по %1$s път към %2$s"
 
+msgid "right"
+msgstr "надясно"
+
 #, c-format
 msgid "after %i roads"
 msgstr "след %i пресечки"
 
-msgid "now"
-msgstr "сега"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "тогава хванете пътя %1$s към %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "грешка"
+msgid "easily "
+msgstr "леко "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "силно "
+
+msgid "left"
+msgstr "наляво"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Завийте %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "тогава завийте %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "след това пристигате на местоназначението"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Достигнахте до целта %s"
 
-msgid "then you have reached your destination."
-msgstr "след това пристигате на местоназначението"
+msgid "exit"
+msgstr "изход"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1312,11 +1376,13 @@ msgstr "* Неизвестен, добавете is_in осм тагове за
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1680,6 +1746,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/bs.po.in b/po/bs.po.in
index f363ea6b..4b210493 100644
--- a/po/bs.po.in
+++ b/po/bs.po.in
@@ -136,8 +136,10 @@ msgstr[0] "u %d kilometru"
 msgstr[1] "u %d kilometara"
 msgstr[2] "u %d kilometara"
 
-msgid "exit"
-msgstr "izlaz"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "u rampu"
@@ -167,90 +169,152 @@ msgstr ""
 msgid "%sinto the %s"
 msgstr ""
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
+msgid "When possible, please turn around"
 msgstr ""
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
 
-msgid "When possible, please turn around"
+#. 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 ""
 
-msgid "Enter the roundabout soon"
+msgid "soon"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "now"
+msgstr ""
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "%1$s merge right %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "%1$s left exit %2$s %3$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
+msgid "%1$s right exit %2$s %3$s"
 msgstr ""
 
-msgid "soon"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
 msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
+msgid "right"
+msgstr ""
+
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-msgid "now"
+#. 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 ""
 
-#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "easily "
 msgstr ""
 
-msgid "error"
+msgid "strongly "
 msgstr ""
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "left"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
 msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
 msgstr ""
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr ""
 
-msgid "then you have reached your destination."
+msgid "exit"
+msgstr "izlaz"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
 msgstr ""
 
 #. Android resource: @strings/position_popup_title
@@ -1311,11 +1375,13 @@ msgstr ""
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1679,6 +1745,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/ca.po.in b/po/ca.po.in
index 5cbbcc51..8cecc6f0 100644
--- a/po/ca.po.in
+++ b/po/ca.po.in
@@ -143,8 +143,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "d'aquí a un quilòmetre"
 msgstr[1] "d'aquí a %d quilòmetres"
 
-msgid "exit"
-msgstr "surt"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "a la sortida"
@@ -174,33 +176,18 @@ msgstr "%s a %s %s %s"
 msgid "%sinto the %s"
 msgstr "%s cap a la %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "dreta"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "esquerra"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "fàcilment "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "fortament "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "realment fort "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "desconegut "
-
 msgid "When possible, please turn around"
 msgstr "Quan sigui possible, doneu mitja volta"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Seguiu per la carretera durant els propers %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Entreu a la rotonda vinent"
 
@@ -209,56 +196,133 @@ msgstr "Entreu a la rotonda vinent"
 msgid "Enter the roundabout %s"
 msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "aleshores deixeu la rotonda a la %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Deixeu la rotonda a la %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Seguiu per la carretera durant els propers %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "aviat"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "ara"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Preneu el %1$s carrer a la %2$s"
 
+msgid "right"
+msgstr "dreta"
+
 #, c-format
 msgid "after %i roads"
 msgstr "després de %i carrers"
 
-msgid "now"
-msgstr "ara"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "després, agafeu la %1$s carretera a la %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "error"
+msgid "easily "
+msgstr "fàcilment "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "fortament "
+
+msgid "left"
+msgstr "esquerra"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Gireu %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "després, gireu %1$s%2$s%3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "aleshores heu arribat a destí"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Heu arribat a la destinació %s"
 
-msgid "then you have reached your destination."
-msgstr "aleshores heu arribat a destí"
+msgid "exit"
+msgstr "surt"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1318,11 +1382,13 @@ msgstr "* Desconegut, afegiu etiquetes is_in a aquestes ciutats"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1686,6 +1752,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Retalla el punt"
 
diff --git a/po/ckb.po.in b/po/ckb.po.in
index 56edde0a..61f864c5 100644
--- a/po/ckb.po.in
+++ b/po/ckb.po.in
@@ -132,7 +132,9 @@ msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "exit"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
 msgstr ""
 
 msgid "into the ramp"
@@ -163,90 +165,152 @@ msgstr ""
 msgid "%sinto the %s"
 msgstr ""
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
+msgid "When possible, please turn around"
 msgstr ""
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
 
-msgid "When possible, please turn around"
+#. 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 ""
 
-msgid "Enter the roundabout soon"
+msgid "soon"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "now"
+msgstr ""
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "%1$s merge right %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "%1$s left exit %2$s %3$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
+msgid "%1$s right exit %2$s %3$s"
 msgstr ""
 
-msgid "soon"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
 msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
+msgid "right"
+msgstr ""
+
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-msgid "now"
+#. 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 ""
 
-#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "easily "
 msgstr ""
 
-msgid "error"
+msgid "strongly "
+msgstr ""
+
+msgid "left"
 msgstr ""
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
 msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
 msgstr ""
 
+msgid "then you have reached your destination."
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr ""
 
-msgid "then you have reached your destination."
+msgid "exit"
+msgstr ""
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
 msgstr ""
 
 #. Android resource: @strings/position_popup_title
@@ -1307,11 +1371,13 @@ msgstr ""
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1675,6 +1741,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/cs.po.in b/po/cs.po.in
index c5c8655b..15f704a4 100644
--- a/po/cs.po.in
+++ b/po/cs.po.in
@@ -5,6 +5,7 @@
 # 72ka https://launchpad.net/~2hp
 # Aleš Janda https://launchpad.net/~kyblicek
 # Ivan Kološ https://launchpad.net/~ivan-kolos
+# Jakuje https://launchpad.net/~jakuje
 # MMlosh https://launchpad.net/~mmlosh
 # Mike Crash https://launchpad.net/~mike-mikecrash
 # T.lama https://launchpad.net/~klacl
@@ -148,8 +149,10 @@ msgstr[0] "za %d  kilometr"
 msgstr[1] "za %d  kilometry"
 msgstr[2] "za %d kilometrů"
 
-msgid "exit"
-msgstr "ukončit"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "na přivadeč"
@@ -179,33 +182,18 @@ msgstr "%sdo %s%s%s"
 msgid "%sinto the %s"
 msgstr "%sna %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "vpravo"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "vlevo"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "mírně "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "silně "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "opravdu silně "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "neurčitě "
-
 msgid "When possible, please turn around"
 msgstr "Až to bude možné, otočte se"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Pokračujte po cestě dalších %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Brzy najeďte na kruhový objezd"
 
@@ -214,56 +202,133 @@ msgstr "Brzy najeďte na kruhový objezd"
 msgid "Enter the roundabout %s"
 msgstr "Najeďte na kruhový objezd %s"
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "pak sjeďte na %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Sjeďte na %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Pokračujte po cestě dalších %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "brzy"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "nyní"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Jeďte na %1$s silnici %2$s"
 
+msgid "right"
+msgstr "vpravo"
+
 #, c-format
 msgid "after %i roads"
 msgstr "za %i silnice"
 
-msgid "now"
-msgstr "nyní"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "pak jeďte %1$s silnici %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "chyba"
+msgid "easily "
+msgstr "mírně "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "silně "
+
+msgid "left"
+msgstr "vlevo"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Zabočte %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "pak odbočte %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "pak budete v cíli."
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "%s dorazíte do cíle"
 
-msgid "then you have reached your destination."
-msgstr "pak budete v cíli."
+msgid "exit"
+msgstr "ukončit"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1323,19 +1388,14 @@ msgstr "* Není známo, přidejte is_in atributy do těchto měst"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
-"Použití navit:\n"
-"navit [volby] [konfigurační soubor]\n"
-"\t-c <soubor>: Použijte <soubor> jako konfigurační soubor\n"
-"\t-d <n>: Nastavení souhrnné výstupní ladící úrovně v <n> (0-3). Přepíše "
-"nastavení z konfiguračního souboru.\n"
-"\t-h: Zobrazí tuto nápovědu a skončí.\n"
-"\t-v: Zobrazí verzy a skončí.\n"
 
 #. We have not found an existing config file from all possibilities
 msgid "No config file navit.xml, navit.xml.local found\n"
@@ -1700,6 +1760,9 @@ msgstr "Odstranit výsledky hledání z mapy"
 msgid "Show results on the map"
 msgstr "Zobrazit výsledky na mapě"
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Vyjmout záložku"
 
diff --git a/po/cy.po.in b/po/cy.po.in
index 8c6082e4..9a702d80 100644
--- a/po/cy.po.in
+++ b/po/cy.po.in
@@ -2,14 +2,15 @@
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
+# Padi Phillips https://launchpad.net/~padi
 # Simon Hewison https://launchpad.net/~simon-hewison-6
 
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-08-08 23:15+0000\n"
-"Last-Translator: Simon Hewison <simon.hewison@zymurgy.org>\n"
+"PO-Revision-Date: 2015-01-18 20:41+0000\n"
+"Last-Translator: Padi Phillips <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -135,8 +136,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "exit"
-msgstr "allanfa"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr ""
@@ -166,90 +169,152 @@ msgstr ""
 msgid "%sinto the %s"
 msgstr ""
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
+msgid "When possible, please turn around"
 msgstr ""
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Dilynwch yr heol am y %s nesaf"
+
+msgid "Enter the roundabout soon"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. 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 ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
 
-msgid "When possible, please turn around"
+msgid "soon"
+msgstr "yn fuan"
+
+msgid "now"
+msgstr "nawr"
+
+msgid "then"
 msgstr ""
 
-msgid "Enter the roundabout soon"
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge right %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "%1$s left exit %2$s %3$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "%1$s right exit %2$s %3$s"
 msgstr ""
 
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
 #, c-format
-msgid "Follow the road for the next %s"
+msgid "%1$s continue straight%2$s"
 msgstr ""
 
-msgid "soon"
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
 msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
+msgid "right"
+msgstr ""
+
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-msgid "now"
-msgstr "nawr"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
 msgstr ""
 
-msgid "error"
+msgid "easily "
 msgstr ""
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "yn cryf "
+
+msgid "left"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
 msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
 msgstr ""
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr ""
 
-msgid "then you have reached your destination."
+msgid "exit"
+msgstr "allanfa"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
 msgstr ""
 
 #. Android resource: @strings/position_popup_title
@@ -1310,11 +1375,13 @@ msgstr ""
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1678,6 +1745,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/da.po.in b/po/da.po.in
index 1b5793ae..62000ba0 100644
--- a/po/da.po.in
+++ b/po/da.po.in
@@ -141,8 +141,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "om én kilometer"
 msgstr[1] "om %d kilometer"
 
-msgid "exit"
-msgstr "afkørsel"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "op på rampen"
@@ -172,33 +174,18 @@ msgstr "%s ind i %s%s%s"
 msgid "%sinto the %s"
 msgstr "%sind i %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "højre"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "venstre"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "blødt "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "skarpt "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "meget kraftigt "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "ukendt "
-
 msgid "When possible, please turn around"
 msgstr "Når muligt, vend venligst om"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Følg vejen de næste %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Kør snart ind i rundkørslen"
 
@@ -207,56 +194,133 @@ msgstr "Kør snart ind i rundkørslen"
 msgid "Enter the roundabout %s"
 msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "forlad så rundkørslen ved den %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Forlad rundkørslen ved den %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Følg vejen de næste %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "snart"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "nu"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Tag den %1$s vej til %2$s"
 
+msgid "right"
+msgstr "højre"
+
 #, c-format
 msgid "after %i roads"
 msgstr "efter %i veje"
 
-msgid "now"
-msgstr "nu"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "tag så den %1$s vej til %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "fejl"
+msgid "easily "
+msgstr "blødt "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "skarpt "
+
+msgid "left"
+msgstr "venstre"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Drej %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "drej så %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "og så ankommer du til din destination"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Du er fremme ved destinationen %s"
 
-msgid "then you have reached your destination."
-msgstr "og så ankommer du til din destination"
+msgid "exit"
+msgstr "afkørsel"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1316,11 +1380,13 @@ msgstr "* Ukendt, tilføj is_in mærke til disse byer"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1684,6 +1750,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Klip bogmærke"
 
diff --git a/po/de.po.in b/po/de.po.in
index 6d5f95cb..1a9d1651 100644
--- a/po/de.po.in
+++ b/po/de.po.in
@@ -18,13 +18,13 @@
 # Lars Hennig https://launchpad.net/~elhennig
 # Lukas Bögelein https://launchpad.net/~lukas-boegelein
 # MUrks https://launchpad.net/~tabstop
+# Paulodile https://launchpad.net/~stuff4tschaka
 # Roadrunner IN https://launchpad.net/~online
 # Roschkor https://launchpad.net/~bound-one2000
 # S.E. https://launchpad.net/~stephan-evert
 # Stefan Sordon https://launchpad.net/~stefan-sordon
 # Thuttle https://launchpad.net/~archibald-thuttle
 # Tobias Bannert https://launchpad.net/~toba
-# Tschaka https://launchpad.net/~stuff4tschaka
 # Usul https://launchpad.net/~usul1
 # everyone https://launchpad.net/~anonymus1338
 # lopho https://launchpad.net/~lopho
@@ -162,8 +162,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "In einem Kilometer"
 msgstr[1] "In %d Kilometern"
 
-msgid "exit"
-msgstr "Ausfahrt"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "auf die Auffahrt"
@@ -193,34 +195,19 @@ msgstr "%sauf das %s%s%s"
 msgid "%sinto the %s"
 msgstr "%sauf die %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "rechts"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "links"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "leicht "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "scharf "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "scharf "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "unbekannt "
-
 #
 msgid "When possible, please turn around"
 msgstr "Wenn möglich, bitte wenden"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Dem Straßenverlauf %s folgen"
+
 msgid "Enter the roundabout soon"
 msgstr "Demnächst in den Kreisverkehr einfahren"
 
@@ -229,57 +216,133 @@ msgstr "Demnächst in den Kreisverkehr einfahren"
 msgid "Enter the roundabout %s"
 msgstr "%s in den Kreisverkehr einfahren"
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "dann verlassen Sie den Kreisverkehr an der %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Den Kreisverkehr an der %s verlassen"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Dem Straßenverlauf %s folgen"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "Demnächst"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "Jetzt"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Die %1$s Straße %2$s abbiegen"
 
+msgid "right"
+msgstr "rechts"
+
 #, c-format
 msgid "after %i roads"
 msgstr "nach %i Straßen"
 
-msgid "now"
-msgstr "Jetzt"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "dann die %1$s Straße %2$s abbiegen"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "Fehler"
+msgid "easily "
+msgstr "leicht "
 
-# c-format
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "scharf "
+
+msgid "left"
+msgstr "links"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "%3$s %1$s%2$s abbiegen%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "dann %3$s %1$s%2$s abbiegen%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "dann haben Sie Ihr Ziel erreicht."
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Sie haben Ihr Ziel %s erreicht"
 
-msgid "then you have reached your destination."
-msgstr "dann haben Sie Ihr Ziel erreicht."
+msgid "exit"
+msgstr "Ausfahrt"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1341,19 +1404,14 @@ msgstr "*Unbekannt, füge Etikett \"ist in\" zu diesen Städten hinzu"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
-"navit Benutzung:\n"
-"navit [Optionen] [Konfigdatei]\n"
-"\t-c <file>: <file> als Konfigdatei benutzen\n"
-"\t-d <n>: Den globalen Debug-Level auf <n> (0-3) setzen. Überschreibt die "
-"Einstellung aus der Konfigurationsdatei.\n"
-"\t-h: Diesen Text ausgeben und das Programm beenden.\n"
-"\t-v: Die Version ausgeben und das Programm beenden.\n"
 
 #. We have not found an existing config file from all possibilities
 msgid "No config file navit.xml, navit.xml.local found\n"
@@ -1720,6 +1778,9 @@ msgstr "Suchergebnisse aus Karte löschen"
 msgid "Show results on the map"
 msgstr "Ergebnisse in Karte anzeigen"
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Lesezeichen ausschneiden"
 
diff --git a/po/de_CH.po.in b/po/de_CH.po.in
index 7d9a9757..377884e4 100644
--- a/po/de_CH.po.in
+++ b/po/de_CH.po.in
@@ -132,7 +132,9 @@ msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "exit"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
 msgstr ""
 
 msgid "into the ramp"
@@ -163,90 +165,152 @@ msgstr ""
 msgid "%sinto the %s"
 msgstr ""
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
+msgid "When possible, please turn around"
 msgstr ""
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
 
-msgid "When possible, please turn around"
+#. 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 ""
 
-msgid "Enter the roundabout soon"
+msgid "soon"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "now"
+msgstr ""
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "%1$s merge right %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "%1$s left exit %2$s %3$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
+msgid "%1$s right exit %2$s %3$s"
 msgstr ""
 
-msgid "soon"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
 msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
+msgid "right"
+msgstr ""
+
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-msgid "now"
+#. 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 ""
 
-#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "easily "
 msgstr ""
 
-msgid "error"
+msgid "strongly "
+msgstr ""
+
+msgid "left"
 msgstr ""
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
 msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
 msgstr ""
 
+msgid "then you have reached your destination."
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr ""
 
-msgid "then you have reached your destination."
+msgid "exit"
+msgstr ""
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
 msgstr ""
 
 #. Android resource: @strings/position_popup_title
@@ -1307,11 +1371,13 @@ msgstr ""
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1675,6 +1741,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/el.po.in b/po/el.po.in
index 1624ae34..7c725176 100644
--- a/po/el.po.in
+++ b/po/el.po.in
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-09-28 01:41+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2014-12-07 10:54+0000\n"
+"Last-Translator: aitolos <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -84,11 +84,11 @@ msgstr "σε %d μ"
 
 #, c-format
 msgid "%d feet"
-msgstr ""
+msgstr "%d πόδια"
 
 #, c-format
 msgid "in %d feet"
-msgstr ""
+msgstr "σε %d πόδια"
 
 #, c-format
 msgid "%d meters"
@@ -100,11 +100,11 @@ msgstr "σε %d μέτρα"
 
 #, c-format
 msgid "%d.%d miles"
-msgstr ""
+msgstr "%d.%d μίλια"
 
 #, c-format
 msgid "in %d.%d miles"
-msgstr ""
+msgstr "σε %d.%d μίλια"
 
 #, c-format
 msgid "%d.%d kilometers"
@@ -117,14 +117,14 @@ msgstr "σε %d %d χιλιόμετρα"
 #, c-format
 msgid "one mile"
 msgid_plural "%d miles"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ένα μίλι"
+msgstr[1] "%d μίλια"
 
 #, c-format
 msgid "in one mile"
 msgid_plural "in %d miles"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "σε ένα μίλι"
+msgstr[1] "σε %d μίλια"
 
 #, c-format
 msgid "one kilometer"
@@ -138,8 +138,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "σε ένα χιλιόμετρο"
 msgstr[1] "σε %d χιλιόμετρα"
 
-msgid "exit"
-msgstr "έξοδος"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "στη ράμπα"
@@ -169,33 +171,18 @@ msgstr "%sστο %s%s%s"
 msgid "%sinto the %s"
 msgstr "%s στην %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "δεξιά"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "αριστερά"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "ελαφρά "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "Κλειστά "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "πολύ κλειστά "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "άγνωστο "
-
 msgid "When possible, please turn around"
 msgstr "Όταν είναι δυνατόν, κάνε αναστροφή"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Ακολουθήστε το δρόμο για τα επόμενα %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Μπές στη κυκλική πορεία άμεσα"
 
@@ -204,56 +191,133 @@ 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 %s"
-msgstr "και βγείτε απο την κυκλική πορεία στην %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Εξοδος απο την κυκλική πορεία στην %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Ακολουθήστε το δρόμο για τα επόμενα %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "σύντομα"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "τώρα"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Πάρτε τον %1$s δρόμο για το %2$s"
 
+msgid "right"
+msgstr "δεξιά"
+
 #, c-format
 msgid "after %i roads"
 msgstr "μετά από %i δρόμους"
 
-msgid "now"
-msgstr "τώρα"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "στη συνέχεια πάρτε το %1$s δρόμο για το %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "σφάλμα"
+msgid "easily "
+msgstr "ελαφρά "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "Κλειστά "
+
+msgid "left"
+msgstr "αριστερά"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Στρίψτε %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "και στρίψτε %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "τότε έχετε φτάσει στον προορισμό σας."
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Φτάσατε στον προορισμό σας %s"
 
-msgid "then you have reached your destination."
-msgstr "τότε έχετε φτάσει στον προορισμό σας."
+msgid "exit"
+msgstr "έξοδος"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -853,7 +917,7 @@ msgstr "Λεττονία"
 
 #. 434
 msgid "Libya"
-msgstr ""
+msgstr "Λιβύη"
 
 #. 504
 msgid "Morocco"
@@ -1141,7 +1205,7 @@ msgstr "Σουρινάμ"
 
 #. 728
 msgid "South Sudan"
-msgstr ""
+msgstr "Νότιο Σουδάν"
 
 #. 678
 msgid "Sao Tome and Principe"
@@ -1313,11 +1377,13 @@ msgstr "* Άγνωστη, προσθέστε ετικέτες is_in σε αυτ�
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1341,7 +1407,7 @@ msgid ""
 msgstr ""
 
 msgid "unknown street"
-msgstr ""
+msgstr "άγνωστος δρόμος"
 
 #. Safe cast: attr_generic_set_attr does not modify its parameter.
 msgid "Unnamed vehicle"
@@ -1503,49 +1569,49 @@ msgid "Data"
 msgstr "Δεδομένα"
 
 msgid "Pharmacy"
-msgstr ""
+msgstr "Φαρμακείο"
 
 msgid "Restaurant"
-msgstr ""
+msgstr "Εστιατόριο"
 
 msgid "Restaurant. Fast food"
 msgstr ""
 
 msgid "Hotel"
-msgstr ""
+msgstr "Ξενοδοχείο"
 
 msgid "Car parking"
 msgstr ""
 
 msgid "Fuel station"
-msgstr ""
+msgstr "Βενζινάδικο"
 
 msgid "Bank"
-msgstr ""
+msgstr "Τράπεζα"
 
 msgid "Hospital"
-msgstr ""
+msgstr "Νοσοκομείο"
 
 msgid "Cinema"
-msgstr ""
+msgstr "Κινηματογράφος"
 
 msgid "Train station"
-msgstr ""
+msgstr "Σταθμός τρένου"
 
 msgid "School"
-msgstr ""
+msgstr "Σχολείο"
 
 msgid "Police"
-msgstr ""
+msgstr "Αστυνομία"
 
 msgid "Justice"
 msgstr ""
 
 msgid "Taxi"
-msgstr ""
+msgstr "Ταξί"
 
 msgid "Shopping"
-msgstr ""
+msgstr "Αγορές"
 
 msgid "Distance from screen center (km)"
 msgstr ""
@@ -1570,7 +1636,7 @@ msgid "POI search"
 msgstr ""
 
 msgid "Select a category"
-msgstr ""
+msgstr "Επιλέξτε μια κατηγορία"
 
 msgid "Select a distance to look for (km)"
 msgstr ""
@@ -1681,6 +1747,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Αποκοπή Σελιδοδείκτη"
 
diff --git a/po/en_AU.po.in b/po/en_AU.po.in
index 2e4f7fce..c57cdb2a 100644
--- a/po/en_AU.po.in
+++ b/po/en_AU.po.in
@@ -134,8 +134,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "in one kilometre"
 msgstr[1] "in %d kilometres"
 
-msgid "exit"
-msgstr "exit"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "into the ramp"
@@ -165,91 +167,153 @@ msgstr "%sinto the %s%s%s"
 msgid "%sinto the %s"
 msgstr "%sinto the %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "right"
+msgid "When possible, please turn around"
+msgstr "When possible, please turn around"
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "easily "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Follow the road for the next %s"
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "strongly "
+msgid "Enter the roundabout soon"
+msgstr ""
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "really strongly "
+#. 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 ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "unknown "
+#. 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 ""
 
-msgid "When possible, please turn around"
-msgstr "When possible, please turn around"
+msgid "soon"
+msgstr "soon"
 
-msgid "Enter the roundabout soon"
+msgid "now"
+msgstr "now"
+
+msgid "then"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "then leave the roundabout at the %s"
+msgid "%1$s merge right %2$s"
+msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Leave the roundabout at the %s"
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Follow the road for the next %s"
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
 
-msgid "soon"
-msgstr "soon"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Take the %1$s road to the %2$s"
 
+msgid "right"
+msgstr "right"
+
 #, c-format
 msgid "after %i roads"
 msgstr "after %i roads"
 
-msgid "now"
-msgstr "now"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "then take the %1$s road to the %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "error"
+msgid "easily "
+msgstr "easily "
+
+msgid "strongly "
+msgstr "strongly "
+
+msgid "left"
+msgstr "left"
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
+msgstr "then you will have reached your destination"
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "You have reached your destination %s"
 
-msgid "then you have reached your destination."
-msgstr "then you will have reached your destination"
+msgid "exit"
+msgstr "exit"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1309,11 +1373,13 @@ msgstr "* Unknown, add is_in tags to those cities"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1677,6 +1743,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Cut Bookmark"
 
diff --git a/po/en_CA.po.in b/po/en_CA.po.in
index 284137aa..b8e96c45 100644
--- a/po/en_CA.po.in
+++ b/po/en_CA.po.in
@@ -132,8 +132,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "in one kilometre"
 msgstr[1] "in %d kilometres"
 
-msgid "exit"
-msgstr "exit"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "into the ramp"
@@ -163,91 +165,153 @@ msgstr "%sinto the %s%s%s|neutral form"
 msgid "%sinto the %s"
 msgstr "%sinto the %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "right"
+msgid "When possible, please turn around"
+msgstr "When possible, please turn around"
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "easily "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Follow the road for the next %s"
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "strongly "
+msgid "Enter the roundabout soon"
+msgstr ""
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "really strongly "
+#. 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 ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "unknown "
+#. 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 ""
 
-msgid "When possible, please turn around"
-msgstr "When possible, please turn around"
+msgid "soon"
+msgstr "soon"
 
-msgid "Enter the roundabout soon"
+msgid "now"
+msgstr "now"
+
+msgid "then"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "then leave the roundabout at the %s"
+msgid "%1$s merge right %2$s"
+msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Leave the roundabout at the %s"
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Follow the road for the next %s"
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
 
-msgid "soon"
-msgstr "soon"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Take the %1$s road to the %2$s"
 
+msgid "right"
+msgstr "right"
+
 #, c-format
 msgid "after %i roads"
 msgstr "after %i roads"
 
-msgid "now"
-msgstr "now"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "then take the %1$s road to the %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "error"
+msgid "easily "
+msgstr "easily "
+
+msgid "strongly "
+msgstr "strongly "
+
+msgid "left"
+msgstr "left"
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
+msgstr "then you have reached your destination."
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "You have reached your destination %s"
 
-msgid "then you have reached your destination."
-msgstr "then you have reached your destination."
+msgid "exit"
+msgstr "exit"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1307,11 +1371,13 @@ msgstr "* Unknown, add is_in tags to those cities"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1675,6 +1741,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Cut Bookmark"
 
diff --git a/po/en_GB.po.in b/po/en_GB.po.in
index 51f38cec..07265dc7 100644
--- a/po/en_GB.po.in
+++ b/po/en_GB.po.in
@@ -140,8 +140,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "in one kilometre"
 msgstr[1] "in %d kilometres"
 
-msgid "exit"
-msgstr "exit"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "onto the slip road"
@@ -171,33 +173,18 @@ msgstr "%sonto the %s%s%s"
 msgid "%sinto the %s"
 msgstr "%sonto the %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "right"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "left"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "easily "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "strongly "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "really strongly "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "unknown "
-
 msgid "When possible, please turn around"
 msgstr "When possible, please turn around"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Follow the road for the next %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Enter the roundabout soon"
 
@@ -206,56 +193,133 @@ msgstr "Enter the roundabout soon"
 msgid "Enter the roundabout %s"
 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 %s"
-msgstr "then leave the roundabout at the %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Leave the roundabout at the %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Follow the road for the next %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "soon"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "now"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Take the %1$s road to the %2$s"
 
+msgid "right"
+msgstr "right"
+
 #, c-format
 msgid "after %i roads"
 msgstr "after %i roads"
 
-msgid "now"
-msgstr "now"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "then take the %1$s road to the %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
+
+msgid "easily "
+msgstr "easily "
 
-msgid "error"
-msgstr "error"
+msgid "strongly "
+msgstr "strongly "
+
+msgid "left"
+msgstr "left"
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
+msgstr "then you have reached your destination"
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "You have reached your destination %s"
 
-msgid "then you have reached your destination."
-msgstr "then you have reached your destination"
+msgid "exit"
+msgstr "exit"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1315,19 +1379,14 @@ msgstr "* Unknown, add is_in tags to those cities"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
-"navit usage:\n"
-"navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
-"\t-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"
@@ -1691,6 +1750,9 @@ msgstr "Remove search results from the map"
 msgid "Show results on the map"
 msgstr "Show results on the map"
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Cut bookmark"
 
diff --git a/po/eo.po.in b/po/eo.po.in
index 38111423..48b007f6 100644
--- a/po/eo.po.in
+++ b/po/eo.po.in
@@ -136,8 +136,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "en unu kilometron"
 msgstr[1] "en %d kilometrojn"
 
-msgid "exit"
-msgstr "eliro"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "al la ramplon"
@@ -167,91 +169,153 @@ msgstr "%sal la %s%s%s"
 msgid "%sinto the %s"
 msgstr "%sal la %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "dekstren"
+msgid "When possible, please turn around"
+msgstr "Kiam eble, bonvole ĉirkaŭturnu"
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "maldekstren"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "facile "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Sekvu la straton ĝis la sekva %s"
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "forte "
+msgid "Enter the roundabout soon"
+msgstr ""
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "vere forte "
+#. 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 ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "nekonata "
+#. 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 ""
 
-msgid "When possible, please turn around"
-msgstr "Kiam eble, bonvole ĉirkaŭturnu"
+msgid "soon"
+msgstr "baldaŭ"
 
-msgid "Enter the roundabout soon"
+msgid "now"
+msgstr "nun"
+
+msgid "then"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "do lasu la trafikcirklon ĉe la %s"
+msgid "%1$s merge right %2$s"
+msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Lasu la trafikcirklon ĉe la %s"
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Sekvu la straton ĝis la sekva %s"
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
 
-msgid "soon"
-msgstr "baldaŭ"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Turnu %2$s ĉe la strato %1$s"
 
+msgid "right"
+msgstr "dekstren"
+
 #, c-format
 msgid "after %i roads"
 msgstr "post %i stratoj"
 
-msgid "now"
-msgstr "nun"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "do iru %2$s al la strato %1$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "eraro"
+msgid "easily "
+msgstr "facile "
+
+msgid "strongly "
+msgstr "forte "
+
+msgid "left"
+msgstr "maldekstren"
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Turnu %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "do %1$s turnu %2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
+msgstr "do vi atingis la celon"
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Vi atingis la celon %s"
 
-msgid "then you have reached your destination."
-msgstr "do vi atingis la celon"
+msgid "exit"
+msgstr "eliro"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1311,11 +1375,13 @@ msgstr "* Nekonata, aldonu etikedon is_in al ĉi tiuj urboj"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1679,6 +1745,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Eltondi legosignon"
 
diff --git a/po/es.po.in b/po/es.po.in
index 00d0c7b1..5ba7b2f2 100644
--- a/po/es.po.in
+++ b/po/es.po.in
@@ -148,8 +148,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "en un kilómetro"
 msgstr[1] "en %d kilómetros"
 
-msgid "exit"
-msgstr "salir"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "en la salida"
@@ -179,33 +181,18 @@ msgstr "%s en %s%s%s"
 msgid "%sinto the %s"
 msgstr "%s en la %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "a la derecha"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "a la izquierda"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "ligeramente "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "bruscamente "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "de forma muy pronunciada "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "desconocido "
-
 msgid "When possible, please turn around"
 msgstr "Dé la vuelta cuando sea posible"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Continúe en esta carretera durante %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Entre en la próxima rotonda"
 
@@ -214,56 +201,133 @@ msgstr "Entre en la próxima rotonda"
 msgid "Enter the roundabout %s"
 msgstr "Entre en 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 %s"
-msgstr "después salga de la rotonda por la %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Salga de la rotonda por la %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Continúe en esta carretera durante %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "próximamente"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "ahora"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Tome la %1$s carretera %2$s"
 
+msgid "right"
+msgstr "a la derecha"
+
 #, c-format
 msgid "after %i roads"
 msgstr "después de %i carreteras"
 
-msgid "now"
-msgstr "ahora"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "entonces tome la %1$s salida %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "error"
+msgid "easily "
+msgstr "ligeramente "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "bruscamente "
+
+msgid "left"
+msgstr "a la izquierda"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Gire %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "luego gire %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "entonces ha llegado a su destino."
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Ha llegado a su destino %s"
 
-msgid "then you have reached your destination."
-msgstr "entonces ha llegado a su destino."
+msgid "exit"
+msgstr "salir"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1323,19 +1387,14 @@ msgstr "* Desconocido, añadir etiquetas is_in a estas ciudades"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
-"Uso de navit:\n"
-"navit[opciones][archivo de configuración]\n"
-"\t-c <archivo>: usa <archivo> como archivo de configuración.\n"
-"\t-d <n>: configura en nivel de debug a <n> (0-3). Sobreescribe lo indicado "
-"en el archivo de configuracion.\n"
-"\t-h: muestra esta informacion de uso y sale.\n"
-"\t-v: Muestra la version y sale..\n"
 
 #. We have not found an existing config file from all possibilities
 msgid "No config file navit.xml, navit.xml.local found\n"
@@ -1701,6 +1760,9 @@ msgstr "Quitar los resultados de búsqueda del mapa"
 msgid "Show results on the map"
 msgstr "Mostrar los resultados en el mapa"
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Cortar marcador"
 
diff --git a/po/et.po.in b/po/et.po.in
index bffc809a..bc49c511 100644
--- a/po/et.po.in
+++ b/po/et.po.in
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-12-05 21:25+0000\n"
-"Last-Translator: Jalakas <Unknown>\n"
+"PO-Revision-Date: 2015-01-05 22:03+0000\n"
+"Last-Translator: Manuel Hohmann <mhohmann@physnet.uni-hamburg.de>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -137,8 +137,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "ühe kilomeetri pärast"
 msgstr[1] "%d kilomeetri pärast"
 
-msgid "exit"
-msgstr "mahasõit"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "kaldteele"
@@ -168,33 +170,18 @@ msgstr "%s %s%s%s tänavale"
 msgid "%sinto the %s"
 msgstr "%steele %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "paremale"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "vasakule"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "laugelt "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "järsult "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "väga järsult "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "teadmata "
-
 msgid "When possible, please turn around"
 msgstr "Kui võimalik, palun pööra ümber"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Mööda teed järgmised %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Sõida varsti ringteele"
 
@@ -203,56 +190,133 @@ msgstr "Sõida varsti ringteele"
 msgid "Enter the roundabout %s"
 msgstr "Ringteeni %s"
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "ning lahku ringteelt %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Lahku ringteelt %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Mööda teed järgmised %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "varsti"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "nüüd"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Vali %1$s tee, mis viib %2$s"
 
+msgid "right"
+msgstr "paremale"
+
 #, c-format
 msgid "after %i roads"
 msgstr "pärast %i teed"
 
-msgid "now"
-msgstr "nüüd"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "siis vali %1$s tee %2$s-sse"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
+
+msgid "easily "
+msgstr "laugelt "
 
-msgid "error"
-msgstr "viga"
+msgid "strongly "
+msgstr "järsult "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "left"
+msgstr "vasakule"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Pööra %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "siis pööra %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "siis oled jõudnud sihtpunkti."
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Sa oled jõudnud sihtpunkti %s"
 
-msgid "then you have reached your destination."
-msgstr "siis oled jõudnud sihtpunkti."
+msgid "exit"
+msgstr "mahasõit"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1312,19 +1376,14 @@ msgstr "* Tundmatu, lisa \"is_in\" märge neile linnadele"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
-"navit kasutamine:\n"
-"navit [valikud] [konfiguratsioonifail]\n"
-"\t-c <fail>: kasutab konfiguratsioonifaili <fail>.\n"
-"\t-d <n>: määrab globaalse veasilumisinfo väljundi taseme <n> (0-3). "
-"Tühistab konfiguratsioonifaili määratud taseme.\n"
-"\t-h: Prindib praeguse info ja väljub programmist.\n"
-"\t-v: Prindib versiooniinfo ja väljub programmist.\n"
 
 #. We have not found an existing config file from all possibilities
 msgid "No config file navit.xml, navit.xml.local found\n"
@@ -1511,49 +1570,49 @@ msgid "Data"
 msgstr "Andmed"
 
 msgid "Pharmacy"
-msgstr ""
+msgstr "Apteek"
 
 msgid "Restaurant"
-msgstr ""
+msgstr "Restoran"
 
 msgid "Restaurant. Fast food"
-msgstr ""
+msgstr "Restoran. Kiirtoit"
 
 msgid "Hotel"
-msgstr ""
+msgstr "Hotell"
 
 msgid "Car parking"
-msgstr ""
+msgstr "Autoparkla"
 
 msgid "Fuel station"
-msgstr ""
+msgstr "Bensiinijaam"
 
 msgid "Bank"
-msgstr ""
+msgstr "Pank"
 
 msgid "Hospital"
-msgstr ""
+msgstr "Haigla"
 
 msgid "Cinema"
-msgstr ""
+msgstr "Kino"
 
 msgid "Train station"
-msgstr ""
+msgstr "Raudteejaam"
 
 msgid "School"
-msgstr ""
+msgstr "Kool"
 
 msgid "Police"
-msgstr ""
+msgstr "Politsei"
 
 msgid "Justice"
 msgstr ""
 
 msgid "Taxi"
-msgstr ""
+msgstr "Takso"
 
 msgid "Shopping"
-msgstr ""
+msgstr "kauplus"
 
 msgid "Distance from screen center (km)"
 msgstr ""
@@ -1689,6 +1748,9 @@ msgstr "Eemalda otsingutulemused kaardilt"
 msgid "Show results on the map"
 msgstr "Näita tulemusi kaardil"
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Lõika järjehoidja"
 
diff --git a/po/eu.po.in b/po/eu.po.in
index eab33383..8ea6d562 100644
--- a/po/eu.po.in
+++ b/po/eu.po.in
@@ -134,8 +134,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "kilometro batean"
 msgstr[1] "%d kilometrotan"
 
-msgid "exit"
-msgstr "irteera"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "maldan"
@@ -165,91 +167,153 @@ msgstr "%s %s%s%s-en"
 msgid "%sinto the %s"
 msgstr "%s %s-an"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "eskuina"
+msgid "When possible, please turn around"
+msgstr "Ahal duzunean eman itzulia, mesedez"
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "ezkerra"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "pizka bat "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Jarraitu bidean urrengo %s-arte"
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "gogorki "
+msgid "Enter the roundabout soon"
+msgstr ""
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "benetan gogor "
+#. 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 ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "ezezaguna "
+#. 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 ""
 
-msgid "When possible, please turn around"
-msgstr "Ahal duzunean eman itzulia, mesedez"
+msgid "soon"
+msgstr "hurrengotan"
 
-msgid "Enter the roundabout soon"
+msgid "now"
+msgstr "orain"
+
+msgid "then"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "gero, irten errotondatik %s-ean"
+msgid "%1$s merge right %2$s"
+msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Irten errotondatik %s-ean"
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Jarraitu bidean urrengo %s-arte"
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
 
-msgid "soon"
-msgstr "hurrengotan"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Hartu %1$s bidea %2$s-ean"
 
+msgid "right"
+msgstr "eskuina"
+
 #, c-format
 msgid "after %i roads"
 msgstr "%i bideen ondoren"
 
-msgid "now"
-msgstr "orain"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "orduan hartu %1$s irteera %2$s-era"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "akatsa"
+msgid "easily "
+msgstr "pizka bat "
+
+msgid "strongly "
+msgstr "gogorki "
+
+msgid "left"
+msgstr "ezkerra"
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Biratu %1$s%2$s-ra %3$s%4$s-tan"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "ondoren biratu %1$s %2$s-ra %3$s%4$s-raino"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
+msgstr "dagoeneko helburura iritsi zara"
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "%s helburura iritsi zara"
 
-msgid "then you have reached your destination."
-msgstr "dagoeneko helburura iritsi zara"
+msgid "exit"
+msgstr "irteera"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1309,11 +1373,13 @@ msgstr "* Ezezaguna, gehitu -en_dago etiketak hiri hauentzat"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1677,6 +1743,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Moztu Gogokoa"
 
diff --git a/po/fa.po.in b/po/fa.po.in
index 0a396e55..7cfb1f3d 100644
--- a/po/fa.po.in
+++ b/po/fa.po.in
@@ -133,8 +133,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "exit"
-msgstr "بیرون"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "به سوی شیب"
@@ -164,32 +166,17 @@ msgstr ""
 msgid "%sinto the %s"
 msgstr ""
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "راست"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "چپ"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "به آسانی "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "به سختی "
+msgid "When possible, please turn around"
+msgstr "هنگامیکه توانستید برگردید."
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "گمنام "
-
-msgid "When possible, please turn around"
-msgstr "هنگامیکه توانستید برگردید."
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr ""
 
 msgid "Enter the roundabout soon"
 msgstr "به زودی به فلکه بروید"
@@ -199,57 +186,134 @@ 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 %s"
+msgid "then leave the roundabout at the %1$s %2$s"
 msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "Leave the roundabout at the %1$s %2$s"
 msgstr ""
 
+msgid "soon"
+msgstr "به زودی"
+
+msgid "now"
+msgstr "اکنون"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Follow the road for the next %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
-msgid "soon"
-msgstr "به زودی"
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Take the %1$s road to the %2$s"
+msgid "%1$s left exit %2$s %3$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "after %i roads"
+msgid "%1$s right exit %2$s %3$s"
 msgstr ""
 
-msgid "now"
-msgstr "اکنون"
+msgid " at the exit "
+msgstr ""
 
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
 #, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "%1$s continue straight%2$s"
 msgstr ""
 
-msgid "error"
-msgstr "نادرست"
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s keep left%2$s"
 msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s continue straight"
 msgstr ""
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "You have reached your destination %s"
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr ""
+
+msgid "right"
+msgstr "راست"
+
+#, c-format
+msgid "after %i roads"
+msgstr ""
+
+#. 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 ""
+
+msgid "easily "
+msgstr "به آسانی "
+
+msgid "strongly "
+msgstr "به سختی "
+
+msgid "left"
+msgstr "چپ"
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s left turnaround"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s right turnaround"
 msgstr ""
 
 msgid "then you have reached your destination."
 msgstr "سپس شما به خواستگاه خود رسیده اید."
 
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr ""
+
+msgid "exit"
+msgstr "بیرون"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
+
 #. Android resource: @strings/position_popup_title
 msgid "Position"
 msgstr "جایگاه"
@@ -1308,11 +1372,13 @@ msgstr ""
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1676,6 +1742,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/fi.po.in b/po/fi.po.in
index 82b1ebf4..97808876 100644
--- a/po/fi.po.in
+++ b/po/fi.po.in
@@ -139,8 +139,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "Yhden kilometrin päästä"
 msgstr[1] "%d kilometrin päästä"
 
-msgid "exit"
-msgstr "poistumistie"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "rampille"
@@ -170,33 +172,18 @@ msgstr "%skadulle %s%s%s"
 msgid "%sinto the %s"
 msgstr "%stielle %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "oikealle"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "vasemmalle"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "loivasti "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "jyrkästi "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "todella voimakkaasti "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "tuntematon "
-
 msgid "When possible, please turn around"
 msgstr "Kun mahdollista, tee u-käännös"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Seuraa tätä tietä %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Liity liikenneympyrään pian"
 
@@ -205,56 +192,133 @@ 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 %s"
-msgstr "poistu sitten liikenneympyrästä %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Poistu liikenneympyrästä %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Seuraa tätä tietä %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "pian"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "nyt"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Valitse %1$s tie suuntaan %2$s"
 
+msgid "right"
+msgstr "oikealle"
+
 #, c-format
 msgid "after %i roads"
 msgstr "%i tien jälkeen"
 
-msgid "now"
-msgstr "nyt"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "valitse sitten %1$s tie suuntaan %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "virhe"
+msgid "easily "
+msgstr "loivasti "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "jyrkästi "
+
+msgid "left"
+msgstr "vasemmalle"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Käänny %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "käänny sitten %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "sitten olet perillä."
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Olet saavuttanut kohteesi %s"
 
-msgid "then you have reached your destination."
-msgstr "sitten olet perillä."
+msgid "exit"
+msgstr "poistumistie"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1315,11 +1379,13 @@ msgstr "* Tuntematon, lisätä is_in koodit näistä kaupungeista"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1687,6 +1753,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Leikkaa kirjanmerkki"
 
diff --git a/po/fil.po.in b/po/fil.po.in
index 9742137a..79334950 100644
--- a/po/fil.po.in
+++ b/po/fil.po.in
@@ -132,8 +132,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "sa loob ng isang kilometro"
 msgstr[1] "sa loob ng %d kilometro"
 
-msgid "exit"
-msgstr "labasan"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr ""
@@ -163,90 +165,152 @@ msgstr ""
 msgid "%sinto the %s"
 msgstr ""
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "kanan"
+msgid "When possible, please turn around"
+msgstr "kung maari ay bumalik"
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "Kaliwa"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "ng marahan "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Sundan ang kalye sa susunod na %s"
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
+msgstr ""
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. 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 ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
 
-msgid "When possible, please turn around"
-msgstr "kung maari ay bumalik"
+msgid "soon"
+msgstr ""
 
-msgid "Enter the roundabout soon"
+msgid "now"
+msgstr "ngayon na"
+
+msgid "then"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "pagkatapos ay lumabas sa rotonda sa may %s"
+msgid "%1$s merge right %2$s"
+msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Lisanin ang rotonda sa may %s"
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Sundan ang kalye sa susunod na %s"
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
 
-msgid "soon"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
 msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
+msgid "right"
+msgstr "kanan"
+
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-msgid "now"
-msgstr "ngayon na"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "pagkatapos ay gamitin ang %1$s hanggang %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
+
+msgid "easily "
+msgstr "ng marahan "
 
-msgid "error"
+msgid "strongly "
 msgstr ""
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "left"
+msgstr "Kaliwa"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
 msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
 msgstr ""
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr ""
 
-msgid "then you have reached your destination."
+msgid "exit"
+msgstr "labasan"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
 msgstr ""
 
 #. Android resource: @strings/position_popup_title
@@ -1307,11 +1371,13 @@ msgstr ""
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1675,6 +1741,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/fo.po.in b/po/fo.po.in
index dcfa7f4c..434dc477 100644
--- a/po/fo.po.in
+++ b/po/fo.po.in
@@ -134,8 +134,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "um ein kilometur"
 msgstr[1] "um %d kilometrar"
 
-msgid "exit"
-msgstr "avkoyring"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "uppá rampuna"
@@ -165,33 +167,18 @@ msgstr "%sinná %s%s%si"
 msgid "%sinto the %s"
 msgstr "%sinná %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "Høgra"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "Vinstra"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "lætt "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "knapt "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "sera knapt "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "ókent "
-
 msgid "When possible, please turn around"
 msgstr "vend um skótast tilber"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "fylg vegnum tær næstu %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Um lítið bil verður koyrt inní rundkoyringina"
 
@@ -200,56 +187,133 @@ 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 %s"
-msgstr "far so út úr rundkoyring við %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "far út úr rundkoyring við %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "fylg vegnum tær næstu %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "skjótt"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "nú"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "tak tann %1$s vegin til %2$s"
 
+msgid "right"
+msgstr "Høgra"
+
 #, c-format
 msgid "after %i roads"
 msgstr "eftir %i vegir"
 
-msgid "now"
-msgstr "nú"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "so tak tann %1$s vegin til %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "feilur"
+msgid "easily "
+msgstr "lætt "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "knapt "
+
+msgid "left"
+msgstr "Vinstra"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "dreya %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "dreya síðan %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "tá hevur tú nátt tínum ferðamáli"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Tú hevur nátt tínum ferðamáli %s"
 
-msgid "then you have reached your destination."
-msgstr "tá hevur tú nátt tínum ferðamáli"
+msgid "exit"
+msgstr "avkoyring"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1309,11 +1373,13 @@ msgstr "* Ókent, knýt is_in tag til hasar býirnar"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1677,6 +1743,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Klipp bókamerki"
 
diff --git a/po/fr.po.in b/po/fr.po.in
index 2800dab4..a94018d3 100644
--- a/po/fr.po.in
+++ b/po/fr.po.in
@@ -8,10 +8,12 @@
 # Elodie https://launchpad.net/~elodie
 # Fred https://launchpad.net/~jelk
 # Gaël Ecorchard https://launchpad.net/~galou-breizh
+# Jean Marc https://launchpad.net/~m-balthazar
 # Jérôme BLUM https://launchpad.net/~jblum
 # KaZeR https://launchpad.net/~kazer
 # Roadrunner IN https://launchpad.net/~online
 # Thibault Lemaitre https://launchpad.net/~thibault.lemaitre
+# Thjazi https://launchpad.net/~pa2l
 # alexb38 https://launchpad.net/~alexb38
 # alfred002 https://launchpad.net/~alfred002
 # boism https://launchpad.net/~boism
@@ -26,8 +28,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-08-11 17:45+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-03-10 20:10+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"
@@ -37,7 +39,7 @@ msgstr ""
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
-msgstr "Execution depuis le dossier d'origine\n"
+msgstr "Éxecution depuis le dossier d'origine\n"
 
 #, c-format
 msgid "setting '%s' to '%s'\n"
@@ -130,14 +132,14 @@ msgstr "dans %d kilomètres %d"
 #, c-format
 msgid "one mile"
 msgid_plural "%d miles"
-msgstr[0] "un mille"
-msgstr[1] "%d milles"
+msgstr[0] "un mile"
+msgstr[1] "%d miles"
 
 #, c-format
 msgid "in one mile"
 msgid_plural "in %d miles"
-msgstr[0] "dans un mille"
-msgstr[1] "dans %d milles"
+msgstr[0] "dans un mile"
+msgstr[1] "dans %d miles"
 
 #, c-format
 msgid "one kilometer"
@@ -151,8 +153,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "dans un kilomètre"
 msgstr[1] "dans %d kilomètres"
 
-msgid "exit"
-msgstr "sortie"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "vers la sortie"
@@ -182,37 +186,18 @@ msgstr "%ssur l'%s%s%s"
 msgid "%sinto the %s"
 msgstr "%svers la %s"
 
-# tournez à droite
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "à droite"
-
-# tournez à gauche
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "à gauche"
-
-# utilisé pour les changements de voie pour les sorties?
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "légèrement "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "fortement "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "très fortement "
-
-# attention à l'espace à la fin
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "inconnu "
-
 msgid "When possible, please turn around"
 msgstr "Dès que possible, faites demi-tour"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Suivez la route sur %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Préparez vous à vous engager dans le rond-point"
 
@@ -221,57 +206,136 @@ msgstr "Préparez vous à vous engager dans le rond-point"
 msgid "Enter the roundabout %s"
 msgstr "Entrer dans le rond-point %s"
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "puis prenez la %s du rond-point."
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Sortez du rond-point à la %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Suivez la route sur %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "bientôt"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "maintenant"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Empreintez la %1$s rue en direction de %2$s"
 
+# tournez à droite
+msgid "right"
+msgstr "à droite"
+
 #, c-format
 msgid "after %i roads"
 msgstr "après %i rues"
 
-msgid "now"
-msgstr "maintenant"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "puis empreintez la %1$s rue en direction de %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "erreur"
+# utilisé pour les changements de voie pour les sorties?
+msgid "easily "
+msgstr "légèrement "
+
+msgid "strongly "
+msgstr "fortement "
+
+# tournez à gauche
+msgid "left"
+msgstr "à gauche"
 
-# espace important après le 2
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "%3$s, tournez %1$s%2$s %4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "puis tournez %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
+msgstr "puis vous arriverez à destination"
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Vous êtes arrivé à destination : %s"
 
-msgid "then you have reached your destination."
-msgstr "puis vous arriverez à destination"
+msgid "exit"
+msgstr "sortie"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -355,7 +419,7 @@ msgstr "Arménie"
 
 #. 530
 msgid "Netherlands Antilles"
-msgstr "Antilles Néérlandaises"
+msgstr "Antilles néerlandaises"
 
 #. 024
 msgid "Angola"
@@ -483,7 +547,7 @@ msgstr "Canada"
 
 #. 166
 msgid "Cocos (Keeling) Islands"
-msgstr "Iles Cocos"
+msgstr "Îles Cocos"
 
 #. 180
 msgid "Congo, Democratic Republic of the"
@@ -503,7 +567,7 @@ msgstr "Suisse"
 
 #. 384
 msgid "Cote d'Ivoire"
-msgstr "Cote d'Ivoire"
+msgstr "Côte d'Ivoire"
 
 #. 184
 msgid "Cook Islands"
@@ -579,7 +643,7 @@ msgstr "Algérie"
 
 #. 218
 msgid "Ecuador"
-msgstr "Equateur"
+msgstr "Équateur"
 
 #. 233
 msgid "Estonia"
@@ -615,7 +679,7 @@ msgstr "Fiji"
 
 #. 238
 msgid "Falkland Islands (Malvinas)"
-msgstr "Les Malouines (les Malvinas)"
+msgstr "Îles Malouines"
 
 #. 583
 msgid "Micronesia, Federated States of"
@@ -623,7 +687,7 @@ msgstr "Micronésie, États fédérés de"
 
 #. 234
 msgid "Faroe Islands"
-msgstr "Îles Feroe"
+msgstr "Îles Féroé"
 
 #. 250
 msgid "France"
@@ -707,11 +771,11 @@ msgstr "Guyane"
 
 #. 344
 msgid "Hong Kong"
-msgstr "Hong-kong"
+msgstr "Hong Kong"
 
 #. 334
 msgid "Heard Island and McDonald Islands"
-msgstr "Heard, Île et McDonald, Îles"
+msgstr "Îles Heard-et-McDonald"
 
 #. 340
 msgid "Honduras"
@@ -723,7 +787,7 @@ msgstr "Croatie"
 
 #. 332
 msgid "Haiti"
-msgstr "Haiti"
+msgstr "Haïti"
 
 #. 348
 msgid "Hungary"
@@ -751,7 +815,7 @@ msgstr "Inde"
 
 #. 086
 msgid "British Indian Ocean Territory"
-msgstr "Océan Indien, Territoire britannique de l'"
+msgstr "Territoire britannique de l'océan Indien"
 
 #. 368
 msgid "Iraq"
@@ -775,7 +839,7 @@ msgstr "Jersey"
 
 #. 388
 msgid "Jamaica"
-msgstr "Jamaique"
+msgstr "Jamaïque"
 
 #. 400
 msgid "Jordan"
@@ -803,11 +867,11 @@ msgstr "Kiribati"
 
 #. 174
 msgid "Comoros"
-msgstr "Comores, Les"
+msgstr "Comores"
 
 #. 659
 msgid "Saint Kitts and Nevis"
-msgstr "Saint Kitts et Nevis"
+msgstr "Saint-Christophe-et-Niévès"
 
 #. 408
 msgid "Korea, Democratic People's Republic of"
@@ -943,7 +1007,7 @@ msgstr "Malte"
 
 #. 480
 msgid "Mauritius"
-msgstr "Iles Maurice"
+msgstr "Île Maurice"
 
 #. 462
 msgid "Maldives"
@@ -1059,7 +1123,7 @@ msgstr "Puerto Rico"
 
 #. 275
 msgid "Palestinian Territory, Occupied"
-msgstr "Palestine"
+msgstr "Territoire palestinien, occupé"
 
 #. 620
 msgid "Portugal"
@@ -1103,7 +1167,7 @@ msgstr "Arabie Saoudite"
 
 #. 090
 msgid "Solomon Islands"
-msgstr "Îles Solomon"
+msgstr "Îles Salomon"
 
 #. 690
 msgid "Seychelles"
@@ -1111,7 +1175,7 @@ msgstr "Seychelles"
 
 #. 736
 msgid "Sudan"
-msgstr "Sudan"
+msgstr "Soudan"
 
 #. 752
 msgid "Sweden"
@@ -1127,11 +1191,11 @@ msgstr "Sainte Hélène"
 
 #. 705
 msgid "Slovenia"
-msgstr "Slovènie"
+msgstr "Slovénie"
 
 #. 744
 msgid "Svalbard and Jan Mayen"
-msgstr "Svalbard et île Jan Mayen"
+msgstr "Svalbard et Jan Mayen"
 
 #. 703
 msgid "Slovakia"
@@ -1239,7 +1303,7 @@ msgstr "Tuvalu"
 
 #. 158
 msgid "Taiwan, Province of China"
-msgstr "Taiwan, province de la Chine"
+msgstr "Taïwan, province de Chine"
 
 #. 834
 msgid "Tanzania, United Republic of"
@@ -1255,7 +1319,7 @@ msgstr "Uganda"
 
 #. 581
 msgid "United States Minor Outlying Islands"
-msgstr "Îles périphériques mineures des Etats-Unis"
+msgstr "Îles mineures éloignées des États-Unis"
 
 #. 840
 msgid "United States"
@@ -1307,7 +1371,7 @@ msgstr "Samoa"
 
 #. 887
 msgid "Yemen"
-msgstr "Yemen"
+msgstr "Yémen"
 
 #. 175
 msgid "Mayotte"
@@ -1331,17 +1395,14 @@ msgstr "Inconnu, ajoutez des étiquettes d'is_in à ces villes"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
-"Utilisation de navit;\n"
-"navit [options] [fichier de configuration]\n"
-"\t-c <fichier>: utiliser <fichier> comme fichier de configuration\n"
-"\t-h: afficher les informations d'utilisation et quitter\n"
-"\t-v: afficher la version et quitter\n"
 
 #. We have not found an existing config file from all possibilities
 msgid "No config file navit.xml, navit.xml.local found\n"
@@ -1480,7 +1541,7 @@ msgid "Opens address search dialog"
 msgstr "Ouvrir la fenêtre de recherche d'adresse"
 
 msgid "_POI search"
-msgstr ""
+msgstr "recherche de points d'intérêt"
 
 msgid "Opens POI search dialog"
 msgstr ""
@@ -1528,46 +1589,46 @@ msgid "Data"
 msgstr "Données"
 
 msgid "Pharmacy"
-msgstr ""
+msgstr "Pharmacie"
 
 msgid "Restaurant"
-msgstr ""
+msgstr "Restaurant"
 
 msgid "Restaurant. Fast food"
-msgstr ""
+msgstr "Restauration rapide"
 
 msgid "Hotel"
-msgstr ""
+msgstr "Hôtel"
 
 msgid "Car parking"
-msgstr ""
+msgstr "Parking"
 
 msgid "Fuel station"
-msgstr ""
+msgstr "Station-service"
 
 msgid "Bank"
-msgstr ""
+msgstr "Banque"
 
 msgid "Hospital"
-msgstr ""
+msgstr "Hôpital"
 
 msgid "Cinema"
-msgstr ""
+msgstr "Cinéma"
 
 msgid "Train station"
-msgstr ""
+msgstr "Gare"
 
 msgid "School"
-msgstr ""
+msgstr "École"
 
 msgid "Police"
-msgstr ""
+msgstr "Poste de police"
 
 msgid "Justice"
 msgstr ""
 
 msgid "Taxi"
-msgstr ""
+msgstr "Taxi"
 
 msgid "Shopping"
 msgstr ""
@@ -1577,11 +1638,11 @@ msgstr ""
 
 #, c-format
 msgid "POI %s. %s"
-msgstr ""
+msgstr "point d'intérêt %s. %s"
 
 #, c-format
 msgid "Set destination to %ld, %ld \n"
-msgstr ""
+msgstr "Définir la destination vers %ld, %ld \n"
 
 #, c-format
 msgid "Set map to %ld, %ld \n"
@@ -1592,7 +1653,7 @@ msgid "Set next visit to %ld, %ld \n"
 msgstr ""
 
 msgid "POI search"
-msgstr ""
+msgstr "recherche de point d'intérêt"
 
 msgid "Select a category"
 msgstr ""
@@ -1601,22 +1662,22 @@ msgid "Select a distance to look for (km)"
 msgstr ""
 
 msgid "Select a POI"
-msgstr ""
+msgstr "Sélectionnez un point d'intérêt"
 
 msgid " "
-msgstr ""
+msgstr " "
 
 msgid "Category"
-msgstr ""
+msgstr "Catégorie"
 
 msgid "Direction"
-msgstr ""
+msgstr "Direction"
 
 msgid "Distance(m)"
-msgstr ""
+msgstr "Distance (m)"
 
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 msgid "Visit Before"
 msgstr ""
@@ -1706,6 +1767,9 @@ msgstr "Supprimer les résultats de la carte"
 msgid "Show results on the map"
 msgstr "Montrer les résultats sur la carte"
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Couper le signet"
 
diff --git a/po/fr_CH.po.in b/po/fr_CH.po.in
index db53bf36..34445cc3 100644
--- a/po/fr_CH.po.in
+++ b/po/fr_CH.po.in
@@ -133,8 +133,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "dans un kilomètre"
 msgstr[1] "dans %d kilomètres"
 
-msgid "exit"
-msgstr "sortie"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "vers la sortie"
@@ -164,37 +166,18 @@ msgstr "%ssur l'%s%s%s|neutral form"
 msgid "%sinto the %s"
 msgstr "%svers la %s"
 
-# tournez à droite
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "à droite"
-
-# tournez à gauche
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "à gauche"
-
-# utilisé pour les changements de voie pour les sorties?
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "légèrement "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "fortement "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "très fortement "
-
-# attention à l'espace à la fin
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "inconnu "
-
 msgid "When possible, please turn around"
 msgstr "Dès que possible, faites demi-tour"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Suivez la route sur %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Préparez vous à vous engager dans le rond-point"
 
@@ -203,57 +186,136 @@ msgstr "Préparez vous à vous engager dans le rond-point"
 msgid "Enter the roundabout %s"
 msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "puis sortez du rond-point à la %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Sortez du rond-point à la %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Suivez la route sur %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "bientôt"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "maintenant"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Prenez la %1$s route vers la %2$s"
 
+# tournez à droite
+msgid "right"
+msgstr "à droite"
+
 #, c-format
 msgid "after %i roads"
 msgstr "après %i rues"
 
-msgid "now"
-msgstr "maintenant"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "puis prenez la %1$s route à %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "erreur"
+# utilisé pour les changements de voie pour les sorties?
+msgid "easily "
+msgstr "légèrement "
 
-# espace important après le 2
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "fortement "
+
+# tournez à gauche
+msgid "left"
+msgstr "à gauche"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "%3$s, tournez %1$s%2$s %4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "puis tournez %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
+msgstr "ensuite vous serez à destination"
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Vous êtes arrivé à destination : %s"
 
-msgid "then you have reached your destination."
-msgstr "ensuite vous serez à destination"
+msgid "exit"
+msgstr "sortie"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1313,11 +1375,13 @@ msgstr "Inconnu, ajoutez des étiquettes d'is_in à ces villes"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1681,6 +1745,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/fy.po.in b/po/fy.po.in
index 6eca96b6..5c71e487 100644
--- a/po/fy.po.in
+++ b/po/fy.po.in
@@ -132,7 +132,9 @@ msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "exit"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
 msgstr ""
 
 msgid "into the ramp"
@@ -163,90 +165,152 @@ msgstr ""
 msgid "%sinto the %s"
 msgstr ""
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
+msgid "When possible, please turn around"
 msgstr ""
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
 
-msgid "When possible, please turn around"
+#. 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 ""
 
-msgid "Enter the roundabout soon"
+msgid "soon"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "now"
+msgstr ""
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "%1$s merge right %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "%1$s left exit %2$s %3$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
+msgid "%1$s right exit %2$s %3$s"
 msgstr ""
 
-msgid "soon"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
 msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
+msgid "right"
+msgstr ""
+
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-msgid "now"
+#. 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 ""
 
-#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "easily "
 msgstr ""
 
-msgid "error"
+msgid "strongly "
+msgstr ""
+
+msgid "left"
 msgstr ""
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
 msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
 msgstr ""
 
+msgid "then you have reached your destination."
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr ""
 
-msgid "then you have reached your destination."
+msgid "exit"
+msgstr ""
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
 msgstr ""
 
 #. Android resource: @strings/position_popup_title
@@ -1307,11 +1371,13 @@ msgstr ""
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1675,6 +1741,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/gl.po.in b/po/gl.po.in
index d5c4fbef..5d497cc0 100644
--- a/po/gl.po.in
+++ b/po/gl.po.in
@@ -136,8 +136,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "nun quilómetro"
 msgstr[1] "en %d quilómetros"
 
-msgid "exit"
-msgstr "saída"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "na rampa"
@@ -167,33 +169,18 @@ msgstr "%s no %s%s%s"
 msgid "%sinto the %s"
 msgstr "%s na %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "á dereita"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "á esquerda"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "suavemente "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "bruscamente "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "moi bruscamente "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "descoñecido "
-
 msgid "When possible, please turn around"
 msgstr "Cando sexa posible, dea a volta"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Siga a estrada durante os próximos %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Métase pronto na rotonda"
 
@@ -202,56 +189,133 @@ 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 %s"
-msgstr "logo saia da rotonda pola %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Saia da rotonda pola %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Siga a estrada durante os próximos %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "cedo"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "agora"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Tome a estrada %1$s cara o %2$s"
 
+msgid "right"
+msgstr "á dereita"
+
 #, c-format
 msgid "after %i roads"
 msgstr "despois de %i estradas"
 
-msgid "now"
-msgstr "agora"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "logo tome a estrada %1$s cara %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "erro"
+msgid "easily "
+msgstr "suavemente "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "bruscamente "
+
+msgid "left"
+msgstr "á esquerda"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Xire %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "despois vire %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "despois xa chega ao seu destino"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Chegou ao seu destino %s"
 
-msgid "then you have reached your destination."
-msgstr "despois xa chega ao seu destino"
+msgid "exit"
+msgstr "saída"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1311,11 +1375,13 @@ msgstr ""
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1679,6 +1745,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/he.po.in b/po/he.po.in
index 144b531f..78f52527 100644
--- a/po/he.po.in
+++ b/po/he.po.in
@@ -138,8 +138,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "בעוד קילומטר אחד"
 msgstr[1] "בעוד %d קילומטרים"
 
-msgid "exit"
-msgstr "יציאה"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "אל הרמפה"
@@ -169,33 +171,18 @@ msgstr "%s אל רחוב %s %s %s"
 msgid "%sinto the %s"
 msgstr "%sאל תוך ה%s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "ימינה"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "שמאלה"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "מעט "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "בצורה חדה "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "באופן חזק מאד "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "לא ידוע "
-
 msgid "When possible, please turn around"
 msgstr "כשיתאפשר לך, פנה חזרה"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "המשך בדרך זו למשך %s"
+
 msgid "Enter the roundabout soon"
 msgstr "הכנס לכיכר הקרובה"
 
@@ -204,56 +191,133 @@ 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 %s"
-msgstr "אחר כך צא מהכיכר ב%s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "צא מהכיכר ב%s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "המשך בדרך זו למשך %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "בקרוב"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "כעת"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "קח את הכביש ה%1$s אל %2$s"
 
+msgid "right"
+msgstr "ימינה"
+
 #, c-format
 msgid "after %i roads"
 msgstr "לאחר %i כבישים"
 
-msgid "now"
-msgstr "כעת"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "ואז קח את הכביש ה%1$s אל ה%2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "שגיאה"
+msgid "easily "
+msgstr "מעט "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "בצורה חדה "
+
+msgid "left"
+msgstr "שמאלה"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "פנה %1$s %2$s %4$s %3$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "ואז פנה %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "ואז הגעת ליעד."
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "הגעת ליעדך %s"
 
-msgid "then you have reached your destination."
-msgstr "ואז הגעת ליעד."
+msgid "exit"
+msgstr "יציאה"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1313,11 +1377,13 @@ msgstr "*לא ידוע,הוסף תגי is_in לערים אלו"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1681,6 +1747,9 @@ msgstr "הסרת תוצאות החיפוש מהמפה"
 msgid "Show results on the map"
 msgstr "הצגת תוצאות במפה"
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "גזור סימניה"
 
diff --git a/po/hi.po.in b/po/hi.po.in
index e58773e8..b2a20d51 100644
--- a/po/hi.po.in
+++ b/po/hi.po.in
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-11-07 19:13+0000\n"
-"Last-Translator: desh deep <Unknown>\n"
+"PO-Revision-Date: 2014-11-15 22:03+0000\n"
+"Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -133,8 +133,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "ek kilometer mein"
 msgstr[1] "%d kilometero mein"
 
-msgid "exit"
-msgstr "nikas"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "dhalan mein"
@@ -164,90 +166,152 @@ msgstr ""
 msgid "%sinto the %s"
 msgstr ""
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "दायाँ"
+msgid "When possible, please turn around"
+msgstr "जब संभव हो, कृपया चारों ओर मोड़"
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "बांया"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "आसानी से "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "अगले%s के लिए सड़क का पालन करें"
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "दृढ़ता से "
+msgid "Enter the roundabout soon"
+msgstr ""
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-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 ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-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 ""
 
-msgid "When possible, please turn around"
-msgstr "जब संभव हो, कृपया चारों ओर मोड़"
+msgid "soon"
+msgstr "जल्दी"
 
-msgid "Enter the roundabout soon"
+msgid "now"
+msgstr "अब"
+
+msgid "then"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "तो% s के राउंडअबाउट छोड़"
+msgid "%1$s merge right %2$s"
+msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "%s के राउंडअबाउट छोड़ें"
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "अगले%s के लिए सड़क का पालन करें"
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
 
-msgid "soon"
-msgstr "जल्दी"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "%1$s %2$s के लिए सड़क ले लो"
 
+msgid "right"
+msgstr "दायाँ"
+
 #, c-format
 msgid "after %i roads"
 msgstr "%i के बाद सड़कों"
 
-msgid "now"
-msgstr "अब"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "तब %1$s %2$s के लिए सड़क ले"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
+
+msgid "easily "
+msgstr "आसानी से "
 
-msgid "error"
-msgstr "त्रुटि"
+msgid "strongly "
+msgstr "दृढ़ता से "
+
+msgid "left"
+msgstr "बांया"
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
 msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
 msgstr ""
 
+msgid "then you have reached your destination."
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr ""
 
-msgid "then you have reached your destination."
+msgid "exit"
+msgstr "nikas"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
 msgstr ""
 
 #. Android resource: @strings/position_popup_title
@@ -1308,11 +1372,13 @@ msgstr ""
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1676,6 +1742,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/hr.po.in b/po/hr.po.in
index 94cad4db..cc8fe348 100644
--- a/po/hr.po.in
+++ b/po/hr.po.in
@@ -4,14 +4,15 @@
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
 # Marjan Vrban https://launchpad.net/~mvrban
+# gogo https://launchpad.net/~trebelnik-stefina
 # klajo https://launchpad.net/~klaudio
 
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-09-28 01:42+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-03-06 22:33+0000\n"
+"Last-Translator: gogo <trebelnik2@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -138,8 +139,10 @@ msgstr[0] "za %d kilometar"
 msgstr[1] "za %d kilometara"
 msgstr[2] "za %d kilometara"
 
-msgid "exit"
-msgstr "izlaz"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "na rampu"
@@ -169,91 +172,153 @@ msgstr "%su %s%s%s|neutral form"
 msgid "%sinto the %s"
 msgstr "%su %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "desno"
+msgid "When possible, please turn around"
+msgstr "Ako je moguće okrenite se"
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "lijevo"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "jednostavno "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Pratite cestu za idući %s"
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "teško "
+msgid "Enter the roundabout soon"
+msgstr ""
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "vrlo teško "
+#. 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 ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "nepoznatno "
+#. 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 ""
 
-msgid "When possible, please turn around"
-msgstr "Ako je moguće okrenite se"
+msgid "soon"
+msgstr "uskoro"
 
-msgid "Enter the roundabout soon"
+msgid "now"
+msgstr "sada"
+
+msgid "then"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "onda napustite kružni tok na %s"
+msgid "%1$s merge right %2$s"
+msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Napustite kružni tok na %s"
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Pratite cestu za idući %s"
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
 
-msgid "soon"
-msgstr "uskoro"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Vozite cestom %1$s do %2$s"
 
+msgid "right"
+msgstr "desno"
+
 #, c-format
 msgid "after %i roads"
 msgstr "nakon %i ceste"
 
-msgid "now"
-msgstr "sada"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "onda krenite na cestu %1$s do %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "greška"
+msgid "easily "
+msgstr "jednostavno "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "teško "
+
+msgid "left"
+msgstr "lijevo"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Krenite %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "onda krenite %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
+msgstr "nakon toga ste stigli do cilja"
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Stigli ste na cilj %s"
 
-msgid "then you have reached your destination."
-msgstr "nakon toga ste stigli do cilja"
+msgid "exit"
+msgstr "izlaz"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1313,11 +1378,13 @@ msgstr "* Nepoznato, dodajte is_in oznake za te gradove"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1497,7 +1564,7 @@ msgid "Enable/disable automatic zoom level changing"
 msgstr "Omogući/onemogući automatski zoom"
 
 msgid "_Fullscreen"
-msgstr "Cijeli ekran"
+msgstr "_Cijeli zaslon"
 
 msgid "Data"
 msgstr "Podaci"
@@ -1681,6 +1748,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Izreži zabilješku"
 
diff --git a/po/hu.po.in b/po/hu.po.in
index 2992f6ba..1df07c25 100644
--- a/po/hu.po.in
+++ b/po/hu.po.in
@@ -139,8 +139,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "egy kilométer után"
 msgstr[1] "%d kilométer után"
 
-msgid "exit"
-msgstr "kijárat"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "a felhajtóra"
@@ -170,33 +172,18 @@ msgstr "%sa(z) %s%s%s útra"
 msgid "%sinto the %s"
 msgstr "%shajtson rá a(z) %s útra"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "jobbra"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "balra"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "enyhén "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "élesen "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "nagyon élesen "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "ismeretlen "
-
 msgid "When possible, please turn around"
 msgstr "Amint lehet, fordujon meg"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Haladjon az úton a következő %sig"
+
 msgid "Enter the roundabout soon"
 msgstr "Hajtson be a körforgalomba hamarosan."
 
@@ -205,56 +192,133 @@ msgstr "Hajtson be a körforgalomba hamarosan."
 msgid "Enter the roundabout %s"
 msgstr "Hajtson be a körforgalomba %s"
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "majd hagyja el a körforgalmat a(z) %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Hagyja el a körforgalmat a(z) %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Haladjon az úton a következő %sig"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "hamarosan"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "most"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "A(z) %1$s útnál forduljon %2$s"
 
+msgid "right"
+msgstr "jobbra"
+
 #, c-format
 msgid "after %i roads"
 msgstr "%i út után"
 
-msgid "now"
-msgstr "most"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "aztán a(z) %1$s útnál forduljon %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "hiba"
+msgid "easily "
+msgstr "enyhén "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "élesen "
+
+msgid "left"
+msgstr "balra"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Forduljon %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "aztán forduljon %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "majd eléri az úticélját."
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Elérte az úticélját: %s"
 
-msgid "then you have reached your destination."
-msgstr "majd eléri az úticélját."
+msgid "exit"
+msgstr "kijárat"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1314,19 +1378,14 @@ msgstr "*Ismeretlen, is_in címkék hozzáadása ezekhez a városokhoz"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
-"navit használata:\n"
-"navit [opciók] [konfigurációs állomány]\n"
-"\t-c <file>: használja a <file>-t mint konfigurációs állomány\n"
-"\t-d <n>: a globális hibakeresési kimeneti szintet <n>-re állítja (0-3). "
-"Felülbírálja a konfigurációs állomány beállításait.\n"
-"\t-h: kinyomtatja ezt a használati útmutatót és kilép.\n"
-"\t-v: kinyomtatja a verzióinformációt és kilép.\n"
 
 #. We have not found an existing config file from all possibilities
 msgid "No config file navit.xml, navit.xml.local found\n"
@@ -1691,6 +1750,9 @@ msgstr "Keresési találatok eltávolítása a térképről"
 msgid "Show results on the map"
 msgstr "Keresési találatok mutatása a térképen"
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Könyvjelző kivágása"
 
diff --git a/po/id.po.in b/po/id.po.in
index 5f7fac6f..eeb7d736 100644
--- a/po/id.po.in
+++ b/po/id.po.in
@@ -135,8 +135,10 @@ msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "dalam %d kilometer"
 
-msgid "exit"
-msgstr "keluar"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "menuju jalur yang melandai"
@@ -166,33 +168,18 @@ msgstr "%smenuju ke %s%s%s"
 msgid "%sinto the %s"
 msgstr "%smenuju ke %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "kanan"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "Kiri"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "dengan mudah "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "Sangat "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "amat sangat "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "tidak diketahui "
-
 msgid "When possible, please turn around"
 msgstr "bila memungkinkan, balik arah"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "ikuti jalan untuk ke tujuan berikutnya %s"
+
 msgid "Enter the roundabout soon"
 msgstr "segera memasuki bundaran"
 
@@ -201,56 +188,133 @@ 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 %s"
-msgstr "kemudian tinggalkan bundaran pada %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Tinggalkan bundaran pada %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "ikuti jalan untuk ke tujuan berikutnya %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "segera"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "saat ini"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Ambil %1$s jalan ke %2$s"
 
+msgid "right"
+msgstr "kanan"
+
 #, c-format
 msgid "after %i roads"
 msgstr "setelah %i jalan"
 
-msgid "now"
-msgstr "saat ini"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "kemudian ambil %1$s jalan menuju %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "kesalahan"
+msgid "easily "
+msgstr "dengan mudah "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "Sangat "
+
+msgid "left"
+msgstr "Kiri"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Beloklah %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "kemudian beloklah %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "kini anda telah sampai pada tujuan"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "anda telah sampai pada tujuan %s"
 
-msgid "then you have reached your destination."
-msgstr "kini anda telah sampai pada tujuan"
+msgid "exit"
+msgstr "keluar"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1310,11 +1374,13 @@ msgstr ""
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1678,6 +1744,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Hapus penanda"
 
diff --git a/po/it.po.in b/po/it.po.in
index 5ce79487..5bc10838 100644
--- a/po/it.po.in
+++ b/po/it.po.in
@@ -4,7 +4,6 @@
 # Many thanks to the contributors of this translation:
 # AndreaCr https://launchpad.net/~andij-cr
 # Davide Gobbi https://launchpad.net/~hobbie
-# Francesco de Virgilio https://launchpad.net/~fradeve
 # Marco Ciampa https://launchpad.net/~ciampix
 # Marco Lazzaroni https://launchpad.net/~marcolazzaroni
 # Matteo Zaffo &#x27;80 https://launchpad.net/~zaffo80
@@ -24,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-11-04 01:52+0000\n"
+"PO-Revision-Date: 2014-11-15 00:53+0000\n"
 "Last-Translator: giardia <Unknown>\n"
 "Language-Team: Italiano\n"
 "MIME-Version: 1.0\n"
@@ -149,8 +148,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "tra un chilometro"
 msgstr[1] "tra %d chilometri"
 
-msgid "exit"
-msgstr "uscire"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "nella rampa"
@@ -180,33 +181,18 @@ msgstr "%sin %s%s%s"
 msgid "%sinto the %s"
 msgstr "%sin %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "destra"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "sinistra"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "leggermente "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "decisamente "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "molto decisamente "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "facendo quasi inversione "
-
 msgid "When possible, please turn around"
 msgstr "Appena possibile, invertire il senso di marcia"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Seguire la strada per i prossimi %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Tra poco si entrerà in rotonda"
 
@@ -215,56 +201,133 @@ msgstr "Tra poco si entrerà in rotonda"
 msgid "Enter the roundabout %s"
 msgstr "Imboccare 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 %s"
-msgstr "e alla rotonda prendere la %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Alla rotonda prendere la %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Seguire la strada per i prossimi %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "tra poco"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "adesso"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Prendere la %1$s strada a %2$s"
 
+msgid "right"
+msgstr "destra"
+
 #, c-format
 msgid "after %i roads"
 msgstr "tra %i strade"
 
-msgid "now"
-msgstr "adesso"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "poi prendere la %1$s strada a %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
+
+msgid "easily "
+msgstr "leggermente "
 
-msgid "error"
-msgstr "errore"
+msgid "strongly "
+msgstr "decisamente "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "left"
+msgstr "sinistra"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Svoltare %1$s %2$s %3$s %4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "poi girare %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "poi sarete arrivati a destinazione"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Siete arrivati a destinazione %s"
 
-msgid "then you have reached your destination."
-msgstr "poi sarete arrivati a destinazione"
+msgid "exit"
+msgstr "uscire"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1324,19 +1387,14 @@ msgstr "* Sconosciuto, aggiungi tag is_in a quelle città"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
-"utilizzo di navit:\n"
-"navit [opzioni] [file di configurazione]\n"
-"\t-c <file>: usa <file> come file di configurazione\n"
-"\t-d <n>: imposta il livello dell'output di debug globale a <n> (0-3). "
-"Sovrascrive i settaggi del file di configurazione.\n"
-"\t-h: stampa questa guida di utilizzo ed esce.\n"
-"\t-v: Stampa la versione ed esce.\n"
 
 #. We have not found an existing config file from all possibilities
 msgid "No config file navit.xml, navit.xml.local found\n"
@@ -1353,7 +1411,7 @@ msgstr "Usando il file di configurazione '%s'\n"
 
 #, c-format
 msgid "Error: No configuration found in config file '%s'\n"
-msgstr ""
+msgstr "Errore: Nessuna configurazione trovata nel file config '%s'\n"
 
 msgid ""
 "Internal initialization failed, exiting. Check previous error messages.\n"
@@ -1476,10 +1534,10 @@ msgid "Opens address search dialog"
 msgstr "Apri la finestra di ricerca indirizzo"
 
 msgid "_POI search"
-msgstr ""
+msgstr "_ricerca POI"
 
 msgid "Opens POI search dialog"
-msgstr ""
+msgstr "Apre finestra di ricerca POI"
 
 msgid "_Stop Navigation"
 msgstr "Interrompi la navigazione"
@@ -1525,98 +1583,98 @@ msgid "Data"
 msgstr "Dati"
 
 msgid "Pharmacy"
-msgstr ""
+msgstr "Farmacia"
 
 msgid "Restaurant"
-msgstr ""
+msgstr "Ristorante"
 
 msgid "Restaurant. Fast food"
-msgstr ""
+msgstr "Ristorante. Fast food"
 
 msgid "Hotel"
-msgstr ""
+msgstr "Albergo"
 
 msgid "Car parking"
-msgstr ""
+msgstr "Parcheggio per auto"
 
 msgid "Fuel station"
-msgstr ""
+msgstr "Benzinaio"
 
 msgid "Bank"
-msgstr ""
+msgstr "Banca"
 
 msgid "Hospital"
-msgstr ""
+msgstr "Ospedale"
 
 msgid "Cinema"
-msgstr ""
+msgstr "Cinema"
 
 msgid "Train station"
-msgstr ""
+msgstr "Stazione del treno"
 
 msgid "School"
-msgstr ""
+msgstr "Scuola"
 
 msgid "Police"
-msgstr ""
+msgstr "Polizia"
 
 msgid "Justice"
-msgstr ""
+msgstr "Tribunale"
 
 msgid "Taxi"
-msgstr ""
+msgstr "Taxi"
 
 msgid "Shopping"
-msgstr ""
+msgstr "Negozi"
 
 msgid "Distance from screen center (km)"
-msgstr ""
+msgstr "Distanza dal centro dello schermo (km)"
 
 #, c-format
 msgid "POI %s. %s"
-msgstr ""
+msgstr "POI %s. %s"
 
 #, c-format
 msgid "Set destination to %ld, %ld \n"
-msgstr ""
+msgstr "Imposta la destinazione a %ld, %ld \n"
 
 #, c-format
 msgid "Set map to %ld, %ld \n"
-msgstr ""
+msgstr "Imposta la mappa a %ld, %ld \n"
 
 #, c-format
 msgid "Set next visit to %ld, %ld \n"
-msgstr ""
+msgstr "Imposta la prossima tappa a %ld, %ld \n"
 
 msgid "POI search"
-msgstr ""
+msgstr "ricerca POI"
 
 msgid "Select a category"
-msgstr ""
+msgstr "Seleziona una categoria"
 
 msgid "Select a distance to look for (km)"
-msgstr ""
+msgstr "Seleziona la distanza in cui cercare (km)"
 
 msgid "Select a POI"
-msgstr ""
+msgstr "Seleziona un POI"
 
 msgid " "
-msgstr ""
+msgstr " "
 
 msgid "Category"
-msgstr ""
+msgstr "Categoria"
 
 msgid "Direction"
-msgstr ""
+msgstr "Direzione"
 
 msgid "Distance(m)"
-msgstr ""
+msgstr "Distanza(m)"
 
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 msgid "Visit Before"
-msgstr ""
+msgstr "Visita prima"
 
 msgid "N"
 msgstr "N"
@@ -1703,6 +1761,9 @@ msgstr "Elimina i risultati della ricerca dalla mappa"
 msgid "Show results on the map"
 msgstr "Mostra risultati sulla mappa"
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Taglia posto"
 
@@ -1835,7 +1896,7 @@ msgstr "Inserire Coordinate"
 #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
 #. gui_internal_widget_append(w, we)
 msgid "Latitude Longitude"
-msgstr ""
+msgstr "Latitudine Longitudine"
 
 msgid "Enter coordinates, for example:"
 msgstr "Inserire coordinate, ad esempio:"
@@ -1933,7 +1994,7 @@ msgid "Downloaded maps"
 msgstr "Mappe scaricate"
 
 msgid "Cancel"
-msgstr ""
+msgstr "Cancella"
 
 msgid "Whole Planet"
 msgstr "Intero Pianeta"
@@ -1954,7 +2015,7 @@ msgid "Taiwan"
 msgstr "Taiwan"
 
 msgid "UAE+Other"
-msgstr ""
+msgstr "Emirati Arabi Uniti+altro"
 
 msgid "Oceania"
 msgstr "Oceania"
@@ -1999,7 +2060,7 @@ msgid "Bretagne"
 msgstr "Bretagna"
 
 msgid "Centre"
-msgstr ""
+msgstr "Centro"
 
 msgid "Champagne-Ardenne"
 msgstr "Champagne-Ardenne"
@@ -2293,7 +2354,7 @@ msgid "Washington State"
 msgstr "Washington (stato)"
 
 msgid "South+Middle America"
-msgstr ""
+msgstr "America Centrale"
 
 msgid "Guyane Francaise"
 msgstr "Guyana francese"
@@ -2479,7 +2540,7 @@ msgstr "Scarica mappe"
 
 #. Android resource: @strings/optionsmenu_toggle_poi
 msgid "Toggle POIs"
-msgstr ""
+msgstr "Attiva/Disattiva Punti Di Interesse"
 
 #. Android resource: @strings/optionsmenu_exit_navit
 msgid "Exit Navit"
diff --git a/po/ja.po.in b/po/ja.po.in
index 3fffee85..e6518dde 100644
--- a/po/ja.po.in
+++ b/po/ja.po.in
@@ -134,7 +134,9 @@ msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "exit"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
 msgstr ""
 
 msgid "into the ramp"
@@ -165,90 +167,152 @@ msgstr ""
 msgid "%sinto the %s"
 msgstr ""
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "右"
+msgid "When possible, please turn around"
+msgstr ""
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "左"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
 
-msgid "When possible, please turn around"
+#. 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 ""
 
-msgid "Enter the roundabout soon"
+msgid "soon"
+msgstr "まもなく"
+
+msgid "now"
+msgstr "今"
+
+msgid "then"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "%1$s merge right %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "%1$s left exit %2$s %3$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
+msgid "%1$s right exit %2$s %3$s"
 msgstr ""
 
-msgid "soon"
-msgstr "まもなく"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
+msgid "right"
+msgstr "右"
+
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-msgid "now"
-msgstr "今"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
 msgstr ""
 
-msgid "error"
+msgid "easily "
 msgstr ""
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr ""
+
+msgid "left"
+msgstr "左"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
 msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
 msgstr ""
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "目的地の%sにつきました"
 
-msgid "then you have reached your destination."
+msgid "exit"
+msgstr ""
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
 msgstr ""
 
 #. Android resource: @strings/position_popup_title
@@ -1309,11 +1373,13 @@ msgstr ""
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1677,6 +1743,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/jv.po.in b/po/jv.po.in
index 56fe105d..bc33767b 100644
--- a/po/jv.po.in
+++ b/po/jv.po.in
@@ -18,12 +18,12 @@ msgstr ""
 "Language: jv\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
-msgid "exit"
-msgstr "metu"
-
 msgid "now"
 msgstr "saiki"
 
+msgid "exit"
+msgstr "metu"
+
 msgid "Running from source directory\n"
 msgstr ""
 
@@ -139,6 +139,11 @@ msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] "ing %d kilometer"
 
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
+
 msgid "into the ramp"
 msgstr ""
 
@@ -167,89 +172,148 @@ msgstr "%s ing dalan %s%s%s"
 msgid "%sinto the %s"
 msgstr "%s ing dalan %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "nengen"
+msgid "When possible, please turn around"
+msgstr "Yen biso, mutero"
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "ngiwa"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "kanthi gampang "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "tetep ing dalan iki nganti %s"
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "ora dikenal "
+#. 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 ""
 
-msgid "When possible, please turn around"
-msgstr "Yen biso, mutero"
+#. 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 ""
 
-msgid "Enter the roundabout soon"
+msgid "soon"
+msgstr "sedhelo maneh"
+
+msgid "then"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "terus metu soko puteran ing cawang kaping %s"
+msgid "%1$s merge right %2$s"
+msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "metu soko puteran ing cawang kaping %s"
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "tetep ing dalan iki nganti %s"
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
 
-msgid "soon"
-msgstr "sedhelo maneh"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Jupuk dalan kaping %1$s ing %2$s"
 
+msgid "right"
+msgstr "nengen"
+
 #, c-format
 msgid "after %i roads"
 msgstr "sakwise %i dalan"
 
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "Jupuk dalan kaping %1$s neng %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "salah"
+msgid "easily "
+msgstr "kanthi gampang "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "menggok %1$s%2$s %3$s%4$s"
+msgid "strongly "
+msgstr ""
+
+msgid "left"
+msgstr "ngiwa"
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "terus menggok %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "You have reached your destination %s"
+msgid "%1$s right turnaround"
 msgstr ""
 
 msgid "then you have reached your destination."
 msgstr "terus panjenengan tekan tujuan"
 
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr ""
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
+
 #. Android resource: @strings/position_popup_title
 msgid "Position"
 msgstr "dunung"
@@ -1308,11 +1372,13 @@ msgstr ""
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1676,6 +1742,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/kk.po.in b/po/kk.po.in
index 3d376320..7ad538c0 100644
--- a/po/kk.po.in
+++ b/po/kk.po.in
@@ -132,7 +132,9 @@ msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "exit"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
 msgstr ""
 
 msgid "into the ramp"
@@ -163,90 +165,152 @@ msgstr ""
 msgid "%sinto the %s"
 msgstr ""
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
+msgid "When possible, please turn around"
 msgstr ""
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
 
-msgid "When possible, please turn around"
+#. 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 ""
 
-msgid "Enter the roundabout soon"
+msgid "soon"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "now"
+msgstr ""
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "%1$s merge right %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "%1$s left exit %2$s %3$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
+msgid "%1$s right exit %2$s %3$s"
 msgstr ""
 
-msgid "soon"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
 msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
+msgid "right"
+msgstr ""
+
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-msgid "now"
+#. 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 ""
 
-#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "easily "
 msgstr ""
 
-msgid "error"
+msgid "strongly "
+msgstr ""
+
+msgid "left"
 msgstr ""
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
 msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
 msgstr ""
 
+msgid "then you have reached your destination."
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr ""
 
-msgid "then you have reached your destination."
+msgid "exit"
+msgstr ""
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
 msgstr ""
 
 #. Android resource: @strings/position_popup_title
@@ -1307,11 +1371,13 @@ msgstr ""
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1675,6 +1741,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/kn.po.in b/po/kn.po.in
index ffa7ec32..9fe6e48d 100644
--- a/po/kn.po.in
+++ b/po/kn.po.in
@@ -132,7 +132,9 @@ msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "exit"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
 msgstr ""
 
 msgid "into the ramp"
@@ -163,90 +165,152 @@ msgstr ""
 msgid "%sinto the %s"
 msgstr ""
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
+msgid "When possible, please turn around"
 msgstr ""
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
 
-msgid "When possible, please turn around"
+#. 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 ""
 
-msgid "Enter the roundabout soon"
+msgid "soon"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "now"
+msgstr ""
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "%1$s merge right %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "%1$s left exit %2$s %3$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
+msgid "%1$s right exit %2$s %3$s"
 msgstr ""
 
-msgid "soon"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
 msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
+msgid "right"
+msgstr ""
+
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-msgid "now"
+#. 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 ""
 
-#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "easily "
 msgstr ""
 
-msgid "error"
+msgid "strongly "
+msgstr ""
+
+msgid "left"
 msgstr ""
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
 msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
 msgstr ""
 
+msgid "then you have reached your destination."
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr ""
 
-msgid "then you have reached your destination."
+msgid "exit"
+msgstr ""
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
 msgstr ""
 
 #. Android resource: @strings/position_popup_title
@@ -1307,11 +1371,13 @@ msgstr ""
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1675,6 +1741,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/ku.po.in b/po/ku.po.in
index 09f0a99f..873c7296 100644
--- a/po/ku.po.in
+++ b/po/ku.po.in
@@ -132,7 +132,9 @@ msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "exit"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
 msgstr ""
 
 msgid "into the ramp"
@@ -163,90 +165,152 @@ msgstr ""
 msgid "%sinto the %s"
 msgstr ""
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "ڕاست"
+msgid "When possible, please turn around"
+msgstr ""
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "چەپ"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
 
-msgid "When possible, please turn around"
+#. 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 ""
 
-msgid "Enter the roundabout soon"
+msgid "soon"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "now"
+msgstr "ئێستا"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "%1$s merge right %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "%1$s left exit %2$s %3$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
+msgid "%1$s right exit %2$s %3$s"
 msgstr ""
 
-msgid "soon"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
 msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
+msgid "right"
+msgstr "ڕاست"
+
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-msgid "now"
-msgstr "ئێستا"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
 msgstr ""
 
-msgid "error"
-msgstr "هەڵە"
+msgid "easily "
+msgstr ""
+
+msgid "strongly "
+msgstr ""
+
+msgid "left"
+msgstr "چەپ"
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
 msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
 msgstr ""
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr ""
 
-msgid "then you have reached your destination."
+msgid "exit"
+msgstr ""
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
 msgstr ""
 
 #. Android resource: @strings/position_popup_title
@@ -1307,11 +1371,13 @@ msgstr ""
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1675,6 +1741,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/lb.po.in b/po/lb.po.in
index f38b1f78..d23fb8bc 100644
--- a/po/lb.po.in
+++ b/po/lb.po.in
@@ -132,8 +132,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "An engem Kilometer"
 msgstr[1] "An %d Kilometer"
 
-msgid "exit"
-msgstr "Verlossen"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "op d' Opfahrt"
@@ -163,92 +165,154 @@ msgstr ""
 msgid "%sinto the %s"
 msgstr "%sop d' %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "riets"
+msgid "When possible, please turn around"
+msgstr "Wann meiglech, wannechglift dreinen"
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "lenks"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "liicht "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "schaarf "
+msgid "Enter the roundabout soon"
+msgstr ""
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "ganz schaarf "
+#. 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 ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "onbekannt "
+#. 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 ""
 
-msgid "When possible, please turn around"
-msgstr "Wann meiglech, wannechglift dreinen"
+msgid "soon"
+msgstr ""
 
-msgid "Enter the roundabout soon"
+msgid "now"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "%1$s merge right %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "%1$s left exit %2$s %3$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
+msgid "%1$s right exit %2$s %3$s"
 msgstr ""
 
-msgid "soon"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
 msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
 #, c-format
-msgid "Take the %1$s road to the %2$s"
+msgid "%1$s continue straight%2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
 #, c-format
-msgid "after %i roads"
+msgid "%1$s keep right%2$s"
 msgstr ""
 
-msgid "now"
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
 msgstr ""
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "%1$s continue straight"
 msgstr ""
 
-msgid "error"
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
 msgstr ""
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s keep left"
 msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
+msgid "right"
+msgstr "riets"
+
 #, c-format
-msgid "You have reached your destination %s"
+msgid "after %i roads"
+msgstr ""
+
+#. 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 ""
+
+msgid "easily "
+msgstr "liicht "
+
+msgid "strongly "
+msgstr "schaarf "
+
+msgid "left"
+msgstr "lenks"
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s left turnaround"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s right turnaround"
 msgstr ""
 
 msgid "then you have reached your destination."
 msgstr ""
 
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr ""
+
+msgid "exit"
+msgstr "Verlossen"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
+
 #. Android resource: @strings/position_popup_title
 msgid "Position"
 msgstr ""
@@ -1307,11 +1371,13 @@ msgstr ""
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1675,6 +1741,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/lt.po.in b/po/lt.po.in
index 075ebf29..63ea45c1 100644
--- a/po/lt.po.in
+++ b/po/lt.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:
 # Aidas Kasparas https://launchpad.net/~a-kasparas
+# Mantas Kriaučiūnas https://launchpad.net/~mantas
 # Rytis Ūsalis https://launchpad.net/~rytis-usalis
 # laimonas https://launchpad.net/~laimonas-mockus
 
@@ -10,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-09-28 01:44+0000\n"
-"Last-Translator: laimonas <laimonas.mockus@gmail.com>\n"
+"PO-Revision-Date: 2015-03-10 10:51+0000\n"
+"Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +23,7 @@ msgstr ""
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
-msgstr "Paleidžiu pradiniame kataloge\n"
+msgstr "Paleidžiama pradiniame aplanke\n"
 
 #, c-format
 msgid "setting '%s' to '%s'\n"
@@ -106,7 +107,7 @@ msgstr ""
 
 #, c-format
 msgid "%d.%d kilometers"
-msgstr ""
+msgstr "%d.%d km."
 
 #, c-format
 msgid "in %d.%d kilometers"
@@ -115,8 +116,9 @@ msgstr "už %d.%d kilometrų"
 #, c-format
 msgid "one mile"
 msgid_plural "%d miles"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "viena mylia"
+msgstr[1] "%d mylios"
+msgstr[2] "%d mylių"
 
 #, c-format
 msgid "in one mile"
@@ -138,8 +140,10 @@ msgstr[0] "už %d kilometro"
 msgstr[1] "už %d kilometrų"
 msgstr[2] "už %d kilometrų"
 
-msgid "exit"
-msgstr "išvažiavimas"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "į rampą"
@@ -169,33 +173,18 @@ msgstr "%s į %s%s%s"
 msgid "%sinto the %s"
 msgstr "%s į %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "dešinėn"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "kairėn"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "lengvai "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "stipriai "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "labai stipriai "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "nežinomas "
-
 msgid "When possible, please turn around"
 msgstr "kai įmanoma, apsisukite"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Laikykitės kelio sekančius %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Netrukus įsukite į žiedą"
 
@@ -204,56 +193,133 @@ msgstr "Netrukus įsukite į žiedą"
 msgid "Enter the roundabout %s"
 msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "tada išsukite iš žiedo %s išvažiavime"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "išsukite iš žiedo %s išvažiavime"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Laikykitės kelio sekančius %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "netrukus"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "dabar"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Važiuokite %1$s keliu į %2$s"
 
+msgid "right"
+msgstr "dešinėn"
+
 #, c-format
 msgid "after %i roads"
 msgstr "už %i kelių"
 
-msgid "now"
-msgstr "dabar"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "tada važiuokite %1$s keliu į %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
+
+msgid "easily "
+msgstr "lengvai "
 
-msgid "error"
-msgstr "klaida"
+msgid "strongly "
+msgstr "stipriai "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "left"
+msgstr "kairėn"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Pasukite %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "tada pasukite %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
+msgstr "tada jūs pasiekėte kelionės tikslą."
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Jūs pasiekėte tikslą %s"
 
-msgid "then you have reached your destination."
-msgstr "tada jūs pasiekėte kelionės tikslą."
+msgid "exit"
+msgstr "išvažiavimas"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -853,7 +919,7 @@ msgstr "Latvija"
 
 #. 434
 msgid "Libya"
-msgstr ""
+msgstr "Libija"
 
 #. 504
 msgid "Morocco"
@@ -1141,7 +1207,7 @@ msgstr "Surinamas"
 
 #. 728
 msgid "South Sudan"
-msgstr ""
+msgstr "Pietų Sudanas"
 
 #. 678
 msgid "Sao Tome and Principe"
@@ -1313,11 +1379,13 @@ msgstr "* Nežinomas, pridėti is_in žodžius į šiuos miestus"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1330,7 +1398,7 @@ msgstr ""
 
 #, c-format
 msgid "Using config file '%s'\n"
-msgstr ""
+msgstr "Naudojamas konfigūracijos failas „%s”\n"
 
 #, c-format
 msgid "Error: No configuration found in config file '%s'\n"
@@ -1341,7 +1409,7 @@ msgid ""
 msgstr ""
 
 msgid "unknown street"
-msgstr ""
+msgstr "nežinoma gatvė"
 
 #. Safe cast: attr_generic_set_attr does not modify its parameter.
 msgid "Unnamed vehicle"
@@ -1449,7 +1517,7 @@ msgid "_Info"
 msgstr "Informacija"
 
 msgid "Set _destination"
-msgstr ""
+msgstr "Nustatyti _tikslą"
 
 msgid "Opens address search dialog"
 msgstr "Atidaro adreso paieškos dialogą"
@@ -1506,43 +1574,43 @@ msgid "Pharmacy"
 msgstr ""
 
 msgid "Restaurant"
-msgstr ""
+msgstr "Restoranas"
 
 msgid "Restaurant. Fast food"
-msgstr ""
+msgstr "Valgykla. Greitas maistas"
 
 msgid "Hotel"
-msgstr ""
+msgstr "Viešbutis"
 
 msgid "Car parking"
 msgstr ""
 
 msgid "Fuel station"
-msgstr ""
+msgstr "Degalinė"
 
 msgid "Bank"
-msgstr ""
+msgstr "Bankas"
 
 msgid "Hospital"
-msgstr ""
+msgstr "Ligoninė"
 
 msgid "Cinema"
-msgstr ""
+msgstr "Kino teatras"
 
 msgid "Train station"
-msgstr ""
+msgstr "Geležinkelio stotis"
 
 msgid "School"
-msgstr ""
+msgstr "Mokykla"
 
 msgid "Police"
-msgstr ""
+msgstr "Policija"
 
 msgid "Justice"
 msgstr ""
 
 msgid "Taxi"
-msgstr ""
+msgstr "Taksi"
 
 msgid "Shopping"
 msgstr ""
@@ -1556,7 +1624,7 @@ msgstr ""
 
 #, c-format
 msgid "Set destination to %ld, %ld \n"
-msgstr ""
+msgstr "Nustatyti tikslą į %ld, %ld \n"
 
 #, c-format
 msgid "Set map to %ld, %ld \n"
@@ -1570,7 +1638,7 @@ msgid "POI search"
 msgstr ""
 
 msgid "Select a category"
-msgstr ""
+msgstr "Pasirinkite kategoriją"
 
 msgid "Select a distance to look for (km)"
 msgstr ""
@@ -1579,16 +1647,16 @@ msgid "Select a POI"
 msgstr ""
 
 msgid " "
-msgstr ""
+msgstr " "
 
 msgid "Category"
-msgstr ""
+msgstr "Kategorija"
 
 msgid "Direction"
-msgstr ""
+msgstr "Kryptis"
 
 msgid "Distance(m)"
-msgstr ""
+msgstr "Atstumas (m)"
 
 msgid "Name"
 msgstr ""
@@ -1681,6 +1749,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Iškirpti žymą"
 
@@ -1712,11 +1783,11 @@ msgid "Replace with waypoints"
 msgstr ""
 
 msgid "Delete Folder"
-msgstr ""
+msgstr "Trinti aplanką"
 
 #. Adds the Bookmark folders
 msgid "Add Bookmark folder"
-msgstr "Pridėti žymų katalogą"
+msgstr "Pridėti žymų aplanką"
 
 #. Pastes the Bookmark
 msgid "Paste bookmark"
@@ -1728,7 +1799,7 @@ msgstr "Pasižymėti %s"
 
 #, c-format
 msgid "Download %s"
-msgstr ""
+msgstr "Atsisiųsti %s"
 
 msgid "Map Download"
 msgstr ""
@@ -2136,10 +2207,10 @@ msgid "Norfolk"
 msgstr ""
 
 msgid "Nottinghamshire"
-msgstr ""
+msgstr "Notingemšyras"
 
 msgid "Oxfordshire"
-msgstr ""
+msgstr "Oksfordšyras"
 
 msgid "Shropshire"
 msgstr ""
@@ -2160,7 +2231,7 @@ msgid "Wiltshire"
 msgstr ""
 
 msgid "Scotland"
-msgstr ""
+msgstr "Škotija"
 
 msgid "Wales"
 msgstr ""
@@ -2232,40 +2303,40 @@ msgid "Texas"
 msgstr ""
 
 msgid "Virginia"
-msgstr ""
+msgstr "Virdžinija"
 
 msgid "West Virginia"
-msgstr ""
+msgstr "Vakarų Virdžinija"
 
 msgid "West"
 msgstr ""
 
 msgid "Arizona"
-msgstr ""
+msgstr "Arizona"
 
 msgid "California"
-msgstr ""
+msgstr "Kalifornija"
 
 msgid "Colorado"
-msgstr ""
+msgstr "Koloradas"
 
 msgid "Idaho"
 msgstr ""
 
 msgid "Montana"
-msgstr ""
+msgstr "Montana"
 
 msgid "New Mexico"
-msgstr ""
+msgstr "Naujoji Meksika"
 
 msgid "Nevada"
-msgstr ""
+msgstr "Nevada"
 
 msgid "Oregon"
-msgstr ""
+msgstr "Oregonas"
 
 msgid "Utah"
-msgstr ""
+msgstr "Juta"
 
 msgid "Washington State"
 msgstr ""
@@ -2277,7 +2348,7 @@ msgid "Guyane Francaise"
 msgstr ""
 
 msgid "downloading"
-msgstr ""
+msgstr "siunčiama"
 
 #. Android resource: @strings/map_download_ready
 msgid "ready"
@@ -2288,7 +2359,7 @@ msgstr ""
 
 #. Android resource: @strings/map_download_not_enough_free_space
 msgid "Not enough free space"
-msgstr ""
+msgstr "Nepakanka laisvos vietos"
 
 msgid "Error writing map!"
 msgstr ""
@@ -2298,7 +2369,7 @@ msgstr ""
 
 #. Android resource: @strings/map_download_eta
 msgid "ETA"
-msgstr ""
+msgstr "Liko laiko"
 
 #. Android resource: @strings/map_download_title
 msgid "Map download"
@@ -2341,7 +2412,7 @@ msgid ""
 msgstr ""
 
 msgid "Coordinates"
-msgstr ""
+msgstr "Koordinatės"
 
 msgid ""
 "Stop\n"
@@ -2373,7 +2444,7 @@ msgid ""
 msgstr ""
 
 msgid "Satellite Status"
-msgstr ""
+msgstr "Palydovų būsena"
 
 msgid "NMEA Data"
 msgstr ""
@@ -2391,12 +2462,12 @@ msgid "horse"
 msgstr "arklys"
 
 msgid "Truck"
-msgstr ""
+msgstr "Sunkvežimis"
 
 #. Strings from android/res/values/strings.xml
 #. Android resource: @strings/yes
 msgid "Yes"
-msgstr ""
+msgstr "Taip"
 
 #. Android resource: @strings/notification_ticker
 msgid "Navit started"
@@ -2404,11 +2475,11 @@ msgstr ""
 
 #. Android resource: @strings/notification_event_default
 msgid "Navit running"
-msgstr ""
+msgstr "Veikia Navit"
 
 #. Android resource: @strings/initial_info_box_title
 msgid "Welcome to Navit"
-msgstr ""
+msgstr "Sveikiname paleidus Navit navigaciją"
 
 #. Android resource: @strings/initial_info_box_message
 msgid ""
@@ -2424,23 +2495,23 @@ msgstr ""
 
 #. Android resource: @strings/initial_info_box_OK
 msgid "OK"
-msgstr ""
+msgstr "Gerai"
 
 #. Android resource: @strings/initial_info_box_more_info
 msgid "More info"
-msgstr ""
+msgstr "Daugiau informacijos"
 
 #. Android resource: @strings/optionsmenu_zoom_in
 msgid "Zoom in"
-msgstr ""
+msgstr "Artinti"
 
 #. Android resource: @strings/optionsmenu_zoom_out
 msgid "Zoom out"
-msgstr ""
+msgstr "Tolinti"
 
 #. Android resource: @strings/optionsmenu_download_maps
 msgid "Download maps"
-msgstr ""
+msgstr "Atsisiųsti žemėlapius"
 
 #. Android resource: @strings/optionsmenu_toggle_poi
 msgid "Toggle POIs"
@@ -2448,7 +2519,7 @@ msgstr ""
 
 #. Android resource: @strings/optionsmenu_exit_navit
 msgid "Exit Navit"
-msgstr ""
+msgstr "Išeiti iš Navit"
 
 #. Android resource: @strings/optionsmenu_backup_restore
 msgid "Backup / Restore"
@@ -2456,11 +2527,11 @@ msgstr ""
 
 #. Android resource: @strings/map_delete
 msgid "Delete this map?"
-msgstr ""
+msgstr "Ištrinti šį žemėlapį?"
 
 #. Android resource: @strings/map_download_downloading
 msgid "Downloading:"
-msgstr ""
+msgstr "Siunčiama:"
 
 #. Android resource: @strings/map_download_download_error
 msgid "Error downloading map."
@@ -2480,11 +2551,11 @@ msgstr ""
 
 #. Android resource: @strings/address_search_title
 msgid "Address search"
-msgstr ""
+msgstr "Ieškoti adreso"
 
 #. Android resource: @strings/address_enter_destination
 msgid "Enter destination"
-msgstr ""
+msgstr "Įveskite tikslą"
 
 #. Android resource: @strings/address_partial_match
 msgid "Match partial address"
@@ -2492,11 +2563,11 @@ msgstr ""
 
 #. Android resource: @strings/address_search_searching
 msgid "Searching..."
-msgstr ""
+msgstr "Ieškoma..."
 
 #. Android resource: @strings/address_search_not_found
 msgid "Address not found"
-msgstr ""
+msgstr "Adresas nerastas"
 
 #. Android resource: @strings/address_search_getting_results
 msgid "Getting search results"
@@ -2504,15 +2575,15 @@ msgstr ""
 
 #. Android resource: @strings/address_search_loading_results
 msgid "Loading search results"
-msgstr ""
+msgstr "Įkeliami paieškos rezultatai"
 
 #. Android resource: @strings/address_search_no_results
 msgid "No results found"
-msgstr ""
+msgstr "Nieko nerasta"
 
 #. Android resource: @strings/address_search_no_text_entered
 msgid "No text entered"
-msgstr ""
+msgstr "Neįrašėte jokio teksto"
 
 #. Android resource: @strings/address_search_set_destination
 msgid "Setting destination to:"
@@ -2520,19 +2591,19 @@ msgstr ""
 
 #. Android resource: @strings/choose_an_action
 msgid "Choose an action"
-msgstr ""
+msgstr "Pasirinkite veiksmą"
 
 #. Android resource: @strings/please_insert_an_sd_card
 msgid "Please insert an SD Card"
-msgstr ""
+msgstr "Įdėkite SD kortelę (laikmeną)"
 
 #. Android resource: @strings/backing_up
 msgid "Backing up..."
-msgstr ""
+msgstr "Daroma atsarginė kopija..."
 
 #. Android resource: @strings/restoring
 msgid "Restoring..."
-msgstr ""
+msgstr "Atkuriama..."
 
 #. Android resource: @strings/failed_to_create_backup_directory
 msgid "Failed to create backup directory"
@@ -2544,7 +2615,7 @@ msgstr ""
 
 #. Android resource: @strings/no_backup_found
 msgid "No backup found"
-msgstr ""
+msgstr "Nerasta atsarginių kopijų"
 
 #. Android resource: @strings/failed_to_restore
 msgid "Failed to restore"
@@ -2552,7 +2623,7 @@ msgstr ""
 
 #. Android resource: @strings/backup_successful
 msgid "Backup successful"
-msgstr ""
+msgstr "Atsarginė kopija padaryta"
 
 #. Android resource: @strings/restore_successful_please_restart_navit
 msgid ""
@@ -2562,7 +2633,7 @@ msgstr ""
 
 #. Android resource: @strings/backup_not_found
 msgid "Backup not found"
-msgstr ""
+msgstr "Atsarginė kopija neaptikta"
 
 #. Android resource: @strings/restore_failed
 msgid "Restore failed"
@@ -2570,7 +2641,7 @@ msgstr ""
 
 #. Android resource: @strings/select_backup
 msgid "Select backup"
-msgstr ""
+msgstr "Pasirinkite atsarginę kopiją"
 
 #. Android resource: @strings/backup
 msgid "Backup"
diff --git a/po/lv.po.in b/po/lv.po.in
index 0ccea7c1..927528b2 100644
--- a/po/lv.po.in
+++ b/po/lv.po.in
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-11-07 17:39+0000\n"
+"PO-Revision-Date: 2015-01-05 13:24+0000\n"
 "Last-Translator: Stendec <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -140,8 +140,10 @@ msgstr[0] "pēc %d kilometra"
 msgstr[1] "pēc %d kilometriem"
 msgstr[2] "pēc %d kilometriem"
 
-msgid "exit"
-msgstr "nobraukt nost"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "uz rampas"
@@ -171,33 +173,18 @@ msgstr "%suz %s%s%s"
 msgid "%sinto the %s"
 msgstr "Uz %spagriezties pa %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "pa labi"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "pa kreisi"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "nedaudz "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "strauji "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "nepārāk strauji "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "neznāms "
-
 msgid "When possible, please turn around"
 msgstr "Kad iespējams apgriezieties"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Turpiniet pa šo ceļu %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Drīzumā uzbraukt uz apļa"
 
@@ -206,56 +193,133 @@ msgstr "Drīzumā uzbraukt uz apļa"
 msgid "Enter the roundabout %s"
 msgstr "Uzbraukt uz apļa pēc %s"
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "pēc tam izbraukt no apļa pa %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Nobraukt no apļa pa %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Turpiniet pa šo ceļu %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "drīz"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "tagad"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Pagriežaties %1$s ceļā pa %2$s"
 
+msgid "right"
+msgstr "pa labi"
+
 #, c-format
 msgid "after %i roads"
 msgstr "pēc %i ceļiem"
 
-msgid "now"
-msgstr "tagad"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "pēc tam %1$s ceļā pa %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "kļūda"
+msgid "easily "
+msgstr "nedaudz "
+
+msgid "strongly "
+msgstr "strauji "
+
+msgid "left"
+msgstr "pa kreisi"
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Pagriezties %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "pēc tam griežaties %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
+msgstr "tad Jūs sasniegsiet glamērķi"
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Jūs esat sasniedzis galamērķi %s"
 
-msgid "then you have reached your destination."
-msgstr "tad Jūs sasniegsiet glamērķi"
+msgid "exit"
+msgstr "nobraukt nost"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1315,19 +1379,14 @@ msgstr "* Nezināms, pievienot is_in tagus šīm pilsētām"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
-"navit lietošana:\n"
-"navit [options] [configfile]\n"
-"\t-c <file>: lietot <file> kā konfigurācijas failu\n"
-"\t-d <n>: iestatīt globālo atkļūdošanas izvadi uz <n> (0-3). Ignorēt "
-"uzstādijumus konfigurācijas failā.\n"
-"\t-h: pdrukāt lietošanas informāciju un iziet.\n"
-"\t-v: Drukāt versiju un iziet.\n"
 
 #. We have not found an existing config file from all possibilities
 msgid "No config file navit.xml, navit.xml.local found\n"
@@ -1466,10 +1525,10 @@ msgid "Opens address search dialog"
 msgstr "Atvērt adreses meklēšanas dialogu"
 
 msgid "_POI search"
-msgstr ""
+msgstr "I_P neklēšana"
 
 msgid "Opens POI search dialog"
-msgstr ""
+msgstr "Atver IP meklēšanas dialogu"
 
 msgid "_Stop Navigation"
 msgstr "_Apturēt Navigāciju"
@@ -1514,98 +1573,98 @@ msgid "Data"
 msgstr "Dati"
 
 msgid "Pharmacy"
-msgstr ""
+msgstr "Farmācija"
 
 msgid "Restaurant"
-msgstr ""
+msgstr "Restorāns"
 
 msgid "Restaurant. Fast food"
-msgstr ""
+msgstr "Restorāns. Bistro"
 
 msgid "Hotel"
-msgstr ""
+msgstr "Viesnīca"
 
 msgid "Car parking"
-msgstr ""
+msgstr "Auto novietne"
 
 msgid "Fuel station"
-msgstr ""
+msgstr "Benzīntanks"
 
 msgid "Bank"
-msgstr ""
+msgstr "Banka"
 
 msgid "Hospital"
-msgstr ""
+msgstr "Slimnīca"
 
 msgid "Cinema"
-msgstr ""
+msgstr "Kino"
 
 msgid "Train station"
-msgstr ""
+msgstr "Vilcienu stacija"
 
 msgid "School"
-msgstr ""
+msgstr "Skola"
 
 msgid "Police"
-msgstr ""
+msgstr "Policija"
 
 msgid "Justice"
-msgstr ""
+msgstr "Tiesībsargi"
 
 msgid "Taxi"
-msgstr ""
+msgstr "Taksometrs"
 
 msgid "Shopping"
-msgstr ""
+msgstr "Iepirkšanās"
 
 msgid "Distance from screen center (km)"
-msgstr ""
+msgstr "Attālums no ekrāna centra (km)"
 
 #, c-format
 msgid "POI %s. %s"
-msgstr ""
+msgstr "IP %s. %s"
 
 #, c-format
 msgid "Set destination to %ld, %ld \n"
-msgstr ""
+msgstr "Iestatīt galamērķi - %ld, %ld \n"
 
 #, c-format
 msgid "Set map to %ld, %ld \n"
-msgstr ""
+msgstr "Iestatīt karti %ld, %ld \n"
 
 #, c-format
 msgid "Set next visit to %ld, %ld \n"
-msgstr ""
+msgstr "Iestatīt nākamo apmeklējumu %ld, %ld \n"
 
 msgid "POI search"
-msgstr ""
+msgstr "IP meklēšana"
 
 msgid "Select a category"
-msgstr ""
+msgstr "Izvēlieties kategoriju"
 
 msgid "Select a distance to look for (km)"
 msgstr ""
 
 msgid "Select a POI"
-msgstr ""
+msgstr "Izvēlaties IP"
 
 msgid " "
-msgstr ""
+msgstr " "
 
 msgid "Category"
-msgstr ""
+msgstr "Kategorija"
 
 msgid "Direction"
-msgstr ""
+msgstr "Norādes"
 
 msgid "Distance(m)"
-msgstr ""
+msgstr "Attālums (m)"
 
 msgid "Name"
-msgstr ""
+msgstr "Vārds"
 
 msgid "Visit Before"
-msgstr ""
+msgstr "Apmeklēt vispirms"
 
 msgid "N"
 msgstr "Z"
@@ -1692,6 +1751,9 @@ msgstr "Noņem meklētos rezultātus no kartes"
 msgid "Show results on the map"
 msgstr "Rādīt rezultātus uz kartes"
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "izgriezt grāmatzīmi"
 
@@ -2105,7 +2167,7 @@ msgid "Thueringen"
 msgstr ""
 
 msgid "Mallorca"
-msgstr ""
+msgstr "Maljorka"
 
 msgid "Galicia"
 msgstr ""
@@ -2408,7 +2470,7 @@ msgid "horse"
 msgstr "zirgs"
 
 msgid "Truck"
-msgstr ""
+msgstr "Kravas automašīna"
 
 #. Strings from android/res/values/strings.xml
 #. Android resource: @strings/yes
diff --git a/po/mk.po.in b/po/mk.po.in
index 8246bb9a..706a3264 100644
--- a/po/mk.po.in
+++ b/po/mk.po.in
@@ -136,8 +136,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "после %d километри"
 msgstr[1] "после %d километри"
 
-msgid "exit"
-msgstr "излез"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "на рампа"
@@ -167,33 +169,18 @@ msgstr "%sна %s%s%s"
 msgid "%sinto the %s"
 msgstr "%sна %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "на десно"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "на лево"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "лесно "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "силно "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "многу силно "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "непознато "
-
 msgid "When possible, please turn around"
 msgstr "Кога можете, свртете"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Следете го патот следните %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Наскоро влегувате во кружен тек"
 
@@ -202,56 +189,133 @@ 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 %s"
-msgstr "Потоа излегувате од кружен тек на %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Излегувате од кружен тек на %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Следете го патот следните %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "наскоро"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "сега"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Продолжи по %1$s патот до %2$s"
 
+msgid "right"
+msgstr "на десно"
+
 #, c-format
 msgid "after %i roads"
 msgstr "после %i патишта"
 
-msgid "now"
-msgstr "сега"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "тогаш појдете по патот %1$s кон %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "грешка"
+msgid "easily "
+msgstr "лесно "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "силно "
+
+msgid "left"
+msgstr "на лево"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Свртете %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "тогаш свртете %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "потоа пристигате на одредиштето."
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Стигнавте на целта %s"
 
-msgid "then you have reached your destination."
-msgstr "потоа пристигате на одредиштето."
+msgid "exit"
+msgstr "излез"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1311,11 +1375,13 @@ msgstr "* Непознато, додадете is_in тагови за овие
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1682,6 +1748,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Отсечи обележувач"
 
diff --git a/po/ml.po.in b/po/ml.po.in
index bee0c6ea..baa60d78 100644
--- a/po/ml.po.in
+++ b/po/ml.po.in
@@ -1,14 +1,14 @@
-# Malayalam translation for navit
-# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
+# Malayalam translations for navit
+# Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
-# Sunyl K https://launchpad.net/~sunilk
+# Many thanks to the contributors of this translation:
 # Faju https://launchpad.net/~gotoarunk
+# Sunil K https://launchpad.net/~sunilk
 
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.5.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-14 23:10-0800\n"
+"Project-Id-Version: navit\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "PO-Revision-Date: 2015-03-18 13:32+0000\n"
 "Last-Translator: Sunil K <Unknown>\n"
 "Language-Team: Malayalam <ml@li.org>\n"
@@ -16,7 +16,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
 msgstr "സോര്‍സ് ഡൈരക്ടറിയില് നിന്നും പ്രവര്ത്തിക്കുന്നു\n"
@@ -133,8 +132,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "ഒരു കിലോമീറ്ററില്‍"
 msgstr[1] "%d കിലോമീറ്ററില്‍"
 
-msgid "exit"
-msgstr "പുറത്തേക്ക്"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "ചരുവിലേക്ക് പോവുക"
@@ -164,33 +165,18 @@ msgstr "%sകഴിഞ്ഞു %s %s %s"
 msgid "%sinto the %s"
 msgstr "%s-ല്‍  %s -ലേക്ക് തിരിയുക"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "വലത്തോട്ട്"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "ഇടത്തോട്ട്"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "ചെറുതായ് "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "നന്നായി "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "കടുത്തതായ് "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "പേരില്ലാത്ത "
-
 msgid "When possible, please turn around"
 msgstr "സാധിക്കുന്നിടത്ത് വച്ച്,തിരിച്ചു പോവുക"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "ഈ വഴിയിലുടെ  അടുത്ത %s  പോവുക"
+
 msgid "Enter the roundabout soon"
 msgstr "റൗണ്ടാനയിലേക്ക് ഉടനെ കയറുക"
 
@@ -199,56 +185,133 @@ 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 %s"
-msgstr "%s- ല്‍ റൗണ്ടാനയില്‍ നിന്നും പുറത്തോട്ട് പോവുക"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "%s-ലൂടെ റൗണ്ടാനയില്‍ നിന്നും പുറത്തു പോവുകാ"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "ഈ വഴിയിലുടെ  അടുത്ത %s  പോവുക"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "അല്പസമയത്തിനുള്ളില്‍"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "ഇപ്പോള്‍"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "%2$s   %1$s-മത്തെ പാത  എടുക്കുക"
 
+msgid "right"
+msgstr "വലത്തോട്ട്"
+
 #, c-format
 msgid "after %i roads"
 msgstr "%i വഴികൾക്കു ശേഷം"
 
-msgid "now"
-msgstr "ഇപ്പോള്‍"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "അതിനു ശേഷം %2$s ഉള്ള %1$s വഴിയെ പോവുക"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "പിശക്"
+msgid "easily "
+msgstr "ചെറുതായ് "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "നന്നായി "
+
+msgid "left"
+msgstr "ഇടത്തോട്ട്"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "%4$s ലേക്ക്  %3$s %2$s %1$s തിരിയുക"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "അതിനു ശേഷം %4$s ലേക്ക്  %3$s ശേഷം %2$s %1$s തിരിയുക"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
+msgstr "അപ്പോള്‍ നിങ്ങള്‍ ലക്ഷ്യത്തിലെത്തും"
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "നിങ്ങള്‍ %s ലക്ഷ്യത്തിലെത്തിയിരിക്കുന്നു"
 
-msgid "then you have reached your destination."
-msgstr "അപ്പോള്‍ നിങ്ങള്‍ ലക്ഷ്യത്തിലെത്തും"
+msgid "exit"
+msgstr "പുറത്തേക്ക്"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1308,19 +1371,14 @@ msgstr "* അറിയില്ല, ദയവായി is_in  ടാഗ് സ�
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
-"നാവിറ്റ് ഉപയോഗിക്കുന്ന വിധം\n"
-"നാവിറ്റ് [ഓപ്ഷന്‍] കോണ്‍ഫിഗ് ഫയല്‍\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
-"\t-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"
@@ -1684,6 +1742,9 @@ msgstr "ഭൂപടത്തില്‍  നിന്നും തെരച്
 msgid "Show results on the map"
 msgstr "തിരച്ചില്‍ ഫലങ്ങള്‍ ഭൂപടത്തില്‍ കാണിക്കുക"
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "ബുക്ക്മാര്‍ക്ക് കട്ട് ചെയ്യുക"
 
diff --git a/po/mn.po.in b/po/mn.po.in
index 991e847f..f2bc3255 100644
--- a/po/mn.po.in
+++ b/po/mn.po.in
@@ -1,6 +1,7 @@
-# Mongolian translation for navit
-# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
+# Mongolian translations for navit
+# Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
+# Many thanks to the contributors of this translation:
 # Enkhbold https://launchpad.net/~enkhbold-baatar
 
 msgid ""
@@ -14,8 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"Language: mn\n"
-"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
 msgstr "Эх байгаа сангаас нь ажиллуулах\n"
@@ -132,7 +131,9 @@ msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "exit"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
 msgstr ""
 
 msgid "into the ramp"
@@ -163,90 +164,152 @@ msgstr ""
 msgid "%sinto the %s"
 msgstr ""
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
+msgid "When possible, please turn around"
 msgstr ""
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
 
-msgid "When possible, please turn around"
+#. 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 ""
 
-msgid "Enter the roundabout soon"
+msgid "soon"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "now"
+msgstr ""
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "%1$s merge right %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "%1$s left exit %2$s %3$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
+msgid "%1$s right exit %2$s %3$s"
 msgstr ""
 
-msgid "soon"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
 msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
+msgid "right"
+msgstr ""
+
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-msgid "now"
+#. 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 ""
 
-#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "easily "
 msgstr ""
 
-msgid "error"
+msgid "strongly "
+msgstr ""
+
+msgid "left"
 msgstr ""
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
 msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
 msgstr ""
 
+msgid "then you have reached your destination."
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr ""
 
-msgid "then you have reached your destination."
+msgid "exit"
+msgstr ""
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
 msgstr ""
 
 #. Android resource: @strings/position_popup_title
@@ -1307,11 +1370,13 @@ msgstr ""
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1675,6 +1740,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/mr.po.in b/po/mr.po.in
index aa816651..102d646e 100644
--- a/po/mr.po.in
+++ b/po/mr.po.in
@@ -132,7 +132,9 @@ msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "exit"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
 msgstr ""
 
 msgid "into the ramp"
@@ -163,90 +165,152 @@ msgstr ""
 msgid "%sinto the %s"
 msgstr ""
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
+msgid "When possible, please turn around"
 msgstr ""
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
 
-msgid "When possible, please turn around"
+#. 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 ""
 
-msgid "Enter the roundabout soon"
+msgid "soon"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "now"
+msgstr ""
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "%1$s merge right %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "%1$s left exit %2$s %3$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
+msgid "%1$s right exit %2$s %3$s"
 msgstr ""
 
-msgid "soon"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
 msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
+msgid "right"
+msgstr ""
+
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-msgid "now"
+#. 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 ""
 
-#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "easily "
 msgstr ""
 
-msgid "error"
+msgid "strongly "
+msgstr ""
+
+msgid "left"
 msgstr ""
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
 msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
 msgstr ""
 
+msgid "then you have reached your destination."
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr ""
 
-msgid "then you have reached your destination."
+msgid "exit"
+msgstr ""
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
 msgstr ""
 
 #. Android resource: @strings/position_popup_title
@@ -1307,11 +1371,13 @@ msgstr ""
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1675,6 +1741,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/nb.po.in b/po/nb.po.in
index 5f9f9cec..7418dddb 100644
--- a/po/nb.po.in
+++ b/po/nb.po.in
@@ -138,8 +138,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "om en kilometer"
 msgstr[1] "om %d kilometer"
 
-msgid "exit"
-msgstr "avkjørsel"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "ut på akselerasjonsfeltet"
@@ -169,33 +171,18 @@ msgstr "%sin på %s%s%set"
 msgid "%sinto the %s"
 msgstr "%sinn på %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "høyre"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "venstre"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "slakt "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "skarpt "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "veldig skarpt "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "ukjent "
-
 msgid "When possible, please turn around"
 msgstr "Snu når det er mulig"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Følg veien de neste %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Kjør inn i rundkjøringen snart"
 
@@ -204,56 +191,133 @@ msgstr "Kjør inn i rundkjøringen snart"
 msgid "Enter the roundabout %s"
 msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "forlat så rundkjøringen ut %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Forlat rundkjøringen ut %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Følg veien de neste %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "snart"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "nå"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Ta den %1$s veien mot %2$s"
 
+msgid "right"
+msgstr "høyre"
+
 #, c-format
 msgid "after %i roads"
 msgstr "etter %i avkjøringer"
 
-msgid "now"
-msgstr "nå"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "ta deretter %1$s til %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "feil"
+msgid "easily "
+msgstr "slakt "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "skarpt "
+
+msgid "left"
+msgstr "venstre"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Sving %1$s til %2$s om %3$s %4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "sving så %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "så har du nådd ditt reisemål."
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Du har nådd ditt reisemål %s"
 
-msgid "then you have reached your destination."
-msgstr "så har du nådd ditt reisemål."
+msgid "exit"
+msgstr "avkjørsel"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1313,11 +1377,13 @@ msgstr "Ukjent, legg is_in-tagger til de byene."
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1681,6 +1747,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Klipp bokmerke"
 
diff --git a/po/nds.po.in b/po/nds.po.in
index 314d342c..8ec36389 100644
--- a/po/nds.po.in
+++ b/po/nds.po.in
@@ -7,7 +7,6 @@
 # Lars Hennig https://launchpad.net/~elhennig
 # Roadrunner IN https://launchpad.net/~online
 # Roschkor https://launchpad.net/~bound-one2000
-# Sagamir https://launchpad.net/~sagamir
 # everyone https://launchpad.net/~anonymus1338
 # fred husche https://launchpad.net/~paidmailacc
 
@@ -140,8 +139,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "in einem Kilometer"
 msgstr[1] "in %d Kilometern"
 
-msgid "exit"
-msgstr "Ausfahrt"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "auf die Auffahrt"
@@ -171,33 +172,18 @@ msgstr "%s in das %s%s%s"
 msgid "%sinto the %s"
 msgstr "%s in die %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "Rechts"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "links"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "einfach "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "straf "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "wirklich scharf "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "unbekannt "
-
 msgid "When possible, please turn around"
 msgstr "Wenn möglich, bitte wenden"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Der Straße %s folgen"
+
 msgid "Enter the roundabout soon"
 msgstr "In Kürze in den Kreisverkehr einfahren"
 
@@ -206,56 +192,133 @@ 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 %s"
-msgstr "dann den Kreisverkehr an der %s verlassen"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Den Kreisverkehr an der %s verlassen"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Der Straße %s folgen"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "in Kürze"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "jetzt"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Die %1$s Straße zur %2$s nehmen"
 
+msgid "right"
+msgstr "Rechts"
+
 #, c-format
 msgid "after %i roads"
 msgstr "nach %i Straßen"
 
-msgid "now"
-msgstr "jetzt"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "Dann die %1$s Straße zur %2$s nehmen"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "Fehler"
+msgid "easily "
+msgstr "einfach "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "straf "
+
+msgid "left"
+msgstr "links"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "In %3$s %1$s%2$s %4$s abbiegen"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "dann %1$s%2$s %3$s%4$s abbiegen"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "Dann haben Sie Ihr Ziel erreicht"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Sie haben Ihr Ziel erreicht %s"
 
-msgid "then you have reached your destination."
-msgstr "Dann haben Sie Ihr Ziel erreicht"
+msgid "exit"
+msgstr "Ausfahrt"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1315,11 +1378,13 @@ msgstr "* Unbekannt, fügen sie is_in Tags zu diesen Städten hinzu"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1683,6 +1748,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Lesezeichen ausschneiden"
 
diff --git a/po/nl.po.in b/po/nl.po.in
index 7285b44b..1b0a7b4f 100644
--- a/po/nl.po.in
+++ b/po/nl.po.in
@@ -25,8 +25,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-11-07 03:58+0000\n"
-"Last-Translator: Sybren Stüvel <Unknown>\n"
+"PO-Revision-Date: 2015-04-03 19:48+0000\n"
+"Last-Translator: jan <jandegr1@hotmail.com>\n"
 "Language-Team: afaber\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -153,8 +153,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "na één kilometer"
 msgstr[1] "na %d kilometer"
 
-msgid "exit"
-msgstr "afslag"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr "de  %1$s %2$s op"
 
 msgid "into the ramp"
 msgstr "naar de oprit"
@@ -184,33 +186,18 @@ msgstr "%sde %s%s%s in"
 msgid "%sinto the %s"
 msgstr "%snaar de %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "rechts"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "links"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "flauw "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "scherp "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "zeer scherp "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "onbekende "
-
 msgid "When possible, please turn around"
 msgstr "Indien mogelijk omkeren"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr "richting %s"
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Volg de weg gedurende %s"
+
 msgid "Enter the roundabout soon"
 msgstr "U rijdt zodadelijk de rotonde op"
 
@@ -219,53 +206,130 @@ msgstr "U rijdt zodadelijk de rotonde op"
 msgid "Enter the roundabout %s"
 msgstr "neem de rotonde %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 "daarna de rotonde verlaten bij de  %1$s %2$s"
+
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "daarna de rotonde verlaten bij de %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr "verlaat de rotonde bij  %1$s %2$s"
+
+msgid "now"
+msgstr "nu"
+
+msgid "then"
+msgstr "daarna"
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Verlaat de rotonde bij de %s"
+msgid "%1$s merge left %2$s"
+msgstr "%1$s links invoegen %2$s"
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Volg de weg gedurende %s"
+msgid "%1$s merge right %2$s"
+msgstr "%1$s rechts invoegen %2$s"
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr " bij de afslag "
+
+msgid " at the interchange "
+msgstr " bij "
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr "%1$s ga rechtdoor %2$s"
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr "%1$s rechts aanhouden%2$s"
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr "%1$s links aanhouden%2$s"
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr "%1$s ga rechtdoor"
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr "%1$s rechts aanhouden"
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr "%1$s links aanhouden"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Neem de %1$s straat naar %2$s"
 
+msgid "right"
+msgstr "rechts"
+
 #, c-format
 msgid "after %i roads"
 msgstr "na %i wegen"
 
-msgid "now"
-msgstr "nu"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "neem daarna de %1$s weg naar %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr "%3$s ga %1$s naar %2$s %4$s"
+
+msgid "easily "
+msgstr "flauw "
 
-msgid "error"
-msgstr "fout"
+msgid "strongly "
+msgstr "scherp "
+
+msgid "left"
+msgstr "links"
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Ga %3$s %1$s naar %2$s %4$s"
+msgid "%1$s left turnaround"
+msgstr "%1$s linksomkeren"
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "daarna ga %3$s %1$s naar %2$s %4$s"
+msgid "%1$s right turnaround"
+msgstr "%1$s rechtsomkeren"
+
+msgid "then you have reached your destination."
+msgstr "daarna heeft u uw bestemming bereikt."
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Bestemming %s bereikt"
 
-msgid "then you have reached your destination."
-msgstr "daarna heeft u uw bestemming bereikt."
+msgid "exit"
+msgstr "afslag"
+
+msgid "interchange"
+msgstr "bij"
+
+#, c-format
+msgid "%s %s"
+msgstr "%s %s"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -665,7 +729,7 @@ msgstr "Gambia"
 
 #. 324
 msgid "Guinea"
-msgstr "Papoea-Nieuw-Guinea"
+msgstr "Guinee"
 
 #. 312
 msgid "Guadeloupe"
@@ -1326,19 +1390,14 @@ msgstr "* Onbekend, voeg een is_in-label toe aan deze steden"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
-"navit gebruik:\n"
-"navit [opties] [configuratiebestand]\n"
-"\t -c <bestand>: gebruik <bestand> als configuratie bestand.\n"
-"\t -d <n>: zet het foutmeldingen niveau op <n> (0-3). Dit gaat boven de "
-"instellingen van het configuratie bestand.\n"
-"\t -h toon deze gebruiks informatie en sluit af.\n"
-"\t -v toon de versie en sluit af.\n"
 
 #. We have not found an existing config file from all possibilities
 msgid "No config file navit.xml, navit.xml.local found\n"
@@ -1491,7 +1550,7 @@ msgid "Test"
 msgstr "Test"
 
 msgid "_Quit"
-msgstr "Beëindigen"
+msgstr ""
 
 msgid "Quit the application"
 msgstr "Het programma afsluiten"
@@ -1527,46 +1586,46 @@ msgid "Data"
 msgstr "Gegevens"
 
 msgid "Pharmacy"
-msgstr ""
+msgstr "Apotheek"
 
 msgid "Restaurant"
-msgstr ""
+msgstr "Restaurant"
 
 msgid "Restaurant. Fast food"
 msgstr ""
 
 msgid "Hotel"
-msgstr ""
+msgstr "Hotel"
 
 msgid "Car parking"
 msgstr ""
 
 msgid "Fuel station"
-msgstr ""
+msgstr "Tankstation"
 
 msgid "Bank"
-msgstr ""
+msgstr "Bank"
 
 msgid "Hospital"
-msgstr ""
+msgstr "Ziekenhuis"
 
 msgid "Cinema"
-msgstr ""
+msgstr "Bioscoop"
 
 msgid "Train station"
-msgstr ""
+msgstr "Treinstation"
 
 msgid "School"
-msgstr ""
+msgstr "School"
 
 msgid "Police"
-msgstr ""
+msgstr "Politie"
 
 msgid "Justice"
 msgstr ""
 
 msgid "Taxi"
-msgstr ""
+msgstr "Taxi"
 
 msgid "Shopping"
 msgstr ""
@@ -1594,7 +1653,7 @@ msgid "POI search"
 msgstr ""
 
 msgid "Select a category"
-msgstr ""
+msgstr "Kies een categorie"
 
 msgid "Select a distance to look for (km)"
 msgstr ""
@@ -1603,19 +1662,19 @@ msgid "Select a POI"
 msgstr ""
 
 msgid " "
-msgstr ""
+msgstr " "
 
 msgid "Category"
-msgstr ""
+msgstr "Categorie"
 
 msgid "Direction"
-msgstr ""
+msgstr "Richting"
 
 msgid "Distance(m)"
-msgstr ""
+msgstr "Afstand(m)"
 
 msgid "Name"
-msgstr ""
+msgstr "Naam"
 
 msgid "Visit Before"
 msgstr ""
@@ -1705,6 +1764,9 @@ msgstr "Verwijder zoek resultaten van de kaart"
 msgid "Show results on the map"
 msgstr "laat de resultaten op de kaart zien"
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Favoriet knippen"
 
diff --git a/po/nn.po.in b/po/nn.po.in
index 12c69f1d..d696e64d 100644
--- a/po/nn.po.in
+++ b/po/nn.po.in
@@ -134,8 +134,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "om ein kilometer"
 msgstr[1] "om %d kilometer"
 
-msgid "exit"
-msgstr "avkjøyring"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr ""
@@ -165,90 +167,152 @@ msgstr ""
 msgid "%sinto the %s"
 msgstr "%sinn på %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "høgre"
+msgid "When possible, please turn around"
+msgstr ""
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "venstre"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "slakt "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "krapt "
+msgid "Enter the roundabout soon"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "veldig krapt "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "ukjend "
+#. 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 ""
 
-msgid "When possible, please turn around"
+#. 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 ""
 
-msgid "Enter the roundabout soon"
+msgid "soon"
+msgstr "snart"
+
+msgid "now"
+msgstr "no"
+
+msgid "then"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "%1$s merge right %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "%1$s left exit %2$s %3$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
+msgid "%1$s right exit %2$s %3$s"
 msgstr ""
 
-msgid "soon"
-msgstr "snart"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Ta den %1$s vegen mot %2$s"
 
+msgid "right"
+msgstr "høgre"
+
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-msgid "now"
-msgstr "no"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
 msgstr ""
 
-msgid "error"
-msgstr "feil"
+msgid "easily "
+msgstr "slakt "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "krapt "
+
+msgid "left"
+msgstr "venstre"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
 msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
 msgstr ""
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr ""
 
-msgid "then you have reached your destination."
+msgid "exit"
+msgstr "avkjøyring"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
 msgstr ""
 
 #. Android resource: @strings/position_popup_title
@@ -1309,11 +1373,13 @@ msgstr "Ukjend, legg is_in-tagger til dei byane."
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1677,6 +1743,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/pl.po.in b/po/pl.po.in
index 664f7d5b..c29cd386 100644
--- a/po/pl.po.in
+++ b/po/pl.po.in
@@ -8,7 +8,7 @@
 # KaZeR https://launchpad.net/~kazer
 # Marcin Ostajewski (panszpik) https://launchpad.net/~panszpik
 # Mineque https://launchpad.net/~mineque
-# Patryk Benderz &quot;LeadMan&quot; https://launchpad.net/~leadman
+# Patryk &quot;LeadMan&quot; Benderz https://launchpad.net/~leadman
 # S0Cool https://launchpad.net/~mareksok
 # TSr https://launchpad.net/~tsr
 # Wojtek https://launchpad.net/~wojtek-pol
@@ -150,8 +150,10 @@ msgstr[0] "za jeden kilometr"
 msgstr[1] "za %d kilometry"
 msgstr[2] "za %d kilometrów"
 
-msgid "exit"
-msgstr "zjazd"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "na wjazd"
@@ -181,33 +183,18 @@ msgstr "%sw %s%s%s|neutralny rodzaj"
 msgid "%sinto the %s"
 msgstr "%s do %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "w prawo"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "w lewo"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "lekko "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "silnie "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "bardzo silnie "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "nieznane "
-
 msgid "When possible, please turn around"
 msgstr "Zawróc, gdy będzie to możliwe"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Jedź tą drogą do następnego %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Wjazd na rondo wkrótce"
 
@@ -216,56 +203,133 @@ msgstr "Wjazd na rondo wkrótce"
 msgid "Enter the roundabout %s"
 msgstr "Wjazd na rondo %s"
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "następnie zjedź z ronda na %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Zjedź z ronda na %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Jedź tą drogą do następnego %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "wkrótce"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "teraz"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Jedź drogą %1$s do %2$s"
 
+msgid "right"
+msgstr "w prawo"
+
 #, c-format
 msgid "after %i roads"
 msgstr "po drodze %i"
 
-msgid "now"
-msgstr "teraz"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "następnie jedź %1$s drogą do %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "błąd"
+msgid "easily "
+msgstr "lekko "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "silnie "
+
+msgid "left"
+msgstr "w lewo"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Skręć %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "następnie skręć %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "następnie dojechałeś do celu."
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Dotarłeś do celu %s"
 
-msgid "then you have reached your destination."
-msgstr "następnie dojechałeś do celu."
+msgid "exit"
+msgstr "zjazd"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1325,19 +1389,14 @@ msgstr "* Nieznane, dodaj is w tagach dla tych miast"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
-"navit użycie:\n"
-"navit [opcje] [plik config]\n"
-"\t-c <plik>: użyje <plik> jako plik config\n"
-"\t-d <n>: ustawi wyjściowy poziom globalnego debugowania na <n> (0-3). "
-"Nadpisze ustawienia z pliku config.\n"
-"\t-h: wydrukuje to info użycia i wyjdzie.\n"
-"\t-v: Wydrukuje wersję i wyjdzie.\n"
 
 #. We have not found an existing config file from all possibilities
 msgid "No config file navit.xml, navit.xml.local found\n"
@@ -1702,6 +1761,9 @@ msgstr "Usuń wyniki wyszukiwania z mapy"
 msgid "Show results on the map"
 msgstr "Pokaż wyniki na mapie"
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Wytnij zakładkę"
 
diff --git a/po/pms.po.in b/po/pms.po.in
index 26a92dfe..58c55e74 100644
--- a/po/pms.po.in
+++ b/po/pms.po.in
@@ -132,8 +132,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "exit"
-msgstr "surtia"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "in tla rampa"
@@ -163,90 +165,152 @@ msgstr ""
 msgid "%sinto the %s"
 msgstr ""
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
+msgid "When possible, please turn around"
 msgstr ""
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
 
-msgid "When possible, please turn around"
+#. 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 ""
 
-msgid "Enter the roundabout soon"
+msgid "soon"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "now"
+msgstr ""
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "%1$s merge right %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "%1$s left exit %2$s %3$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
+msgid "%1$s right exit %2$s %3$s"
 msgstr ""
 
-msgid "soon"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
 msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
+msgid "right"
+msgstr ""
+
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-msgid "now"
+#. 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 ""
 
-#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "easily "
 msgstr ""
 
-msgid "error"
+msgid "strongly "
 msgstr ""
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "left"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
 msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
 msgstr ""
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr ""
 
-msgid "then you have reached your destination."
+msgid "exit"
+msgstr "surtia"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
 msgstr ""
 
 #. Android resource: @strings/position_popup_title
@@ -1307,11 +1371,13 @@ msgstr ""
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1675,6 +1741,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/pt.po.in b/po/pt.po.in
index 651fcf7a..4f26bbf8 100644
--- a/po/pt.po.in
+++ b/po/pt.po.in
@@ -144,8 +144,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "a um quilómetro"
 msgstr[1] "a %d quilómetros"
 
-msgid "exit"
-msgstr "sair"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "na subida"
@@ -175,33 +177,18 @@ msgstr "%s na %s%s%s"
 msgid "%sinto the %s"
 msgstr "%s na %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "direita"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "esquerda"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "facilmente "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "veementemente "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "muito veementemente "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "desconhecido "
-
 msgid "When possible, please turn around"
 msgstr "Quando for possível, inverta o sentido de marcha"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Siga a estrada para a próxima %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Entre na próxima rotunda"
 
@@ -210,56 +197,133 @@ msgstr "Entre na próxima rotunda"
 msgid "Enter the roundabout %s"
 msgstr "Entre na próxima rotunda a %s"
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "e saia da rotunda na %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Saia da rotunda na %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Siga a estrada para a próxima %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "logo"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "agora"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Apanhe a %1$s estrada para a %2$s"
 
+msgid "right"
+msgstr "direita"
+
 #, c-format
 msgid "after %i roads"
 msgstr "depois de %i estradas"
 
-msgid "now"
-msgstr "agora"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "depois apanhe a %1$s estrada para a %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "erro"
+msgid "easily "
+msgstr "facilmente "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "veementemente "
+
+msgid "left"
+msgstr "esquerda"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Vire %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "depois vire %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "depois chegou ao seu destino."
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Chega ao seu destino em %s"
 
-msgid "then you have reached your destination."
-msgstr "depois chegou ao seu destino."
+msgid "exit"
+msgstr "sair"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1319,19 +1383,14 @@ msgstr "* Desconhecido, adicione tags \"is_in\"  para estas cidades"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
-"utilização:\n"
-"navit [opções] [ficheiro_configuração]\n"
-"\t-c <ficheiro>: utilizar <ficheiro> como ficheiro de configuração.\n"
-"\t-d <n>: define o nível de depuração para <n> (0-3). Substitui a definição "
-"do ficheiro de configuração.\n"
-"\t-h: mostra estas informações e sai.\n"
-"\t-v: mostra a versão e sai.\n"
 
 #. We have not found an existing config file from all possibilities
 msgid "No config file navit.xml, navit.xml.local found\n"
@@ -1694,6 +1753,9 @@ msgstr "Remover resultados do mapa"
 msgid "Show results on the map"
 msgstr "Mostrar resultados no mapa"
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Cortar marcador"
 
diff --git a/po/pt_BR.po.in b/po/pt_BR.po.in
index 9b829173..a1188df4 100644
--- a/po/pt_BR.po.in
+++ b/po/pt_BR.po.in
@@ -17,13 +17,14 @@
 # guilherme https://launchpad.net/~guidicavalcanti
 # hvera https://launchpad.net/~hamilton-listas
 # paulohm https://launchpad.net/~paulohm
+# pingflood https://launchpad.net/~pingflood
 
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-10-24 18:17+0000\n"
-"Last-Translator: Helder Santana <helder.bs.santana@gmail.com>\n"
+"PO-Revision-Date: 2015-04-03 01:58+0000\n"
+"Last-Translator: Jairo Roberto Duarte <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -147,8 +148,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "em um quilômetro"
 msgstr[1] "em %d quilômetros"
 
-msgid "exit"
-msgstr "saída"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr "para a %1$s %2$s"
 
 msgid "into the ramp"
 msgstr "na rampa"
@@ -178,33 +181,18 @@ msgstr "%sem %s%s%s"
 msgid "%sinto the %s"
 msgstr "%sna %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "à direita"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "à esquerda"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "levemente "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "fortemente "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "vigorosamente "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "desconhecido "
-
 msgid "When possible, please turn around"
 msgstr "Quando possível, favor retornar"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr "na direção %s"
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Continue na via por %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Entre na rotatória em seguida"
 
@@ -213,56 +201,133 @@ 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 %s"
-msgstr "em seguida deixe a rotatória no %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr "em seguida, deixar a rotatória no %1$s %2$s"
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Deixe a rotatória na %s"
-
-#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Continue na via por %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr "Deixe a rotatória no %1$s %2$s"
 
 msgid "soon"
 msgstr "em breve"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "agora"
+
+msgid "then"
+msgstr "depois"
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr "%1$s estreitamento à esquerda %2$s"
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr "%1$s estreitamento à direita %2$s"
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr "%1$s saída à esquerda %2$s %3$s"
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr "%1$s saída à direita %2$s %3$s"
+
+msgid " at the exit "
+msgstr " na saída "
+
+msgid " at the interchange "
+msgstr " no trevo "
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr "%1$s continuar reto%2$s"
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr "%1$s mantenha à direita%2$s"
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr "%1$s mantenha à esquerda%2$s"
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr "%1$s continuar reto"
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr "%1$s mantenha à direita"
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr "%1$s mantenha à esquerda"
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Pegue a %1$s via para a %2$s"
 
+msgid "right"
+msgstr "à direita"
+
 #, c-format
 msgid "after %i roads"
 msgstr "após %i vias"
 
-msgid "now"
-msgstr "agora"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "então pegue a %1$s via para a %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr "Vire %1$s%2$s %3$s %4$s"
+
+msgid "easily "
+msgstr "levemente "
+
+msgid "strongly "
+msgstr "fortemente "
 
-msgid "error"
-msgstr "erro"
+msgid "left"
+msgstr "à esquerda"
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Vire %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr "%1$s vire na curva à esquerda"
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "então vire %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr "%1$s vire na curva à direita"
+
+msgid "then you have reached your destination."
+msgstr "então você chegará ao destino."
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Você chegará ao destino %s"
 
-msgid "then you have reached your destination."
-msgstr "então você chegará ao destino."
+msgid "exit"
+msgstr "saída"
+
+msgid "interchange"
+msgstr "intercâmbio"
+
+#, c-format
+msgid "%s %s"
+msgstr "%s %s"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -284,7 +349,7 @@ msgid "Time"
 msgstr "Tempo"
 
 msgid "Destination Length"
-msgstr "Distância ao Destino"
+msgstr "Distância até o Destino"
 
 msgid "Destination Time"
 msgstr "Tempo até o Destino"
@@ -297,7 +362,7 @@ msgid "Waypoint %d"
 msgstr "Ponto %d"
 
 msgid "Visit before..."
-msgstr "Visite antes..."
+msgstr "Adicionar à rota"
 
 msgid "Set as position"
 msgstr "Definir como posição"
@@ -306,7 +371,7 @@ msgid "Set as destination"
 msgstr "Definir como destino"
 
 msgid "Add as bookmark"
-msgstr "Adicione como favorito"
+msgstr "Adicionar como favorito"
 
 #, c-format
 msgid "Point 0x%x 0x%x"
@@ -1322,19 +1387,24 @@ msgstr "* Desconhecido, adicione tags \"is_in\"  para essas cidades"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
-"navit uso:\n"
+"empregado no navit:\n"
 "navit [opções] [arquivo de configuração]\n"
-"\t-c <arquivo>: use <arquivo> como arquivo de configuração\n"
-"\t-d <n>: define o nível do debug para <n> (0-3). Substitui a definição do "
-"arquivo de configuração.\n"
-"\t-h: imprima esta informação de utilização e saia.\n"
-"\t-v: Imprima a versão e saia.\n"
+"\t-c <arquivo>: uso <arquivo> como arquivo de configuração, em vez de usar "
+"arquivo padrão.\n"
+"\t-d <n>: definir o nível de saída de depuração global para <n> (0=erro, "
+"1=aviso, 2=info, 3=depuração).\n"
+"\tConfigurações de arquivo de configuração ainda terão efeito quando "
+"montados num nível superior.\n"
+"\t-h: imprimir esta informação de utilização e sair.\n"
+"\t-v: imprimir a versão e sair.\n"
 
 #. We have not found an existing config file from all possibilities
 msgid "No config file navit.xml, navit.xml.local found\n"
@@ -1404,7 +1474,7 @@ msgid "Enter Destination"
 msgstr "Digite o destino"
 
 msgid "Zip Code"
-msgstr "Código Postal"
+msgstr "CEP"
 
 msgid "City"
 msgstr "Cidade"
@@ -1474,10 +1544,10 @@ msgid "Opens address search dialog"
 msgstr "Abre a busca de endereço"
 
 msgid "_POI search"
-msgstr ""
+msgstr "_Pesquisar POI"
 
 msgid "Opens POI search dialog"
-msgstr ""
+msgstr "Abre a busca de POIs"
 
 msgid "_Stop Navigation"
 msgstr "_Cessar a Navegação"
@@ -1522,98 +1592,98 @@ msgid "Data"
 msgstr "Dados"
 
 msgid "Pharmacy"
-msgstr ""
+msgstr "Farmácia"
 
 msgid "Restaurant"
-msgstr ""
+msgstr "Restaurante"
 
 msgid "Restaurant. Fast food"
-msgstr ""
+msgstr "Restaurante Fast Food"
 
 msgid "Hotel"
-msgstr ""
+msgstr "Hotel"
 
 msgid "Car parking"
-msgstr ""
+msgstr "Estacionamento"
 
 msgid "Fuel station"
-msgstr ""
+msgstr "Posto de combustível"
 
 msgid "Bank"
-msgstr ""
+msgstr "Banco"
 
 msgid "Hospital"
-msgstr ""
+msgstr "Hospital"
 
 msgid "Cinema"
-msgstr ""
+msgstr "Cinema"
 
 msgid "Train station"
-msgstr ""
+msgstr "Estação de trem"
 
 msgid "School"
-msgstr ""
+msgstr "Escola"
 
 msgid "Police"
-msgstr ""
+msgstr "Polícia"
 
 msgid "Justice"
-msgstr ""
+msgstr "Justiça"
 
 msgid "Taxi"
-msgstr ""
+msgstr "Táxi"
 
 msgid "Shopping"
-msgstr ""
+msgstr "Comprando"
 
 msgid "Distance from screen center (km)"
-msgstr ""
+msgstr "Distância do centro da tela (km)"
 
 #, c-format
 msgid "POI %s. %s"
-msgstr ""
+msgstr "POI %s. %s"
 
 #, c-format
 msgid "Set destination to %ld, %ld \n"
-msgstr ""
+msgstr "Definir destino para %ld, %ld \n"
 
 #, c-format
 msgid "Set map to %ld, %ld \n"
-msgstr ""
+msgstr "Definir mapa para o %ld, %ld \n"
 
 #, c-format
 msgid "Set next visit to %ld, %ld \n"
-msgstr ""
+msgstr "Definir próxima parada parao %ld, %ld \n"
 
 msgid "POI search"
-msgstr ""
+msgstr "Pesquisar POI"
 
 msgid "Select a category"
-msgstr ""
+msgstr "Selecione uma categoria"
 
 msgid "Select a distance to look for (km)"
-msgstr ""
+msgstr "Selecione a distância para pesquisar (km)"
 
 msgid "Select a POI"
-msgstr ""
+msgstr "Selecione um POI"
 
 msgid " "
-msgstr ""
+msgstr " "
 
 msgid "Category"
-msgstr ""
+msgstr "Categoria"
 
 msgid "Direction"
-msgstr ""
+msgstr "Direção"
 
 msgid "Distance(m)"
-msgstr ""
+msgstr "Distância (m)"
 
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 msgid "Visit Before"
-msgstr ""
+msgstr "Visitar Antes"
 
 msgid "N"
 msgstr "N"
@@ -1700,6 +1770,9 @@ msgstr "Remover resultados da pesquisa do mapa"
 msgid "Show results on the map"
 msgstr "Exibir resultados no mapa"
 
+msgid "Foursquare"
+msgstr "Foursquare"
+
 msgid "Cut Bookmark"
 msgstr "Recortar Favorito"
 
@@ -1832,7 +1905,7 @@ msgstr "Digite as coordenadas"
 #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
 #. gui_internal_widget_append(w, we)
 msgid "Latitude Longitude"
-msgstr ""
+msgstr "Latitude Longitude"
 
 msgid "Enter coordinates, for example:"
 msgstr "Digite as coordenadas, por exemplo:"
@@ -1868,7 +1941,7 @@ msgid "Route Description"
 msgstr "Descrição da Rota"
 
 msgid "Show Locale"
-msgstr "Mostrar a Localidade"
+msgstr "Inf. Regionais"
 
 msgid "Former Destinations"
 msgstr "Destinos Anteriores"
@@ -1921,7 +1994,7 @@ msgstr "Cidades"
 
 #. Android resource: @strings/position_popup_drive_here
 msgid "Route to here"
-msgstr "Rotear até aqui"
+msgstr "Rota até aqui"
 
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr "Dados do mapa (c) colaboradores OpenStreetMap, ODBL"
@@ -2375,7 +2448,7 @@ msgid "Display"
 msgstr "Exibição"
 
 msgid "Fullscreen"
-msgstr "Tela Inteira"
+msgstr "Tela cheia"
 
 msgid "Window Mode"
 msgstr "Modo de Janela"
@@ -2387,14 +2460,14 @@ msgid ""
 "Drop last \n"
 "Waypoint"
 msgstr ""
-"Última Saída\n"
+"Remover último\n"
 "Ponto"
 
 msgid ""
 "Drop next \n"
 "Waypoint"
 msgstr ""
-"Saída próxima\n"
+"Remover próximo\n"
 "Ponto"
 
 msgid "Satellite Status"
@@ -2514,7 +2587,7 @@ msgstr "Mapas contendo localização atual"
 
 #. Android resource: @strings/address_search_title
 msgid "Address search"
-msgstr "busaca de endereço"
+msgstr "Pesquisar endereço"
 
 #. Android resource: @strings/address_enter_destination
 msgid "Enter destination"
diff --git a/po/ro.po.in b/po/ro.po.in
index 1b8a5d98..28801446 100644
--- a/po/ro.po.in
+++ b/po/ro.po.in
@@ -144,8 +144,10 @@ msgstr[0] "într-un kilometru"
 msgstr[1] "în %d kilometri"
 msgstr[2] "în %d de kilometri"
 
-msgid "exit"
-msgstr "ieșire"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "pe rampă"
@@ -175,33 +177,18 @@ msgstr "%s pe %s%s%s"
 msgid "%sinto the %s"
 msgstr "%s spre %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "la dreapta"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "la stânga"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "uşor "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "strâns "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "foarte puternic "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "necunoscut "
-
 msgid "When possible, please turn around"
 msgstr "Când este posibil, întoarceţi"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Urmați drumul pentru încă %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Intrați în curând în giratoriu"
 
@@ -210,56 +197,133 @@ msgstr "Intrați în curând în giratoriu"
 msgid "Enter the roundabout %s"
 msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "apoi ieșiți din giratoriu la %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Ieșiți din giratoriu la %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Urmați drumul pentru încă %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "curând"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "acum"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Virați %2s pe %1s stradă"
 
+msgid "right"
+msgstr "la dreapta"
+
 #, c-format
 msgid "after %i roads"
 msgstr "după %i străzi"
 
-msgid "now"
-msgstr "acum"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "apoi faceți %2s pe %1s stradă"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "eroare"
+msgid "easily "
+msgstr "uşor "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "strâns "
+
+msgid "left"
+msgstr "la stânga"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Virați %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "apoi virați %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "apoi ajungeți la destinație."
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Ați ajuns la destinație %s"
 
-msgid "then you have reached your destination."
-msgstr "apoi ajungeți la destinație."
+msgid "exit"
+msgstr "ieșire"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1319,11 +1383,13 @@ msgstr "* Necunoscut, adaugă eticheta is_in tags acestor orașe"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1687,6 +1753,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Taie semnul de carte"
 
diff --git a/po/ru.po.in b/po/ru.po.in
index 3cbf0602..2425647d 100644
--- a/po/ru.po.in
+++ b/po/ru.po.in
@@ -18,28 +18,26 @@
 # Sergey Shilov https://launchpad.net/~sss-s-s-s
 # Takuto https://launchpad.net/~takutoatmorgue
 # Usul https://launchpad.net/~usul1
-# Vlad https://launchpad.net/~send-me-letter
 # cmdrhenner https://launchpad.net/~cmdrhenner
 # jmb_kz https://launchpad.net/~jmb-kz
 # kisaa https://launchpad.net/~alex-kisaa
 # kisaa https://launchpad.net/~kisaa-mail
+# tryagain https://launchpad.net/~mdankov
 # zcc https://launchpad.net/~zcc
 # Павел https://launchpad.net/~pavel-sgn
+
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-14 23:10-0800\n"
-"PO-Revision-Date: 2014-12-21 21:24+0000\n"
-"Last-Translator: tryagain <mdankov@yandex.ru>\n"
+"PO-Revision-Date: 2015-04-03 18:26+0000\n"
+"Last-Translator: Nkolay Parukhin <parukhin@gmail.com>\n"
 "Language-Team: Rustam T. Usmanov\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2014-12-21 21:28+0000\n"
-"X-Generator: Launchpad (build 17286)\n"
 "Language: ru\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -162,8 +160,10 @@ msgstr[0] "через %d километр"
 msgstr[1] "%d километра"
 msgstr[2] "%d километров"
 
-msgid "exit"
-msgstr "съезд"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "съезд на"
@@ -193,33 +193,18 @@ msgstr "%s на %s%s%s"
 msgid "%sinto the %s"
 msgstr "%s на %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "направо"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "налево"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "немного "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "круто "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "очень круто "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "неизвестно "
-
 msgid "When possible, please turn around"
 msgstr "Развернитесь, пожалуйста, если это возможно"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Двигайтесь по дороге следующие %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Скоро круговое движение"
 
@@ -228,56 +213,133 @@ 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 %s"
-msgstr "потом съезжайте с кругового движения на %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Съезжайте с кругового движения на %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Двигайтесь по дороге следующие %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "скоро"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "сейчас"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Выезжайте на %1$s дорогу в направлении %2$s"
 
+msgid "right"
+msgstr "направо"
+
 #, c-format
 msgid "after %i roads"
 msgstr "после %i дорог"
 
-msgid "now"
-msgstr "сейчас"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "затем выезжайте на дорогу %1$s в направлении %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "ошибка"
+msgid "easily "
+msgstr "немного "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "круто "
+
+msgid "left"
+msgstr "налево"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Сверните %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "после чего поверните %1$s%2$s на %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
+msgstr "после чего вы прибудете в пункт назначения"
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Вы прибыли в пункт назначения %s"
 
-msgid "then you have reached your destination."
-msgstr "после чего вы прибудете в пункт назначения"
+msgid "exit"
+msgstr "съезд"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr "%s %s"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1337,19 +1399,14 @@ msgstr "* Неизвестный, для выбора городов добав�
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
-"Использование navit:\n"
-"navit [параметры] [файл_настроек]\n"
-"\t-c <файл>: использовать <файл> с настройками\n"
-"\t-d <n>: установить уровень отладочных сообщений <n> (0-3). Имеет приоритет "
-"над параметром в файле настроек.\n"
-"\t-h: показать эту подсказку и выйти.\n"
-"\t-v: показать информацию о версии и выйти.\n"
 
 #. We have not found an existing config file from all possibilities
 msgid "No config file navit.xml, navit.xml.local found\n"
@@ -1714,6 +1771,9 @@ msgstr "Удалить результаты поиска с карты"
 msgid "Show results on the map"
 msgstr "Показать результаты поиска на карте"
 
+msgid "Foursquare"
+msgstr "Foursquare"
+
 msgid "Cut Bookmark"
 msgstr "Вырезать закладку"
 
@@ -2629,20 +2689,3 @@ msgstr "Резервное копирование"
 #. Android resource: @strings/restore
 msgid "Restore"
 msgstr "Восстановление из копии"
-
-#. Android resource: @strings/TTS_title_data_missing
-msgid "System text to speech engine data is missing"
-msgstr "Отсутствуют данные системного приложения преобразования текста в речь"
-
-#. Android resource: @strings/TTS_qery_install_data
-msgid ""
-"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?"
-msgstr ""
-"Navit может использовать любое приложение преобразования текста в "
-"речь, установленное на Вашем устройстве. Активное сейчас приложение "
-"сообщило о невозможности говорить на Вашем языке. Попросим систему "
-"показать диалог загрузки голосовых данных?"
-
-
diff --git a/po/sc.po.in b/po/sc.po.in
index 59057402..da2d2e59 100644
--- a/po/sc.po.in
+++ b/po/sc.po.in
@@ -132,8 +132,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "in unu chilometru"
 msgstr[1] "in %d chilometroso"
 
-msgid "exit"
-msgstr "essi"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "in sa rampa"
@@ -163,91 +165,153 @@ msgstr "%s in su %s%s%s"
 msgid "%sinto the %s"
 msgstr "%s in sa %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "destra"
+msgid "When possible, please turn around"
+msgstr "Commente possibile torra in daesecusu"
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "manca"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "fatzilmente "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Sichi s'istrada fintzasa a %s"
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "fortemente "
+msgid "Enter the roundabout soon"
+msgstr ""
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "meda forte "
+#. 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 ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "inconnottu "
+#. 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 ""
 
-msgid "When possible, please turn around"
-msgstr "Commente possibile torra in daesecusu"
+msgid "soon"
+msgstr "prestu"
 
-msgid "Enter the roundabout soon"
+msgid "now"
+msgstr "como"
+
+msgid "then"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "tando lassa sa rotatoria a %s"
+msgid "%1$s merge right %2$s"
+msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "lassa sa rotatoria a %s"
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Sichi s'istrada fintzasa a %s"
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
 
-msgid "soon"
-msgstr "prestu"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Pica sa %1$s istrada a %2$s"
 
+msgid "right"
+msgstr "destra"
+
 #, c-format
 msgid "after %i roads"
 msgstr "dopu %i istradasa"
 
-msgid "now"
-msgstr "como"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "tando pica sa %1$s istrada a %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "errore"
+msgid "easily "
+msgstr "fatzilmente "
+
+msgid "strongly "
+msgstr "fortemente "
+
+msgid "left"
+msgstr "manca"
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Zira %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "tando zira %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
+msgstr "tando ses arribbau"
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Ses arribbau a %s"
 
-msgid "then you have reached your destination."
-msgstr "tando ses arribbau"
+msgid "exit"
+msgstr "essi"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1307,11 +1371,13 @@ msgstr "* Inconnottu, pone sa tag is_in in custas zittadese"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1675,6 +1741,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Moghe"
 
diff --git a/po/si.po.in b/po/si.po.in
index 5cdac10d..3a4d1437 100644
--- a/po/si.po.in
+++ b/po/si.po.in
@@ -132,8 +132,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "කිලෝ මීටරයකින්"
 msgstr[1] "කිලෝ මීටර %d කින්"
 
-msgid "exit"
-msgstr "පිටවුම"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "රැම්පය තුළට"
@@ -163,91 +165,153 @@ msgstr "%s %s %s %s තුළට | උදාසීන ආකාරය"
 msgid "%sinto the %s"
 msgstr "%s %s තුළට"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "දකුණ"
+msgid "When possible, please turn around"
+msgstr "හැකියාව ඇතිවිට දී, කරුණාකර හැරෙන්න."
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "වම"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "පහසුවෙන් "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "මීළඟ %s දක්වා මාර්ගය හඹායන්න."
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "ශක්තිමත් ලෙස "
+msgid "Enter the roundabout soon"
+msgstr ""
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-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 ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-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 ""
 
-msgid "When possible, please turn around"
-msgstr "හැකියාව ඇතිවිට දී, කරුණාකර හැරෙන්න."
+msgid "soon"
+msgstr "ලඟදීම"
 
-msgid "Enter the roundabout soon"
+msgid "now"
+msgstr "දැන්"
+
+msgid "then"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "එවිට %s හිදී වටරවුමෙන් ඉවත්වන්න."
+msgid "%1$s merge right %2$s"
+msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "%s හිදී වටරවුමෙන් ඉවත්වන්න."
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "මීළඟ %s දක්වා මාර්ගය හඹායන්න."
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
 
-msgid "soon"
-msgstr "ලඟදීම"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "ගන්න %1$s මාර්ගය %2$s ට"
 
+msgid "right"
+msgstr "දකුණ"
+
 #, c-format
 msgid "after %i roads"
 msgstr "මාර්ග %i පසු"
 
-msgid "now"
-msgstr "දැන්"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "එවිට ගන්න %1$s මාර්ගය %2$s ට"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "දෝෂය"
+msgid "easily "
+msgstr "පහසුවෙන් "
+
+msgid "strongly "
+msgstr "ශක්තිමත් ලෙස "
+
+msgid "left"
+msgstr "වම"
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "%1$s%2$s %3$s%4$s හරවන්න"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "එවිට හරවන්න %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
+msgstr "එවිට ඔබ ඔබේ ගමනාන්තයට ළඟා වී ඇත."
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "ඔබ ඔබේ ගමනාන්තය වන %s ට ළඟා වී ඇත."
 
-msgid "then you have reached your destination."
-msgstr "එවිට ඔබ ඔබේ ගමනාන්තයට ළඟා වී ඇත."
+msgid "exit"
+msgstr "පිටවුම"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1307,11 +1371,13 @@ msgstr "*නොදන්නා, යි_යේ ලේබල එම නගර ව�
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1675,6 +1741,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "පිටුසන කපන්න"
 
diff --git a/po/sk.po.in b/po/sk.po.in
index 86f39c65..a7c17ab3 100644
--- a/po/sk.po.in
+++ b/po/sk.po.in
@@ -7,7 +7,6 @@
 # GizmoSK https://launchpad.net/~gizmosk
 # KaZeR https://launchpad.net/~kazer
 # Miroslav Ďurian https://launchpad.net/~aasami
-# Prescott_SK https://launchpad.net/~prescott66
 # helix84 https://launchpad.net/~helix84
 # kayle.sk https://launchpad.net/~kayle.sk
 # laznik https://launchpad.net/~orders-strings
@@ -16,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-11-07 17:39+0000\n"
+"PO-Revision-Date: 2014-11-15 22:08+0000\n"
 "Last-Translator: GizmoSK <gizmosk@gmail.com>\n"
 "Language-Team: Slovenčina\n"
 "MIME-Version: 1.0\n"
@@ -145,8 +144,10 @@ msgstr[0] "o %d kilometrov"
 msgstr[1] "o jeden kilometer"
 msgstr[2] "o %d kilometre"
 
-msgid "exit"
-msgstr "výjazd"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "na privádzač"
@@ -176,33 +177,18 @@ msgstr "%s do %s%s%s"
 msgid "%sinto the %s"
 msgstr "%s na %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "vpravo"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "vľavo"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "mierne "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "prudko "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "naozaj silno "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "neznámy "
-
 msgid "When possible, please turn around"
 msgstr "Ak to bude možné, prosím, otočte sa"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Pokračujte naďalej po ceste %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Vstúpte do kruhového objazdu onedlho"
 
@@ -211,56 +197,133 @@ msgstr "Vstúpte do kruhového objazdu onedlho"
 msgid "Enter the roundabout %s"
 msgstr "Vojdite do kruhového objazdu %s"
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "potom opustite kruhový objazd na %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Opustite kruhový objazd na %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Pokračujte naďalej po ceste %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "onedlho"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "teraz"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Choďte %1$s cestou na %2$s"
 
+msgid "right"
+msgstr "vpravo"
+
 #, c-format
 msgid "after %i roads"
 msgstr "po %i cestách"
 
-msgid "now"
-msgstr "teraz"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "potom nasledujte cestu %1$s do %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "chyba"
+msgid "easily "
+msgstr "mierne "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "prudko "
+
+msgid "left"
+msgstr "vľavo"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Odbočte %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "potom %1$s odbočte %2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
+msgstr "potom dosiahnete svoj cieľ cesty"
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Dorazili ste do svojho cieľa %s"
 
-msgid "then you have reached your destination."
-msgstr "potom dosiahnete svoj cieľ cesty"
+msgid "exit"
+msgstr "výjazd"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1320,19 +1383,14 @@ msgstr "* Neznáme, pridajte is_in tag v týchto mestách."
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
-"navit použitie:\n"
-"navit [options] [configfile]\n"
-"\t-c <file>: použiť <file> ako konfiguračný súbor\n"
-"\t-d <n>: nastaviť globálnu výstupnú ladiacu úroveň na <n> (0-3). Preťaží "
-"nastavenia z konfiguračného súboru.\n"
-"\t-h: vytlačiť túto informáciu použitia a ukončiť.\n"
-"\t-v: Vytlačiť verziu a ukončiť.\n"
 
 #. We have not found an existing config file from all possibilities
 msgid "No config file navit.xml, navit.xml.local found\n"
@@ -1698,6 +1756,9 @@ msgstr "Odstrániť výsledky vyhľadávania z mapy"
 msgid "Show results on the map"
 msgstr "Zobraziť výsledky vyhľadávania na mape"
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Vystrihnúť záložku"
 
diff --git a/po/sl.po.in b/po/sl.po.in
index 6174710b..1c1f2d42 100644
--- a/po/sl.po.in
+++ b/po/sl.po.in
@@ -140,8 +140,10 @@ msgstr[1] "Čez %d kilometer"
 msgstr[2] "Čez %d kilometra"
 msgstr[3] "Čez %d kilometre"
 
-msgid "exit"
-msgstr "odcep"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr ""
@@ -171,33 +173,18 @@ msgstr "%sna %s%s%s"
 msgid "%sinto the %s"
 msgstr "%sna %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "desno"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "levo"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "rahlo "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "ostro "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "zelo močno "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "neznano "
-
 msgid "When possible, please turn around"
 msgstr "Obrnite čim bo to mogoče"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Ostanite na tej cesti naslednjih %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Kmalu zapeljite v krožišče"
 
@@ -206,56 +193,133 @@ 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 %s"
+msgid "then leave the roundabout at the %1$s %2$s"
 msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "Leave the roundabout at the %1$s %2$s"
 msgstr ""
 
-#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Ostanite na tej cesti naslednjih %s"
-
 msgid "soon"
 msgstr "kmalu"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "sedaj"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Zavijte na %2$s v %1$so cesto"
 
+msgid "right"
+msgstr "desno"
+
 #, c-format
 msgid "after %i roads"
 msgstr "čez %i cest"
 
-msgid "now"
-msgstr "sedaj"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "nato zavijte na %2$s v %1$so cesto"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "napaka"
+msgid "easily "
+msgstr "rahlo "
+
+msgid "strongly "
+msgstr "ostro "
+
+msgid "left"
+msgstr "levo"
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "%3$s zavijte %1$s%2$s %4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "nato zavijte %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
+msgstr "in ste na cilju."
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "%s ste na cilju"
 
-msgid "then you have reached your destination."
-msgstr "in ste na cilju."
+msgid "exit"
+msgstr "odcep"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1315,11 +1379,13 @@ msgstr "*Neznan dodatek  v oznakah za ta mesta"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1683,6 +1749,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/sr.po.in b/po/sr.po.in
index 0e5db34b..a9672a43 100644
--- a/po/sr.po.in
+++ b/po/sr.po.in
@@ -7,14 +7,15 @@
 # Slobodan Simić https://launchpad.net/~slsimic
 # momcilo https://launchpad.net/~momcilo-majic
 # Мирослав Николић https://launchpad.net/~lipek
+# Саша Петровић https://launchpad.net/~salepetronije
 
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-09-28 01:44+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
-"Language-Team: Launchpad Serbian Translators\n"
+"PO-Revision-Date: 2015-02-08 21:50+0000\n"
+"Last-Translator: Саша Петровић <salepetronije@gmail.com>\n"
+"Language-Team: српски <xfce4@xfce4.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +25,7 @@ msgstr ""
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
-msgstr "Покренут из изворног директоријума\n"
+msgstr "Покренут из изворне фасцикле\n"
 
 #, c-format
 msgid "setting '%s' to '%s'\n"
@@ -50,7 +51,7 @@ msgid "fifth"
 msgstr "пето"
 
 msgid "sixth"
-msgstr "шестп"
+msgstr "шесто"
 
 #. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
@@ -84,11 +85,11 @@ msgstr "за %d м"
 
 #, c-format
 msgid "%d feet"
-msgstr ""
+msgstr "%d стопа"
 
 #, c-format
 msgid "in %d feet"
-msgstr ""
+msgstr "за %d стопе"
 
 #, c-format
 msgid "%d meters"
@@ -100,11 +101,11 @@ msgstr "за %d метара"
 
 #, c-format
 msgid "%d.%d miles"
-msgstr ""
+msgstr "%d.%d миља"
 
 #, c-format
 msgid "in %d.%d miles"
-msgstr ""
+msgstr "за %d.%d миља"
 
 #, c-format
 msgid "%d.%d kilometers"
@@ -117,14 +118,16 @@ msgstr "за %d.%d километара"
 #, c-format
 msgid "one mile"
 msgid_plural "%d miles"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d миља"
+msgstr[1] "%d миље"
+msgstr[2] "%d миља"
 
 #, c-format
 msgid "in one mile"
 msgid_plural "in %d miles"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "кроз %d миља"
+msgstr[1] "кроз %d миље"
+msgstr[2] "кроз %d миља"
 
 #, c-format
 msgid "one kilometer"
@@ -140,8 +143,10 @@ msgstr[0] "за %d километара"
 msgstr[1] "за %d километара"
 msgstr[2] "за %d километара"
 
-msgid "exit"
-msgstr "излаз"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "на нагибу"
@@ -171,32 +176,17 @@ msgstr "%sу %s%s%s"
 msgid "%sinto the %s"
 msgstr "%sна %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "десно"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "лево"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "лако "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "јако "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "веома јако "
+msgid "When possible, please turn around"
+msgstr "Када буде могуће, променити смер"
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "непознат "
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
 
-msgid "When possible, please turn around"
-msgstr "По могућству, променити смер"
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Прати пут до следећег %s"
 
 msgid "Enter the roundabout soon"
 msgstr "Ускоро прелазак на обилазницу"
@@ -204,58 +194,135 @@ msgstr "Ускоро прелазак на обилазницу"
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
 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 ""
+
+#. 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 ""
+
+msgid "soon"
+msgstr "ускоро"
+
+msgid "now"
+msgstr "сад"
+
+msgid "then"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "потом напутстите обилазницу на %s"
+msgid "%1$s merge left %2$s"
+msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Напуштање обилазнице за %s"
+msgid "%1$s merge right %2$s"
+msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Прати пут до следећег %s"
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
 
-msgid "soon"
-msgstr "ускоро"
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Прати %1$s пут до %2$s"
 
+msgid "right"
+msgstr "десно"
+
 #, c-format
 msgid "after %i roads"
 msgstr "после %i путева"
 
-msgid "now"
-msgstr "сад"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "потом прати пут %1$s до %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
+
+msgid "easily "
+msgstr "лако "
 
-msgid "error"
-msgstr "грешка"
+msgid "strongly "
+msgstr "јако "
+
+msgid "left"
+msgstr "лево"
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Скрени %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "потом скрени %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "потом сте стигли на своје одредиште."
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Стигли сте на одредиште %s"
 
-msgid "then you have reached your destination."
-msgstr "потом сте стигли на Ваше одредиште."
+msgid "exit"
+msgstr "излаз"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -268,10 +335,10 @@ msgid "Length"
 msgstr "Дужина"
 
 msgid "km"
-msgstr "км"
+msgstr "km"
 
 msgid "m"
-msgstr "м"
+msgstr "m"
 
 msgid "Time"
 msgstr "Време"
@@ -287,19 +354,19 @@ msgstr "План пута"
 
 #, c-format
 msgid "Waypoint %d"
-msgstr ""
+msgstr "Пролазна тачка %d"
 
 msgid "Visit before..."
-msgstr ""
+msgstr "Посети пре..."
 
 msgid "Set as position"
-msgstr "Постави као позицију"
+msgstr "Постави као положај"
 
 msgid "Set as destination"
 msgstr "Постави као одредиште"
 
 msgid "Add as bookmark"
-msgstr "Додај као пречицу"
+msgstr "Додај као забелешку"
 
 #, c-format
 msgid "Point 0x%x 0x%x"
@@ -523,7 +590,7 @@ msgstr "Зеленортска острва"
 
 #. 531
 msgid "Curacao"
-msgstr ""
+msgstr "Куракао"
 
 #. 162
 msgid "Christmas Island"
@@ -855,7 +922,7 @@ msgstr "Летонија"
 
 #. 434
 msgid "Libya"
-msgstr ""
+msgstr "Либија"
 
 #. 504
 msgid "Morocco"
@@ -1143,7 +1210,7 @@ msgstr "Суринам"
 
 #. 728
 msgid "South Sudan"
-msgstr ""
+msgstr "Јужни Судан"
 
 #. 678
 msgid "Sao Tome and Principe"
@@ -1155,7 +1222,7 @@ msgstr "Салвадор"
 
 #. 534
 msgid "Sint Maarten (Dutch part)"
-msgstr ""
+msgstr "Свети Мартин (Холандски део)"
 
 #. 760
 msgid "Syrian Arab Republic"
@@ -1310,51 +1377,57 @@ msgid "Zimbabwe"
 msgstr "Зимбабве"
 
 msgid "* Unknown, add is_in tags to those cities"
-msgstr "* Непознато, додај is_in  таг у ове градове"
+msgstr "* Непознато, додатак је у is_in ознакама ових градова"
 
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
 msgid "No config file navit.xml, navit.xml.local found\n"
 msgstr ""
+"Нема датотеке подешавања navit.xml, navit.xml.сопствени је пронађен\n"
 
 #, c-format
 msgid "Error parsing config file '%s': %s\n"
 msgstr ""
+"Десила се грешка приликом рашчлањивања датотеке подешавања „%s“: %s\n"
 
 #, c-format
 msgid "Using config file '%s'\n"
-msgstr ""
+msgstr "Користим датотеку подешавања „%s“\n"
 
 #, c-format
 msgid "Error: No configuration found in config file '%s'\n"
-msgstr ""
+msgstr "ГРЕШКА: Нису пронађене поставке у датотеци подешавања „%s“\n"
 
 msgid ""
 "Internal initialization failed, exiting. Check previous error messages.\n"
 msgstr ""
+"Није успело унутрашње покретање, излазим. Проверите претходне поруке "
+"грешака.\n"
 
 msgid "unknown street"
-msgstr ""
+msgstr "непозната улица"
 
 #. Safe cast: attr_generic_set_attr does not modify its parameter.
 msgid "Unnamed vehicle"
-msgstr ""
+msgstr "Неимановано возила"
 
 msgid "Failed to write bookmarks file"
-msgstr ""
+msgstr "Нисам успео да пишем у датотеци забелешки"
 
 #. Strings from navit_shipped.xml
 msgid "Map Point"
-msgstr "Тачка на мапи"
+msgstr "Тачка на карти"
 
 msgid "Car"
 msgstr "Кола"
@@ -1418,7 +1491,7 @@ msgid "_Bookmarks"
 msgstr "Обележивачи"
 
 msgid "_Map"
-msgstr "Карта"
+msgstr "_Карта"
 
 msgid "_Layout"
 msgstr "Распоред"
@@ -1445,22 +1518,22 @@ msgid "_Recalculate"
 msgstr "Прерачунај"
 
 msgid "Redraw map"
-msgstr "Освежи мапу"
+msgstr "Освежи карту"
 
 msgid "_Info"
 msgstr "Подаци"
 
 msgid "Set _destination"
-msgstr ""
+msgstr "Постави _одредиште"
 
 msgid "Opens address search dialog"
 msgstr "Отвара дијалог претраге адресе"
 
 msgid "_POI search"
-msgstr ""
+msgstr "Претрага занимљивих тачака_"
 
 msgid "Opens POI search dialog"
-msgstr ""
+msgstr "Отвори прозор претраге занимљивих тачака"
 
 msgid "_Stop Navigation"
 msgstr "Заустави навигацију"
@@ -1475,13 +1548,13 @@ msgid "Quit the application"
 msgstr "Изађите из програма"
 
 msgid "Show position _cursor"
-msgstr ""
+msgstr "Прикажи _показивач положаја"
 
 msgid "_Lock on Road"
 msgstr "Прати пут"
 
 msgid "_Keep orientation to the North"
-msgstr ""
+msgstr "_Држи усмерење према северу"
 
 msgid "Switches map orientation to the north or the vehicle"
 msgstr "Пребацује усмерење карте на север или на правац возила"
@@ -1505,98 +1578,98 @@ msgid "Data"
 msgstr "Подаци"
 
 msgid "Pharmacy"
-msgstr ""
+msgstr "Апотека"
 
 msgid "Restaurant"
-msgstr ""
+msgstr "Одмориште"
 
 msgid "Restaurant. Fast food"
-msgstr ""
+msgstr "Одмориште. Брза храна"
 
 msgid "Hotel"
-msgstr ""
+msgstr "Хотел"
 
 msgid "Car parking"
-msgstr ""
+msgstr "Паркинг"
 
 msgid "Fuel station"
-msgstr ""
+msgstr "Бензинска пумпа"
 
 msgid "Bank"
-msgstr ""
+msgstr "Банка"
 
 msgid "Hospital"
-msgstr ""
+msgstr "Болница"
 
 msgid "Cinema"
-msgstr ""
+msgstr "Биоскоп"
 
 msgid "Train station"
-msgstr ""
+msgstr "Возна станица"
 
 msgid "School"
-msgstr ""
+msgstr "Школа"
 
 msgid "Police"
-msgstr ""
+msgstr "Полиција"
 
 msgid "Justice"
-msgstr ""
+msgstr "Суд"
 
 msgid "Taxi"
-msgstr ""
+msgstr "Такси"
 
 msgid "Shopping"
-msgstr ""
+msgstr "Куповина"
 
 msgid "Distance from screen center (km)"
-msgstr ""
+msgstr "Растојање од средишта екрана (km)"
 
 #, c-format
 msgid "POI %s. %s"
-msgstr ""
+msgstr "Занимљива тачка %s. %s"
 
 #, c-format
 msgid "Set destination to %ld, %ld \n"
-msgstr ""
+msgstr "Постави одредиште на %ld, %ld \n"
 
 #, c-format
 msgid "Set map to %ld, %ld \n"
-msgstr ""
+msgstr "Постави карту на %ld, %ld \n"
 
 #, c-format
 msgid "Set next visit to %ld, %ld \n"
-msgstr ""
+msgstr "Постави следећу посету на %ld, %ld \n"
 
 msgid "POI search"
-msgstr ""
+msgstr "Претрага занимљивих тачака"
 
 msgid "Select a category"
-msgstr ""
+msgstr "Изаберите врсту"
 
 msgid "Select a distance to look for (km)"
-msgstr ""
+msgstr "Изаберите даљину претраге (km)"
 
 msgid "Select a POI"
-msgstr ""
+msgstr "Изаберите занимљиву тачку"
 
 msgid " "
-msgstr ""
+msgstr " "
 
 msgid "Category"
-msgstr ""
+msgstr "Врста"
 
 msgid "Direction"
-msgstr ""
+msgstr "Правац"
 
 msgid "Distance(m)"
-msgstr ""
+msgstr "Растојање(m)"
 
 msgid "Name"
-msgstr ""
+msgstr "Име"
 
 msgid "Visit Before"
-msgstr ""
+msgstr "Посети пре"
 
 msgid "N"
 msgstr "С"
@@ -1647,16 +1720,16 @@ msgstr "Помоћ"
 
 #, c-format
 msgid "Waypoint %s"
-msgstr ""
+msgstr "Пролазна тачка %s"
 
 msgid "Select waypoint to insert the new one before"
-msgstr ""
+msgstr "Изаберите пролазну тачку за унос пре претходне"
 
 msgid "View in Browser"
 msgstr "Погледај у претраживачу"
 
 msgid "Item type"
-msgstr ""
+msgstr "Врста ставке"
 
 #. Android resource: @strings/address_search_streets
 msgid "Streets"
@@ -1669,18 +1742,21 @@ msgid "View Attributes"
 msgstr "Преглед особина"
 
 msgid "Set as position (and deactivate vehicle)"
-msgstr ""
+msgstr "Постави као положај (и искључи возило)"
 
 msgid "POIs"
 msgstr "Тачке интересовања"
 
 msgid "View on map"
-msgstr "Погледај на мапи"
+msgstr "Погледај на карти"
 
 msgid "Remove search results from the map"
-msgstr ""
+msgstr "Уклони излазе из претраге са карте"
 
 msgid "Show results on the map"
+msgstr "Прикажи излазе претраге на карти"
+
+msgid "Foursquare"
 msgstr ""
 
 msgid "Cut Bookmark"
@@ -1699,26 +1775,26 @@ msgid "Delete Bookmark"
 msgstr "Обриши обележивач"
 
 msgid "Delete waypoint"
-msgstr ""
+msgstr "Избриши пролазну тачку"
 
 msgid "Bookmarks"
 msgstr "Обележивачи"
 
 msgid "Bookmarks as waypoints"
-msgstr ""
+msgstr "Обележивачи као пролазне тачке"
 
 msgid "Save waypoints"
-msgstr ""
+msgstr "Сачувај пролазне тачке"
 
 msgid "Replace with waypoints"
-msgstr ""
+msgstr "Замени пролазним тачкама"
 
 msgid "Delete Folder"
-msgstr ""
+msgstr "Избриши фасциклу"
 
 #. Adds the Bookmark folders
 msgid "Add Bookmark folder"
-msgstr "Додај фолдер са обележивачима"
+msgstr "Додај фасциклу са обележивачима"
 
 #. Pastes the Bookmark
 msgid "Paste bookmark"
@@ -1730,19 +1806,19 @@ msgstr "Обележи %s"
 
 #, c-format
 msgid "Download %s"
-msgstr ""
+msgstr "Преузми %s"
 
 msgid "Map Download"
-msgstr ""
+msgstr "Преузимање карте"
 
 msgid "Active"
-msgstr ""
+msgstr "Радно"
 
 msgid "Download Enabled"
-msgstr ""
+msgstr "Преузимање је омогућено"
 
 msgid "Download completely"
-msgstr ""
+msgstr "Преузми потпуно"
 
 msgid "Show Satellite Status"
 msgstr "Прикажи стање сателита"
@@ -1803,10 +1879,10 @@ msgid "members and contributors."
 msgstr "чланови и доприносиоци"
 
 msgid "Waypoints"
-msgstr ""
+msgstr "Пролазне тачке"
 
 msgid "Enter Coordinates"
-msgstr ""
+msgstr "Унесите координате"
 
 #. 
 #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
@@ -1815,10 +1891,10 @@ msgstr ""
 #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
 #. gui_internal_widget_append(w, we)
 msgid "Latitude Longitude"
-msgstr ""
+msgstr "Географска ширина и дужина"
 
 msgid "Enter coordinates, for example:"
-msgstr ""
+msgstr "Унесите координате, на пример:"
 
 msgid "Vehicle"
 msgstr "Возило"
@@ -1830,16 +1906,16 @@ msgid "Lock on road"
 msgstr "Прати пут"
 
 msgid "Northing"
-msgstr "Ништа"
+msgstr "Управљање по северу"
 
 msgid "Map follows Vehicle"
-msgstr "Мапа прати возило"
+msgstr "Карта прати возило"
 
 msgid "Plan with Waypoints"
-msgstr ""
+msgstr "Планирање уз помоћ пролазних тачака"
 
 msgid "Maps"
-msgstr "Мапе"
+msgstr "Карте"
 
 msgid "Layout"
 msgstr "Распоред"
@@ -1848,16 +1924,16 @@ msgid "Height Profile"
 msgstr "Висински профил"
 
 msgid "Route Description"
-msgstr "Опис руте"
+msgstr "Опис путање"
 
 msgid "Show Locale"
-msgstr "Прикажи име локализације"
+msgstr "Прикажи име превода"
 
 msgid "Former Destinations"
 msgstr "Претходна одредишта"
 
 msgid "- No former destinations available -"
-msgstr ""
+msgstr "- Нису доступна претходна одредишта -"
 
 msgid "Message"
 msgstr "Порука"
@@ -1866,7 +1942,7 @@ msgid "Back"
 msgstr "Назад"
 
 msgid "Back to map"
-msgstr "Назад на мапу"
+msgstr "Назад на карту"
 
 msgid "Main Menu"
 msgstr "Главни мени"
@@ -1875,93 +1951,93 @@ msgid "House number"
 msgstr "Кућни број"
 
 msgid "Next"
-msgstr ""
+msgstr "Следеће"
 
 msgid "Prev"
-msgstr ""
+msgstr "Претходно"
 
 msgid "Return to route!"
-msgstr ""
+msgstr "Врати се на путању!"
 
 #. warning told
 msgid "Look out! Camera!"
-msgstr ""
+msgstr "Пажња! Камера!"
 
 #. warning told
 msgid "Please decrease your speed"
-msgstr ""
+msgstr "Молим, смањите брзину"
 
 msgid "partial match"
-msgstr ""
+msgstr "делимично поклапање"
 
 #. Android resource: @strings/address_search_button
 msgid "Search"
-msgstr ""
+msgstr "Претражи"
 
 #. Android resource: @strings/address_search_towns
 msgid "Towns"
-msgstr ""
+msgstr "Градове"
 
 #. Android resource: @strings/position_popup_drive_here
 msgid "Route to here"
-msgstr ""
+msgstr "Путања довде"
 
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
-msgstr ""
+msgstr "Подаци карте (c) доприносиоци Отворене карте улица, ОДБЛ"
 
 msgid "Downloaded maps"
-msgstr ""
+msgstr "Преузете карте"
 
 msgid "Cancel"
-msgstr ""
+msgstr "Откажи"
 
 msgid "Whole Planet"
-msgstr ""
+msgstr "Читава планета"
 
 msgid "Africa"
-msgstr ""
+msgstr "Африка"
 
 msgid "Canary Islands"
-msgstr ""
+msgstr "Канарска Острва"
 
 msgid "Asia"
-msgstr ""
+msgstr "Азија"
 
 msgid "Korea"
-msgstr ""
+msgstr "Кореја"
 
 msgid "Taiwan"
-msgstr ""
+msgstr "Тајван"
 
 msgid "UAE+Other"
 msgstr ""
 
 msgid "Oceania"
-msgstr ""
+msgstr "Океанија"
 
 msgid "Tasmania"
-msgstr ""
+msgstr "Тасманија"
 
 msgid "Victoria"
-msgstr ""
+msgstr "Викторија"
 
 msgid "New South Wales"
-msgstr ""
+msgstr "Нови Јужни Велс"
 
 msgid "Europe"
-msgstr ""
+msgstr "Европа"
 
 msgid "Western Europe"
-msgstr ""
+msgstr "Западна Европа"
 
 msgid "Azores"
-msgstr ""
+msgstr "Азори"
 
 msgid "BeNeLux"
-msgstr ""
+msgstr "Бенелукс"
 
 msgid "Alsace"
-msgstr ""
+msgstr "Алзас"
 
 msgid "Aquitaine"
 msgstr ""
@@ -1976,13 +2052,13 @@ msgid "Bourgogne"
 msgstr ""
 
 msgid "Bretagne"
-msgstr ""
+msgstr "Бретања"
 
 msgid "Centre"
-msgstr ""
+msgstr "Средиште"
 
 msgid "Champagne-Ardenne"
-msgstr ""
+msgstr "Шампањ-Арден"
 
 msgid "Corse"
 msgstr ""
@@ -2003,10 +2079,10 @@ msgid "Limousin"
 msgstr ""
 
 msgid "Lorraine"
-msgstr ""
+msgstr "Лорена"
 
 msgid "Midi-Pyrenees"
-msgstr ""
+msgstr "Средњи Пиринеји"
 
 msgid "Nord-pas-de-Calais"
 msgstr ""
@@ -2054,16 +2130,16 @@ msgid "Unterfranken"
 msgstr ""
 
 msgid "Berlin"
-msgstr ""
+msgstr "Берлин"
 
 msgid "Brandenburg"
-msgstr ""
+msgstr "Бранденбург"
 
 msgid "Bremen"
-msgstr ""
+msgstr "Бремен"
 
 msgid "Hamburg"
-msgstr ""
+msgstr "Хамбург"
 
 msgid "Hessen"
 msgstr ""
@@ -2081,10 +2157,10 @@ msgid "Rheinland-Pfalz"
 msgstr ""
 
 msgid "Saarland"
-msgstr ""
+msgstr "Сарланд"
 
 msgid "Sachsen-Anhalt"
-msgstr ""
+msgstr "Саксонија-Анхалт"
 
 msgid "Sachsen"
 msgstr ""
@@ -2099,13 +2175,13 @@ msgid "Mallorca"
 msgstr ""
 
 msgid "Galicia"
-msgstr ""
+msgstr "Галиција"
 
 msgid "Scandinavia"
-msgstr ""
+msgstr "Скандинавија"
 
 msgid "England"
-msgstr ""
+msgstr "Енглеска"
 
 msgid "Buckinghamshire"
 msgstr ""
@@ -2120,13 +2196,13 @@ msgid "East yorkshire with hull"
 msgstr ""
 
 msgid "Essex"
-msgstr ""
+msgstr "Есекс"
 
 msgid "Herefordshire"
 msgstr ""
 
 msgid "Kent"
-msgstr ""
+msgstr "Кент"
 
 msgid "Lancashire"
 msgstr ""
@@ -2135,7 +2211,7 @@ msgid "Leicestershire"
 msgstr ""
 
 msgid "Norfolk"
-msgstr ""
+msgstr "Норфолк"
 
 msgid "Nottinghamshire"
 msgstr ""
@@ -2147,7 +2223,7 @@ msgid "Shropshire"
 msgstr ""
 
 msgid "Somerset"
-msgstr ""
+msgstr "Сомерсет"
 
 msgid "South yorkshire"
 msgstr ""
@@ -2162,25 +2238,25 @@ msgid "Wiltshire"
 msgstr ""
 
 msgid "Scotland"
-msgstr ""
+msgstr "Шкотска"
 
 msgid "Wales"
-msgstr ""
+msgstr "Велс"
 
 msgid "Crete"
 msgstr ""
 
 msgid "North America"
-msgstr ""
+msgstr "Северна Америка"
 
 msgid "Alaska"
-msgstr ""
+msgstr "Аљаска"
 
 msgid "Hawaii"
-msgstr ""
+msgstr "Хаваји"
 
 msgid "USA"
-msgstr ""
+msgstr "САД"
 
 msgid " (except Alaska and Hawaii)"
 msgstr ""
@@ -2189,85 +2265,85 @@ msgid "Midwest"
 msgstr ""
 
 msgid "Michigan"
-msgstr ""
+msgstr "Мичиген"
 
 msgid "Ohio"
-msgstr ""
+msgstr "Охајо"
 
 msgid "Northeast"
-msgstr ""
+msgstr "Североисток"
 
 msgid "Massachusetts"
-msgstr ""
+msgstr "Масачусец"
 
 msgid "Vermont"
-msgstr ""
+msgstr "Вермонт"
 
 msgid "Pacific"
-msgstr ""
+msgstr "Пацифик"
 
 msgid "South"
 msgstr ""
 
 msgid "Arkansas"
-msgstr ""
+msgstr "Арканзас"
 
 msgid "District of Columbia"
-msgstr ""
+msgstr "Колумбијски округ"
 
 msgid "Florida"
-msgstr ""
+msgstr "Флорида"
 
 msgid "Louisiana"
-msgstr ""
+msgstr "Луизијана"
 
 msgid "Maryland"
-msgstr ""
+msgstr "Мериленд"
 
 msgid "Mississippi"
-msgstr ""
+msgstr "Мисисипи"
 
 msgid "Oklahoma"
-msgstr ""
+msgstr "Оклахома"
 
 msgid "Texas"
-msgstr ""
+msgstr "Тексас"
 
 msgid "Virginia"
-msgstr ""
+msgstr "Вирџинија"
 
 msgid "West Virginia"
-msgstr ""
+msgstr "Западна Вирџинија"
 
 msgid "West"
-msgstr ""
+msgstr "Запад"
 
 msgid "Arizona"
-msgstr ""
+msgstr "Аризона"
 
 msgid "California"
-msgstr ""
+msgstr "Калифорнија"
 
 msgid "Colorado"
-msgstr ""
+msgstr "Колорадо"
 
 msgid "Idaho"
-msgstr ""
+msgstr "Ајдахо"
 
 msgid "Montana"
-msgstr ""
+msgstr "Монтана"
 
 msgid "New Mexico"
-msgstr ""
+msgstr "Нови Мексико"
 
 msgid "Nevada"
-msgstr ""
+msgstr "Невада"
 
 msgid "Oregon"
-msgstr ""
+msgstr "Орегон"
 
 msgid "Utah"
-msgstr ""
+msgstr "Јута"
 
 msgid "Washington State"
 msgstr ""
@@ -2279,24 +2355,24 @@ msgid "Guyane Francaise"
 msgstr ""
 
 msgid "downloading"
-msgstr ""
+msgstr "преузимање"
 
 #. Android resource: @strings/map_download_ready
 msgid "ready"
-msgstr ""
+msgstr "спремно"
 
 msgid "Error downloading map!"
-msgstr ""
+msgstr "Десила се грешка приликом преузимања карте!"
 
 #. Android resource: @strings/map_download_not_enough_free_space
 msgid "Not enough free space"
-msgstr ""
+msgstr "Нема довољно расположивог простора"
 
 msgid "Error writing map!"
-msgstr ""
+msgstr "Десила се грешка при упису карте!"
 
 msgid "Map download aborted!"
-msgstr ""
+msgstr "Преузимање карте је прекинуто!"
 
 #. Android resource: @strings/map_download_eta
 msgid "ETA"
@@ -2304,7 +2380,7 @@ msgstr ""
 
 #. Android resource: @strings/map_download_title
 msgid "Map download"
-msgstr ""
+msgstr "Преузимање карте"
 
 msgid "Vehicle Position"
 msgstr "Позиција возила"
@@ -2315,7 +2391,9 @@ msgstr "Главни мени"
 msgid ""
 "Show\n"
 "Map"
-msgstr "Прикажи мапу"
+msgstr ""
+"Прикажи\n"
+"карту"
 
 msgid "Settings"
 msgstr "Подешавања"
@@ -2339,9 +2417,11 @@ msgid ""
 "Former\n"
 "Destinations"
 msgstr ""
+"Претходна\n"
+"одредишта"
 
 msgid "Coordinates"
-msgstr ""
+msgstr "Координате"
 
 msgid ""
 "Stop\n"
@@ -2366,23 +2446,27 @@ msgid ""
 "Drop last \n"
 "Waypoint"
 msgstr ""
+"Одбаци последњу\n"
+"пролазну тачку"
 
 msgid ""
 "Drop next \n"
 "Waypoint"
 msgstr ""
+"Одбаци следећу\n"
+"пролазну тачку"
 
 msgid "Satellite Status"
-msgstr ""
+msgstr "Стање сателита"
 
 msgid "NMEA Data"
 msgstr ""
 
 msgid "car_shortest"
-msgstr ""
+msgstr "најкраћим_колима"
 
 msgid "car_avoid_tolls"
-msgstr ""
+msgstr "алати_избегавања_колима"
 
 msgid "car_pedantic"
 msgstr ""
@@ -2391,24 +2475,24 @@ msgid "horse"
 msgstr "коњ"
 
 msgid "Truck"
-msgstr ""
+msgstr "Камион"
 
 #. Strings from android/res/values/strings.xml
 #. Android resource: @strings/yes
 msgid "Yes"
-msgstr ""
+msgstr "Да"
 
 #. Android resource: @strings/notification_ticker
 msgid "Navit started"
-msgstr ""
+msgstr "Навит је покренут"
 
 #. Android resource: @strings/notification_event_default
 msgid "Navit running"
-msgstr ""
+msgstr "Навит је покренут"
 
 #. Android resource: @strings/initial_info_box_title
 msgid "Welcome to Navit"
-msgstr ""
+msgstr "Добродошли у Навит"
 
 #. Android resource: @strings/initial_info_box_message
 msgid ""
@@ -2421,161 +2505,171 @@ msgid ""
 "\n"
 "Enjoy Navit!"
 msgstr ""
+"Хвала што уградисте Навит!\n"
+"\n"
+"За почетак, изаберите „Преузмите карте“ из изборника ради преузимања карте. "
+"Примедба: Карта може бити велика (>50MB) - бежична веза је препоручена.\n"
+"\n"
+"Подаци о картама: доприносиоци (c) OpenStreetMap-а\n"
+"\n"
+"Уживајте у Навиту!"
 
 #. Android resource: @strings/initial_info_box_OK
 msgid "OK"
-msgstr ""
+msgstr "У реду"
 
 #. Android resource: @strings/initial_info_box_more_info
 msgid "More info"
-msgstr ""
+msgstr "Још података"
 
 #. Android resource: @strings/optionsmenu_zoom_in
 msgid "Zoom in"
-msgstr ""
+msgstr "Приближи"
 
 #. Android resource: @strings/optionsmenu_zoom_out
 msgid "Zoom out"
-msgstr ""
+msgstr "Удаљи"
 
 #. Android resource: @strings/optionsmenu_download_maps
 msgid "Download maps"
-msgstr ""
+msgstr "Преузми карте"
 
 #. Android resource: @strings/optionsmenu_toggle_poi
 msgid "Toggle POIs"
-msgstr ""
+msgstr "Прекидач употребе занимљивих тачака"
 
 #. Android resource: @strings/optionsmenu_exit_navit
 msgid "Exit Navit"
-msgstr ""
+msgstr "Изађи из Навита"
 
 #. Android resource: @strings/optionsmenu_backup_restore
 msgid "Backup / Restore"
-msgstr ""
+msgstr "Остава / повратак са ње"
 
 #. Android resource: @strings/map_delete
 msgid "Delete this map?"
-msgstr ""
+msgstr "Да ли избрисати ову карту?"
 
 #. Android resource: @strings/map_download_downloading
 msgid "Downloading:"
-msgstr ""
+msgstr "Преузимам:"
 
 #. Android resource: @strings/map_download_download_error
 msgid "Error downloading map."
-msgstr ""
+msgstr "Десила се грешка при преузимању карте."
 
 #. Android resource: @strings/map_download_download_aborted
 msgid "Map download aborted"
-msgstr ""
+msgstr "Преузимање карте је отказано"
 
 #. Android resource: @strings/map_no_fix
 msgid "No location. Reopen after location fix."
-msgstr ""
+msgstr "Нема положаја. Отварам поново по исправци положаја."
 
 #. Android resource: @strings/maps_for_current_location
 msgid "Maps containing current location"
-msgstr ""
+msgstr "Карте које садрже тренутни положај"
 
 #. Android resource: @strings/address_search_title
 msgid "Address search"
-msgstr ""
+msgstr "Претрага адреса"
 
 #. Android resource: @strings/address_enter_destination
 msgid "Enter destination"
-msgstr ""
+msgstr "Унесите одредиште"
 
 #. Android resource: @strings/address_partial_match
 msgid "Match partial address"
-msgstr ""
+msgstr "Упореди непотпуну адресу"
 
 #. Android resource: @strings/address_search_searching
 msgid "Searching..."
-msgstr ""
+msgstr "Претрага..."
 
 #. Android resource: @strings/address_search_not_found
 msgid "Address not found"
-msgstr ""
+msgstr "Није пронађена адреса"
 
 #. Android resource: @strings/address_search_getting_results
 msgid "Getting search results"
-msgstr ""
+msgstr "Добављам излазе претраге"
 
 #. Android resource: @strings/address_search_loading_results
 msgid "Loading search results"
-msgstr ""
+msgstr "Учитавам излазе претраге"
 
 #. Android resource: @strings/address_search_no_results
 msgid "No results found"
-msgstr ""
+msgstr "Нема излаза претраге"
 
 #. Android resource: @strings/address_search_no_text_entered
 msgid "No text entered"
-msgstr ""
+msgstr "Нема унетог текста"
 
 #. Android resource: @strings/address_search_set_destination
 msgid "Setting destination to:"
-msgstr ""
+msgstr "Постављам одредиште на:"
 
 #. Android resource: @strings/choose_an_action
 msgid "Choose an action"
-msgstr ""
+msgstr "Изаберите радњу"
 
 #. Android resource: @strings/please_insert_an_sd_card
 msgid "Please insert an SD Card"
-msgstr ""
+msgstr "Молим, утакните СД картицу"
 
 #. Android resource: @strings/backing_up
 msgid "Backing up..."
-msgstr ""
+msgstr "Чувам у оставу..."
 
 #. Android resource: @strings/restoring
 msgid "Restoring..."
-msgstr ""
+msgstr "Враћам из оставе..."
 
 #. Android resource: @strings/failed_to_create_backup_directory
 msgid "Failed to create backup directory"
-msgstr ""
+msgstr "Нисам успео да образујем фасциклу оставе"
 
 #. Android resource: @strings/backup_failed
 msgid "Backup failed"
-msgstr ""
+msgstr "Чување у оставу није успело"
 
 #. Android resource: @strings/no_backup_found
 msgid "No backup found"
-msgstr ""
+msgstr "Нисам пронашао оставу"
 
 #. Android resource: @strings/failed_to_restore
 msgid "Failed to restore"
-msgstr ""
+msgstr "Нисам успео да вратим податке из оставе"
 
 #. Android resource: @strings/backup_successful
 msgid "Backup successful"
-msgstr ""
+msgstr "Чување у оставу је успешно"
 
 #. Android resource: @strings/restore_successful_please_restart_navit
 msgid ""
 "Restore Successful\n"
 "Please restart Navit"
 msgstr ""
+"Враћање из оставе је успешно\n"
+"Молим, поново покрените Навит"
 
 #. Android resource: @strings/backup_not_found
 msgid "Backup not found"
-msgstr ""
+msgstr "Није пронађена остава"
 
 #. Android resource: @strings/restore_failed
 msgid "Restore failed"
-msgstr ""
+msgstr "Није успео повраћај из оставе"
 
 #. Android resource: @strings/select_backup
 msgid "Select backup"
-msgstr ""
+msgstr "Изаберите податке за повраћај"
 
 #. Android resource: @strings/backup
 msgid "Backup"
-msgstr ""
+msgstr "Остава"
 
 #. Android resource: @strings/restore
 msgid "Restore"
-msgstr ""
+msgstr "Поврати"
diff --git a/po/sv.po.in b/po/sv.po.in
index 7752ac52..3e332b80 100644
--- a/po/sv.po.in
+++ b/po/sv.po.in
@@ -139,8 +139,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "om en kilometer"
 msgstr[1] "om %d kilometer"
 
-msgid "exit"
-msgstr "avfart"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "ut på påfarten"
@@ -170,33 +172,18 @@ msgstr "%sin på %s%s%s"
 msgid "%sinto the %s"
 msgstr "%sut på %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "höger"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "vänster"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "lätt "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "tvärt "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "mycket tvärt "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "okänd "
-
 msgid "When possible, please turn around"
 msgstr "Vänd när det går"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Följ vägen i %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Kör snart in i rondellen"
 
@@ -205,56 +192,133 @@ 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 %s"
-msgstr "kör sedan ut ur rondellen mot %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Kör ut ur rondellen mot %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Följ vägen i %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "snart"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "nu"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Ta %1$s vägen mot %2$s"
 
+msgid "right"
+msgstr "höger"
+
 #, c-format
 msgid "after %i roads"
 msgstr "efter %i vägar"
 
-msgid "now"
-msgstr "nu"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "ta sedan %1$s vägen mot %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "fel"
+msgid "easily "
+msgstr "lätt "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "tvärt "
+
+msgid "left"
+msgstr "vänster"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Sväng %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "sväng sedan %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "sedan har du nått din destination."
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Du har nått din destination %s"
 
-msgid "then you have reached your destination."
-msgstr "sedan har du nått din destination."
+msgid "exit"
+msgstr "avfart"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1314,11 +1378,13 @@ msgstr "* Okänt, lägg till is_in-taggar till dessa städer"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1682,6 +1748,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Klipp ut bokmärke"
 
diff --git a/po/sw.po.in b/po/sw.po.in
index 1197ee89..78e72284 100644
--- a/po/sw.po.in
+++ b/po/sw.po.in
@@ -133,8 +133,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "baada ya kilomita %d"
 msgstr[1] "baada ya kilomita %d"
 
-msgid "exit"
-msgstr "ondoka"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr ""
@@ -164,91 +166,153 @@ msgstr "%s kufuata %s%s%s"
 msgid "%sinto the %s"
 msgstr "%s kufuata %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "kulia"
+msgid "When possible, please turn around"
+msgstr "geuka na kurudi nyuma inapowezekana"
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "kushoto"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "buata barabara kwa %s"
+
+msgid "Enter the roundabout soon"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. 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 ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "isiyojulikana "
+#. 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 ""
 
-msgid "When possible, please turn around"
-msgstr "geuka na kurudi nyuma inapowezekana"
+msgid "soon"
+msgstr "karibuni"
 
-msgid "Enter the roundabout soon"
+msgid "now"
+msgstr "sasa"
+
+msgid "then"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "halafu toka kutoka kwenye kipilefti kwenye %s"
+msgid "%1$s merge right %2$s"
+msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "toka kutoka kwenye kipilefti kwenye %s"
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "buata barabara kwa %s"
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
 
-msgid "soon"
-msgstr "karibuni"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "fuata %1$s hadi %2$s"
 
+msgid "right"
+msgstr "kulia"
+
 #, c-format
 msgid "after %i roads"
 msgstr "baada ya barabara %i"
 
-msgid "now"
-msgstr "sasa"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "halafu fuata %1$s hadi %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "kosa"
+msgid "easily "
+msgstr ""
+
+msgid "strongly "
+msgstr ""
+
+msgid "left"
+msgstr "kushoto"
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "piga kona %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "halafu ingia %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
+msgstr "halafu utakuwa umefika"
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "umelifikia lengo lako %s"
 
-msgid "then you have reached your destination."
-msgstr "halafu utakuwa umefika"
+msgid "exit"
+msgstr "ondoka"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1308,11 +1372,13 @@ msgstr ""
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1676,6 +1742,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/ta.po.in b/po/ta.po.in
index caff367a..34801c9e 100644
--- a/po/ta.po.in
+++ b/po/ta.po.in
@@ -134,7 +134,9 @@ msgid_plural "in %d kilometers"
 msgstr[0] "ஒரு கிலோமீட்டருக்குள்"
 msgstr[1] "%d கிலோமீட்டர்களுக்குள்"
 
-msgid "exit"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
 msgstr ""
 
 msgid "into the ramp"
@@ -165,90 +167,152 @@ msgstr ""
 msgid "%sinto the %s"
 msgstr ""
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
+msgid "When possible, please turn around"
 msgstr ""
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "இயல்பாக "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "%s க்கு இதே தெருவில் செல்லவும்"
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
 
-msgid "When possible, please turn around"
+#. 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 ""
 
-msgid "Enter the roundabout soon"
+msgid "soon"
+msgstr "சீக்கிரமாக"
+
+msgid "now"
+msgstr "இப்பொழுது"
+
+msgid "then"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "%1$s merge right %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "%1$s left exit %2$s %3$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "%s க்கு இதே தெருவில் செல்லவும்"
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
 
-msgid "soon"
-msgstr "சீக்கிரமாக"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
+msgid "right"
+msgstr ""
+
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-msgid "now"
-msgstr "இப்பொழுது"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "பிறகு %2$s பக்கத்தில் %1$s ஆம் தெருவில் திரும்பவும்"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "தவறு"
+msgid "easily "
+msgstr "இயல்பாக "
+
+msgid "strongly "
+msgstr ""
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "left"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
 msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
 msgstr ""
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr ""
 
-msgid "then you have reached your destination."
+msgid "exit"
+msgstr ""
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
 msgstr ""
 
 #. Android resource: @strings/position_popup_title
@@ -1309,11 +1373,13 @@ msgstr ""
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1677,6 +1743,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/te.po.in b/po/te.po.in
index 61608f99..4606aee7 100644
--- a/po/te.po.in
+++ b/po/te.po.in
@@ -134,7 +134,9 @@ msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "exit"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
 msgstr ""
 
 msgid "into the ramp"
@@ -165,90 +167,152 @@ msgstr ""
 msgid "%sinto the %s"
 msgstr ""
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "కుడి"
+msgid "When possible, please turn around"
+msgstr ""
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "ఎడమ"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "తేలికగా "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
 
-msgid "When possible, please turn around"
+#. 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 ""
 
-msgid "Enter the roundabout soon"
+msgid "soon"
+msgstr "త్వరలో"
+
+msgid "now"
+msgstr "ఇప్పుడు"
+
+msgid "then"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "%1$s merge right %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "%1$s left exit %2$s %3$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
+msgid "%1$s right exit %2$s %3$s"
 msgstr ""
 
-msgid "soon"
-msgstr "త్వరలో"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
+msgid "right"
+msgstr "కుడి"
+
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-msgid "now"
-msgstr "ఇప్పుడు"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
 msgstr ""
 
-msgid "error"
-msgstr "పొరపాటు"
+msgid "easily "
+msgstr "తేలికగా "
+
+msgid "strongly "
+msgstr ""
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "left"
+msgstr "ఎడమ"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
 msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
 msgstr ""
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "మీరు మీ గమ్యస్థానం %s చేరారు"
 
-msgid "then you have reached your destination."
+msgid "exit"
+msgstr ""
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
 msgstr ""
 
 #. Android resource: @strings/position_popup_title
@@ -1309,11 +1373,13 @@ msgstr ""
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1677,6 +1743,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/th.po.in b/po/th.po.in
index df2f540e..157f9876 100644
--- a/po/th.po.in
+++ b/po/th.po.in
@@ -131,8 +131,10 @@ msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "อีก %d กิโลเมตร"
 
-msgid "exit"
-msgstr "ทางออก"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr ""
@@ -162,90 +164,152 @@ msgstr "%s เข้าสู่ %s%s%s| จาก"
 msgid "%sinto the %s"
 msgstr ""
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "ขวา"
+msgid "When possible, please turn around"
+msgstr "ถ้าเป็นไปได้ ให้กลับรถ"
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "ซ้าย"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "ตรงไปตามถนน แล้ว %s"
+
+msgid "Enter the roundabout soon"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "อย่างเคร่งคัด "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. 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 ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-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 ""
 
-msgid "When possible, please turn around"
-msgstr "ถ้าเป็นไปได้ ให้กลับรถ"
+msgid "soon"
+msgstr "ในไม่ช้า"
 
-msgid "Enter the roundabout soon"
+msgid "now"
+msgstr "เดี๋ยวนี้"
+
+msgid "then"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "%1$s merge right %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "%1$s left exit %2$s %3$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "ตรงไปตามถนน แล้ว %s"
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
 
-msgid "soon"
-msgstr "ในไม่ช้า"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
+msgid "right"
+msgstr "ขวา"
+
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-msgid "now"
-msgstr "เดี๋ยวนี้"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
+
+msgid "easily "
 msgstr ""
 
-msgid "error"
-msgstr "ข้อผิดพลาด"
+msgid "strongly "
+msgstr "อย่างเคร่งคัด "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "left"
+msgstr "ซ้าย"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "เลี้ยว %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
 msgstr ""
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "คุณได้ถึงที่หมายแล้ว %s"
 
-msgid "then you have reached your destination."
+msgid "exit"
+msgstr "ทางออก"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
 msgstr ""
 
 #. Android resource: @strings/position_popup_title
@@ -1306,11 +1370,13 @@ msgstr ""
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1674,6 +1740,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""
 
diff --git a/po/tr.po.in b/po/tr.po.in
index bdbddecf..77b4b500 100644
--- a/po/tr.po.in
+++ b/po/tr.po.in
@@ -143,8 +143,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "%d kilometrede"
 msgstr[1] "%d kilometrede"
 
-msgid "exit"
-msgstr "çıkış"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "rampada"
@@ -174,33 +176,18 @@ msgstr "%scaddesine %s%s%s|neutral form"
 msgid "%sinto the %s"
 msgstr "%s%s yoluna"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "Sağa"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "Sola"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "kolayca "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "sertçe "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "gerçekten sertçe "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "bilinmeyen "
-
 msgid "When possible, please turn around"
 msgstr "Müsait olduğunda lütfen yönünü değiştir"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Gelecek %s için yolu takip et"
+
 msgid "Enter the roundabout soon"
 msgstr "Yakındaki kavşağa girin"
 
@@ -209,56 +196,133 @@ 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 %s"
-msgstr "ardından %s'de kavşaktan çıkın"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "%s'de kavşaktan çıkın"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Gelecek %s için yolu takip et"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "yakında"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "şimdi"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "%1$s yolunda  %2$s yönüne dönün"
 
+msgid "right"
+msgstr "Sağa"
+
 #, c-format
 msgid "after %i roads"
 msgstr "%i yol sonra"
 
-msgid "now"
-msgstr "şimdi"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "ardından %1$s yolunda  %2$s yönüne dönün"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "hata"
+msgid "easily "
+msgstr "kolayca "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "sertçe "
+
+msgid "left"
+msgstr "Sola"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Dönüş %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "sonra %1$s%2$s %3$s%4$s dönün"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "ardından hedefinize ulaşacaksınız"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Hedefinize ulaştınız, %s"
 
-msgid "then you have reached your destination."
-msgstr "ardından hedefinize ulaşacaksınız"
+msgid "exit"
+msgstr "çıkış"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1318,11 +1382,13 @@ msgstr "* tanınmıyor, bu yerleşime bir etiket ekleyin"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1686,6 +1752,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Yer İmini Kes"
 
diff --git a/po/uk.po.in b/po/uk.po.in
index d8d9e2be..6f92355f 100644
--- a/po/uk.po.in
+++ b/po/uk.po.in
@@ -139,8 +139,10 @@ msgstr[0] "за %d кілометр"
 msgstr[1] "за %d кілометри"
 msgstr[2] "за %d кілометрів"
 
-msgid "exit"
-msgstr "виїзд"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "з'їзд на"
@@ -170,33 +172,18 @@ msgstr "%s на %s%s%s"
 msgid "%sinto the %s"
 msgstr "%s в %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "праворуч"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "ліворуч"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "легко "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "круто "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "дуже круто "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "невідомо "
-
 msgid "When possible, please turn around"
 msgstr "Якщо це можливо, то розверніться"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Їдьте дорогою наступні %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Скоро виїзд на дорогу з кільцевим рухом"
 
@@ -205,56 +192,133 @@ 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 %s"
-msgstr "тоді виїдьте з кільця через %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Виїдьте з кільця через %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Їдьте дорогою наступні %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "скоро"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "зараз"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "З’їдьте на дорогу %1$s до %2$s"
 
+msgid "right"
+msgstr "праворуч"
+
 #, c-format
 msgid "after %i roads"
 msgstr "після %i дороги"
 
-msgid "now"
-msgstr "зараз"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "тоді виїдьте на доргу %1$s до %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "помилка"
+msgid "easily "
+msgstr "легко "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "круто "
+
+msgid "left"
+msgstr "ліворуч"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Поверніть на %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "тоді поверніть на %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "і тоді Ви прибудете в місце призначення."
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Ви досягли місця призначення %s"
 
-msgid "then you have reached your destination."
-msgstr "і тоді Ви прибудете в місце призначення."
+msgid "exit"
+msgstr "виїзд"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1314,11 +1378,13 @@ msgstr "Новідомо, додайте is_in теґ до цих міст"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1682,6 +1748,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Вирізати закладку"
 
diff --git a/po/ur.po.in b/po/ur.po.in
index d4e87b02..17d2eee3 100644
--- a/po/ur.po.in
+++ b/po/ur.po.in
@@ -82,9 +82,6 @@ msgstr "%d.%d کلومیٹر"
 msgid "in %d.%d kilometers"
 msgstr "%d.%d کلومیٹر میں"
 
-msgid "exit"
-msgstr "اخراج"
-
 msgid "into the ramp"
 msgstr "ڈھلان میں"
 
@@ -113,37 +110,23 @@ msgstr "%s میں سے %s%s%s"
 msgid "%sinto the %s"
 msgstr "%sپر %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
+msgid "When possible, please turn around"
+msgstr "جب ممکن ہو گھومیں"
+
 msgid "right"
 msgstr "دایئں"
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "بایئں"
-
-#. TRANSLATORS: Don't forget the ending space
 msgid "easily "
 msgstr "آسانی سے "
 
-#. TRANSLATORS: Don't forget the ending space
 msgid "strongly "
 msgstr "سختی سے "
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "انتہایَ سختی سے "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "نا معلوم "
-
-msgid "When possible, please turn around"
-msgstr "جب ممکن ہو گھومیں"
+msgid "left"
+msgstr "بایئں"
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "%1$s%2$s %3$s%4$s پھر گومیں"
+msgid "exit"
+msgstr "اخراج"
 
 msgid "Set as destination"
 msgstr "بطور منزل انتخاب"
@@ -216,6 +199,20 @@ msgid_plural "in %d kilometers"
 msgstr[0] "ایک کلومیٹر میں"
 msgstr[1] "%d کلومیٹر میں"
 
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
+
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "%s تک سڑک کے مطابق جایئں"
+
 msgid "Enter the roundabout soon"
 msgstr ""
 
@@ -224,22 +221,81 @@ 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 %s"
-msgstr "پھر گول چوراہے کو  %s پے چھوڑ دیں"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "گول چوراہے کو %s پے چھوڑ دیں"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "%s تک سڑک کے مطابق جایئں"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "جلد ہی"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "اب"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "سڑک تک %1$s سے %2$s"
@@ -248,27 +304,35 @@ msgstr "سڑک تک %1$s سے %2$s"
 msgid "after %i roads"
 msgstr "%i سڑکوں کے بعد"
 
-msgid "now"
-msgstr "اب"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "پھر %1$s لے کر %2$s تک جائیں"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "غلطی"
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "%1$s%2$s %3$s%4$s گومیں"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "پھر آپ اپنی منزل پہ پہنچ جایئں گے"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "آپ اپنی منزل %s پے پہنچ کئے ہیں"
 
-msgid "then you have reached your destination."
-msgstr "پھر آپ اپنی منزل پہ پہنچ جایئں گے"
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1325,11 +1389,13 @@ msgstr "* نامعلوم شہروں کیلیئے"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1687,6 +1753,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "بک مارک کو کاٹیں"
 
diff --git a/po/vi.po.in b/po/vi.po.in
index 4e0592b7..698802d6 100644
--- a/po/vi.po.in
+++ b/po/vi.po.in
@@ -133,8 +133,10 @@ msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "trong %d km"
 
-msgid "exit"
-msgstr "thoát"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "vào dốc"
@@ -164,33 +166,18 @@ msgstr "%svào %s%s%s|neutral form"
 msgid "%sinto the %s"
 msgstr "%svào %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "phải"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "trái"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "dễ dàng "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "mạnh "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "thực sự mạnh "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "không rõ "
-
 msgid "When possible, please turn around"
 msgstr "Khi có thể, hãy quay vòng"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Đường tiếp theo %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Sắp tới chỗ vòng"
 
@@ -199,56 +186,133 @@ 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 %s"
-msgstr "sau đó ra khỏi đường vòng tại %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Ra khỏi đường vòng tại %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Đường tiếp theo %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "ngay"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "bây giờ"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Có %1$s đường đến %2$s"
 
+msgid "right"
+msgstr "phải"
+
 #, c-format
 msgid "after %i roads"
 msgstr "sau %i đường"
 
-msgid "now"
-msgstr "bây giờ"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "sau đó bắt  %1$s đường đến %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "lỗi"
+msgid "easily "
+msgstr "dễ dàng "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "mạnh "
+
+msgid "left"
+msgstr "trái"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Rẽ %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "sau đó rẽ %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "sau đó bạn tới điểm đích"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Bạn vừa tới điểm đích: %s"
 
-msgid "then you have reached your destination."
-msgstr "sau đó bạn tới điểm đích"
+msgid "exit"
+msgstr "thoát"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1308,11 +1372,13 @@ msgstr "* Không xác định, gán thẻ \"is_in\" cho những thành phố đ�
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1676,6 +1742,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Cắt điểm đánh dấu (bookmark)"
 
diff --git a/po/zh_CN.po.in b/po/zh_CN.po.in
index f1c67e9b..4fcfb08a 100644
--- a/po/zh_CN.po.in
+++ b/po/zh_CN.po.in
@@ -5,6 +5,7 @@
 # Feng Chao https://launchpad.net/~chaofeng
 # Kakurady Drakenar https://launchpad.net/~kakurady
 # Kyle https://launchpad.net/~kylelover
+# Kyle WANG https://launchpad.net/~osfans
 # Lele Long https://launchpad.net/~schemacs
 # Li Jin https://launchpad.net/~lijin
 # kelvin https://launchpad.net/~kelvinz
@@ -14,7 +15,7 @@ msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2013-09-28 01:46+0000\n"
-"Last-Translator: Kyle WANG <Unknown>\n"
+"Last-Translator: Kyle WANG <waxaca@163.com>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -136,8 +137,10 @@ msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "距离%d千米"
 
-msgid "exit"
-msgstr "退出"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "进入坡道"
@@ -167,33 +170,18 @@ msgstr "%s 到达 %s%s%s | neutral form"
 msgid "%sinto the %s"
 msgstr "%s 到达 %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "右"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "左"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "缓 "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "急转 "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "非常大的急转 "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "未知 "
-
 msgid "When possible, please turn around"
 msgstr "当遇到路口的时候，请转弯"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "沿路继续行驶%s"
+
 msgid "Enter the roundabout soon"
 msgstr "不久将进入环形交叉路口"
 
@@ -202,56 +190,133 @@ 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 %s"
-msgstr "然后在%s处驶出环形区"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "还有%s就将驶离环形区"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "沿路继续行驶%s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "不久"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "现在"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "可以经由道路 %1$s 到 %2$s"
 
+msgid "right"
+msgstr "右"
+
 #, c-format
 msgid "after %i roads"
 msgstr "之后有 %i 条道路"
 
-msgid "now"
-msgstr "现在"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "然后可以经由道路 %1$s 到 %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "错误"
+msgid "easily "
+msgstr "缓 "
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+msgid "strongly "
+msgstr "急转 "
+
+msgid "left"
+msgstr "左"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "转向 %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "然后转向 %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "然后你就到达您的目的地"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "您已经抵达您的目的地 %s"
 
-msgid "then you have reached your destination."
-msgstr "然后你就到达您的目的地"
+msgid "exit"
+msgstr "退出"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1311,11 +1376,13 @@ msgstr "* 未知，添加标签"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1679,6 +1746,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "剪切标签"
 
diff --git a/po/zh_HK.po.in b/po/zh_HK.po.in
index 8e8fc0a8..63a6b4ad 100644
--- a/po/zh_HK.po.in
+++ b/po/zh_HK.po.in
@@ -133,8 +133,10 @@ msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "在 %d 千米內"
 
-msgid "exit"
-msgstr "退出"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "進入斜路"
@@ -164,91 +166,153 @@ msgstr "%s進入 %s%s%s"
 msgid "%sinto the %s"
 msgstr "%s進入 %s"
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "右"
+msgid "When possible, please turn around"
+msgstr "如可以請掉頭"
 
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "左"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "简单 "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "直走到下一个%s"
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "大力轉 "
+msgid "Enter the roundabout soon"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "大大力轉 "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
+msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
 
-msgid "When possible, please turn around"
-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 ""
 
-msgid "Enter the roundabout soon"
+msgid "soon"
+msgstr "即將"
+
+msgid "now"
+msgstr "現在"
+
+msgid "then"
 msgstr ""
 
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Enter the roundabout %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "然後在 %s 離開迴旋處"
+msgid "%1$s merge right %2$s"
+msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "在 %s 離開迴旋處"
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "直走到下一个%s"
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
 
-msgid "soon"
-msgstr "即將"
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "取 %1$s 路往%2$s方向"
 
+msgid "right"
+msgstr "右"
+
 #, c-format
 msgid "after %i roads"
 msgstr "%i 條路之後"
 
-msgid "now"
-msgstr "現在"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "然後取 %1$s 路往%2$s方向"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "錯誤"
+msgid "easily "
+msgstr "简单 "
+
+msgid "strongly "
+msgstr "大力轉 "
+
+msgid "left"
+msgstr "左"
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "%1$s转向%2$s %3$s至%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "然後%1$s轉%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
+msgstr "然後會到達目的地"
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "已到達目的地 %s"
 
-msgid "then you have reached your destination."
-msgstr "然後會到達目的地"
+msgid "exit"
+msgstr "退出"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1308,11 +1372,13 @@ msgstr ""
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1676,6 +1742,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "剪下書籤"
author	kazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220>	2015-04-06 20:01:30 +0000
committer	kazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220>	2015-04-06 20:01:30 +0000
commit	90a188dca4ddf8dcb02a1d69fe7226d04f41224f (patch)
tree	d2aef0223d33f1018f064c00a290de94eadde26b /po
parent	34fc484f618e8d31bd4ff2782ce442cd8cb42d50 (diff)
download	navit-svn-90a188dca4ddf8dcb02a1d69fe7226d04f41224f.tar.gz