Update:Translations:Massive translation update from launchpad. Mostly fixing high five merge updates

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6129 ffa7fe5e-494d-0410-b361-a75ebd5db220

74 files changed, 2962 insertions, 3442 deletions

diff --git a/po/af.po.in b/po/af.po.in
index 28d1b2bf..8736cb98 100644
--- a/po/af.po.in
+++ b/po/af.po.in
@@ -5,6 +5,7 @@
 # Andre Hugo https://launchpad.net/~cortexhugo
 # KaZeR https://launchpad.net/~kazer
 # Kobus https://launchpad.net/~kobuswolf
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Stephan Wessels https://launchpad.net/~slwessels
 # Wimpie Hall https://launchpad.net/~gotek
 # mdhull https://launchpad.net/~mark-emsafrica
@@ -13,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-09-28 01:39+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:57+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Afrikaans <af@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -75,14 +76,6 @@ msgid "sixth exit"
 msgstr "sesde uitgang"
 
 #, c-format
-msgid "%d m"
-msgstr "%d meter"
-
-#, c-format
-msgid "in %d m"
-msgstr "na %d meter"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -91,14 +84,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d meter"
-
-#, c-format
-msgid "in %d meters"
-msgstr "na %d meter"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -107,14 +92,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d, %d kilometer"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "na %d.%d kilometer"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -127,6 +104,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d meter"
+
+#, c-format
+msgid "in %d meters"
+msgstr "na %d meter"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d, %d kilometer"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "na %d.%d kilometer"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "een kilometer"
@@ -170,22 +163,22 @@ msgstr ""
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sin die %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sin die %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sin die %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sin die %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -215,12 +208,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "verlaat dan die sirkel by die %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Verlaat die sirkel by die %1$s %2$s"
 
 msgid "soon"
 msgstr "kortliks"
@@ -229,7 +222,7 @@ msgid "now"
 msgstr "nou"
 
 msgid "then"
-msgstr ""
+msgstr "dan"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -260,19 +253,19 @@ msgstr ""
 #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance
 #, c-format
 msgid "Take exit %1$s %2$s %3$s"
-msgstr ""
+msgstr "Neem die afrit %1$s %2$s %3$s"
 
 #. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
 #, c-format
 msgid "Take the exit %1$s %2$s%3$s"
-msgstr ""
+msgstr "Neem die afrit %1$s %2$s%3$s"
 
 #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
 msgid "at interchange"
 msgstr ""
 
 msgid "at exit"
-msgstr ""
+msgstr "by die afrit"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
@@ -332,25 +325,25 @@ msgstr "na %i paaie"
 #. 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 ""
+msgstr "Draai %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "draai dan om"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Draai om %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "draai dan om"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Draai om %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -380,7 +373,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Afrit"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/ar.po.in b/po/ar.po.in
index 26d693db..03f54507 100644
--- a/po/ar.po.in
+++ b/po/ar.po.in
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-06-12 18:19+0000\n"
+"PO-Revision-Date: 2015-07-19 03:57+0000\n"
 "Last-Translator: dargirov <dargirov@mail.ru>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -75,14 +75,6 @@ msgid "sixth exit"
 msgstr "المخرج السادس"
 
 #, c-format
-msgid "%d m"
-msgstr "%d م"
-
-#, c-format
-msgid "in %d m"
-msgstr "بعد %d متر"
-
-#, c-format
 msgid "%d feet"
 msgstr "%dقدم"
 
@@ -91,14 +83,6 @@ msgid "in %d feet"
 msgstr "بعد  %d قدم"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d متر"
-
-#, c-format
-msgid "in %d meters"
-msgstr "بعد %d متر"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr "%d.%d أميال"
 
@@ -107,14 +91,6 @@ msgid "in %d.%d miles"
 msgstr "بعد %d.%d أميال"
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d كلم"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "بعد %d%d كلم"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] "مايل واحد"
@@ -135,6 +111,22 @@ msgstr[4] "بعد %d أميال"
 msgstr[5] "بعد %d أميال"
 
 #, c-format
+msgid "%d meters"
+msgstr "%d متر"
+
+#, c-format
+msgid "in %d meters"
+msgstr "بعد %d متر"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d كلم"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "بعد %d%d كلم"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "كلم واحد"
@@ -186,22 +178,22 @@ msgstr ""
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%s إلى داخل الشارع %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sإلى داخل %s%s%s|صفة الذكر"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sإلى داخل %s%s%s|صفة الأنثى"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sإلى داخل %s%s%s|غير محدد الجنس"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -231,12 +223,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "ثم أخرج من المستديرة عند الــ%1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "أخرج من المستديرة عند الــ  %1$s %2$s"
 
 msgid "soon"
 msgstr "قريبا"
@@ -348,7 +340,7 @@ msgstr "بعد %i طرقات"
 #. 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 ""
+msgstr "حوّل %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
@@ -396,7 +388,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "خروج"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/ast.po.in b/po/ast.po.in
index 0b2ff08b..edf0efbc 100644
--- a/po/ast.po.in
+++ b/po/ast.po.in
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-09-28 01:39+0000\n"
+"PO-Revision-Date: 2015-07-19 03:57+0000\n"
 "Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"
 "Language-Team: Asturian <ast@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -70,14 +70,6 @@ msgid "sixth exit"
 msgstr "sesta salida"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "en %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -86,14 +78,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d metros"
-
-#, c-format
-msgid "in %d meters"
-msgstr "en %d metros"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -102,14 +86,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d,%d quilómetros"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "en %d,%d quilómetros"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -122,6 +98,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d metros"
+
+#, c-format
+msgid "in %d meters"
+msgstr "en %d metros"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d,%d quilómetros"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "en %d,%d quilómetros"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "un quilómetru"
@@ -160,27 +152,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "pal enllaz"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%s pa la cai %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%s pal %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%s pa la %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%s pal %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -210,12 +202,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "llueu dexe la rotonda pola %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Dexe la rotonda pola %1$s %2$s"
 
 msgid "soon"
 msgstr "aína"
@@ -224,7 +216,7 @@ msgid "now"
 msgstr "agora"
 
 msgid "then"
-msgstr ""
+msgstr "llueu"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -260,7 +252,7 @@ msgstr ""
 #. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
 #, c-format
 msgid "Take the exit %1$s %2$s%3$s"
-msgstr ""
+msgstr "Tome la salida %1$s %2$s%3$s"
 
 #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
 msgid "at interchange"
@@ -327,25 +319,25 @@ msgstr "tres %i carreteres"
 #. 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 ""
+msgstr "Xire %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "llueu de la vuelta"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "De la vuelta %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "llueu de la vuelta"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "De la vuelta %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -360,7 +352,7 @@ msgstr ""
 #. *
 #. 
 msgid "follow"
-msgstr ""
+msgstr "siga"
 
 msgid "then you have reached your destination."
 msgstr "entós llegará al destín."
@@ -375,7 +367,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Salida"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/be.po.in b/po/be.po.in
index 5cb500bc..4bab57e6 100644
--- a/po/be.po.in
+++ b/po/be.po.in
@@ -4,13 +4,14 @@
 # Many thanks to the contributors of this translation:
 # Anatoli Putseyeu https://launchpad.net/~st-shadow-by
 # KaZeR https://launchpad.net/~kazer
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-11-15 22:06+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:57+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Belarusian <be@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -71,14 +72,6 @@ msgid "sixth exit"
 msgstr "шосты выхад"
 
 #, c-format
-msgid "%d m"
-msgstr ""
-
-#, c-format
-msgid "in %d m"
-msgstr "праз %d м"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -87,14 +80,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d метраў"
-
-#, c-format
-msgid "in %d meters"
-msgstr "праз %d метраў"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -103,14 +88,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d кіламетраў"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "праз %d.%d кіламетраў"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -123,6 +100,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d метраў"
+
+#, c-format
+msgid "in %d meters"
+msgstr "праз %d метраў"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d кіламетраў"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "праз %d.%d кіламетраў"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d кіламетр"
@@ -338,7 +331,7 @@ msgstr ""
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Развярніцеся %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
@@ -347,7 +340,7 @@ msgstr ""
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Развярніцеся %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -377,7 +370,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Выхад"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/bg.po.in b/po/bg.po.in
index dfe991cd..fe637258 100644
--- a/po/bg.po.in
+++ b/po/bg.po.in
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-09-28 01:39+0000\n"
+"PO-Revision-Date: 2015-07-19 03:57+0000\n"
 "Last-Translator: Alex Stanev <alex@stanev.org>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -74,14 +74,6 @@ msgid "sixth exit"
 msgstr "шестия изход"
 
 #, c-format
-msgid "%d m"
-msgstr "%d м"
-
-#, c-format
-msgid "in %d m"
-msgstr "след %d м"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -90,14 +82,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d метра"
-
-#, c-format
-msgid "in %d meters"
-msgstr "след %d метра"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -106,14 +90,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d километра"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "след %d.%d километра"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -126,6 +102,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d метра"
+
+#, c-format
+msgid "in %d meters"
+msgstr "след %d метра"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d километра"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "след %d.%d километра"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "един километър"
@@ -164,27 +156,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "на рампата"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sпо улица %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sпо улица %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sпо улица %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sпо улица %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -209,17 +201,17 @@ msgstr "Скоро навлизате в кръгово"
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
 msgid "Enter the roundabout %s"
-msgstr ""
+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 ""
+msgstr "след това излезте от кръговото на %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Излезте от кръговото на %1$s %2$s"
 
 msgid "soon"
 msgstr "скоро"
@@ -228,7 +220,7 @@ msgid "now"
 msgstr "сега"
 
 msgid "then"
-msgstr ""
+msgstr "след това"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -331,25 +323,25 @@ msgstr "след %i пресечки"
 #. 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 ""
+msgstr "Завийте %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "след това обърнете"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Обърнете %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "след това обърнете"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Обърнете %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -379,7 +371,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Изход"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/bs.po.in b/po/bs.po.in
index 00f313f7..633e3736 100644
--- a/po/bs.po.in
+++ b/po/bs.po.in
@@ -4,13 +4,14 @@
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
 # Kenan https://launchpad.net/~kahrickenan
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-08-08 23:15+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:57+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Bosnian <bs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -71,14 +72,6 @@ msgid "sixth exit"
 msgstr ""
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "u %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -87,14 +80,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d metara"
-
-#, c-format
-msgid "in %d meters"
-msgstr "u %d metara"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -103,14 +88,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d kilometara"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "u %d.%d kilometara"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -123,6 +100,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d metara"
+
+#, c-format
+msgid "in %d meters"
+msgstr "u %d metara"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d kilometara"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "u %d.%d kilometara"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d kilometar"
@@ -163,7 +156,7 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "u rampu"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
@@ -378,7 +371,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Izlaz"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/ca.po.in b/po/ca.po.in
index 157cbe07..75316a4a 100644
--- a/po/ca.po.in
+++ b/po/ca.po.in
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-07-09 18:11+0000\n"
+"PO-Revision-Date: 2015-07-19 03:57+0000\n"
 "Last-Translator: Sergi Gomis <paloky3@gmail.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -80,14 +80,6 @@ msgid "sixth exit"
 msgstr "sisena sortida"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "d'aquí a %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr "%d peus"
 
@@ -96,14 +88,6 @@ msgid "in %d feet"
 msgstr "en %d peus"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d metres"
-
-#, c-format
-msgid "in %d meters"
-msgstr "d'aquí a %d metres"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr "%d.%d milles"
 
@@ -112,14 +96,6 @@ msgid "in %d.%d miles"
 msgstr "en %d.%d milles"
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d,%d quilòmetres"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "d'aquí a %d,%d quilòmetres"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] "una milla"
@@ -132,6 +108,22 @@ msgstr[0] "en una milla"
 msgstr[1] "en %d milles"
 
 #, c-format
+msgid "%d meters"
+msgstr "%d metres"
+
+#, c-format
+msgid "in %d meters"
+msgstr "d'aquí a %d metres"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d,%d quilòmetres"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "d'aquí a %d,%d quilòmetres"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "un quilòmetre"
@@ -175,27 +167,27 @@ msgstr ""
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sal carrer %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sal %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sa la %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sa %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
 msgid "%sinto the %s"
-msgstr "%s cap a la %s"
+msgstr "%scap a la %s"
 
 msgid "When possible, please turn around"
 msgstr "Quan sigui possible, doneu mitja volta"
@@ -203,7 +195,7 @@ msgstr "Quan sigui possible, doneu mitja volta"
 #. TRANSLATORS: the argument is the destination to follow
 #, c-format
 msgid "towards %s"
-msgstr ""
+msgstr "cap a %s"
 
 #, c-format
 msgid "Follow the road for the next %s"
@@ -215,17 +207,17 @@ msgstr "Entreu a la rotonda vinent"
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
 msgid "Enter the roundabout %s"
-msgstr ""
+msgstr "Entreu a la rotonda %s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "aleshores deixeu la rotonda a la %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Deixeu la rotonda a la %1$s %2$s"
 
 msgid "soon"
 msgstr "aviat"
@@ -234,7 +226,7 @@ msgid "now"
 msgstr "ara"
 
 msgid "then"
-msgstr ""
+msgstr "aleshores"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -257,27 +249,27 @@ msgid "Merge %1$s%2$s|left"
 msgstr ""
 
 msgid "on your left"
-msgstr ""
+msgstr "a l'esquerra"
 
 msgid "on your right"
-msgstr ""
+msgstr "a la dreta"
 
 #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance
 #, c-format
 msgid "Take exit %1$s %2$s %3$s"
-msgstr ""
+msgstr "Preneu la sortida %1$s %2$s %3$s"
 
 #. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
 #, c-format
 msgid "Take the exit %1$s %2$s%3$s"
-msgstr ""
+msgstr "Preneu la sortida %1$s %2$s%3$s"
 
 #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
 msgid "at interchange"
-msgstr ""
+msgstr "a l'intersecció"
 
 msgid "at exit"
-msgstr ""
+msgstr "a la sortida"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
@@ -337,25 +329,25 @@ msgstr "després de %i carrers"
 #. 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 ""
+msgstr "Gireu %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "després, doneu mitja volta"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Doneu mitja volta %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "després, doneu mitja volta"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Doneu mitja volta %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -370,7 +362,7 @@ msgstr ""
 #. *
 #. 
 msgid "follow"
-msgstr ""
+msgstr "seguiu"
 
 msgid "then you have reached your destination."
 msgstr "aleshores heu arribat a destí"
@@ -382,10 +374,10 @@ msgstr "Heu arribat a la destinació %s"
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
-msgstr ""
+msgstr "Intersecció"
 
 msgid "Exit"
-msgstr ""
+msgstr "Sortida"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1673,7 +1665,7 @@ msgid "Police"
 msgstr ""
 
 msgid "Justice"
-msgstr ""
+msgstr "Jutjats"
 
 msgid "Taxi"
 msgstr ""
diff --git a/po/ckb.po.in b/po/ckb.po.in
index f125c34c..d62af183 100644
--- a/po/ckb.po.in
+++ b/po/ckb.po.in
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"Language: \n"
+"Language: ckb\n"
 
 msgid "Running from source directory\n"
 msgstr ""
@@ -69,35 +69,39 @@ msgid "sixth exit"
 msgstr ""
 
 #, c-format
-msgid "%d m"
+msgid "%d feet"
 msgstr ""
 
 #, c-format
-msgid "in %d m"
+msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d feet"
+msgid "%d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "in %d feet"
+msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr ""
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "in %d meters"
-msgstr ""
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "%d.%d miles"
+msgid "%d meters"
 msgstr ""
 
 #, c-format
-msgid "in %d.%d miles"
+msgid "in %d meters"
 msgstr ""
 
 #, c-format
@@ -109,18 +113,6 @@ msgid "in %d.%d kilometers"
 msgstr ""
 
 #, c-format
-msgid "one mile"
-msgid_plural "%d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
-msgid "in one mile"
-msgid_plural "in %d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] ""
diff --git a/po/cs.po.in b/po/cs.po.in
index ae061271..10612485 100644
--- a/po/cs.po.in
+++ b/po/cs.po.in
@@ -20,14 +20,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-03-15 14:56+0000\n"
+"PO-Revision-Date: 2015-07-19 03:57+0000\n"
 "Last-Translator: Jakuje <jakuje@gmail.com>\n"
 "Language-Team: Čeština\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"Language: \n"
+"Language: cs\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -82,14 +82,6 @@ msgid "sixth exit"
 msgstr "šestý výjezd"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "za %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr "%d stop"
 
@@ -98,14 +90,6 @@ msgid "in %d feet"
 msgstr "za %d stop"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d metrů"
-
-#, c-format
-msgid "in %d meters"
-msgstr "za %d metrů"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr "%d.%d mílí"
 
@@ -114,14 +98,6 @@ msgid "in %d.%d miles"
 msgstr "za %d.%d mílí"
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d kilometrů"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "za %d.%d kilometrů"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] "%d míle"
@@ -136,6 +112,22 @@ msgstr[1] "za %d míle"
 msgstr[2] "za %d mílí"
 
 #, c-format
+msgid "%d meters"
+msgstr "%d metrů"
+
+#, c-format
+msgid "in %d meters"
+msgstr "za %d metrů"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d kilometrů"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "za %d.%d kilometrů"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d kilometr"
@@ -152,51 +144,51 @@ msgstr[2] "za %d kilometrů"
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name
 #, c-format
 msgid "%1$sonto the %2$s%3$s%4$s"
-msgstr ""
+msgstr "%1$sna %2$s%3$s%4$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
 #, c-format
 msgid "%1$sonto %2$s"
-msgstr ""
+msgstr "%1$sna %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|masculine form"
-msgstr ""
+msgstr "%1$sna %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|feminine form"
-msgstr ""
+msgstr "%1$sna %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|neuter form"
-msgstr ""
+msgstr "%1$sna %2$s"
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "na přivadeč"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sdo %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sdo %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sdo %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sdo %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -226,12 +218,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "pak sjeďte na %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Sjeďte na %1$s %2$s"
 
 msgid "soon"
 msgstr "brzy"
@@ -240,7 +232,7 @@ msgid "now"
 msgstr "nyní"
 
 msgid "then"
-msgstr ""
+msgstr "pak"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -343,25 +335,25 @@ msgstr "za %i silnice"
 #. 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 ""
+msgstr "Zabočte %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "pak otočte se"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Otočte se %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "pak otočte se"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Otočte se %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -391,7 +383,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Ukončit"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/cy.po.in b/po/cy.po.in
index f285b350..24046d40 100644
--- a/po/cy.po.in
+++ b/po/cy.po.in
@@ -2,6 +2,7 @@
 # Copyright (C) 2006-2015 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Padi Phillips https://launchpad.net/~padi
 # Simon Hewison https://launchpad.net/~simon-hewison-6
 
@@ -9,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-01-18 20:41+0000\n"
-"Last-Translator: Padi Phillips <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:57+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -71,35 +72,39 @@ msgid "sixth exit"
 msgstr "allanfa chweched"
 
 #, c-format
-msgid "%d m"
+msgid "%d feet"
 msgstr ""
 
 #, c-format
-msgid "in %d m"
+msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d feet"
+msgid "%d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "in %d feet"
+msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr ""
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "in %d meters"
-msgstr ""
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "%d.%d miles"
+msgid "%d meters"
 msgstr ""
 
 #, c-format
-msgid "in %d.%d miles"
+msgid "in %d meters"
 msgstr ""
 
 #, c-format
@@ -111,18 +116,6 @@ msgid "in %d.%d kilometers"
 msgstr ""
 
 #, c-format
-msgid "one mile"
-msgid_plural "%d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
-msgid "in one mile"
-msgid_plural "in %d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "un cilometr"
@@ -378,7 +371,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Allanfa"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/da.po.in b/po/da.po.in
index 80fc72d0..939f0744 100644
--- a/po/da.po.in
+++ b/po/da.po.in
@@ -16,14 +16,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-09-28 01:40+0000\n"
+"PO-Revision-Date: 2015-07-19 03:57+0000\n"
 "Last-Translator: Lasse Luttermann <luttermann@silenzio.dk>\n"
 "Language-Team: Glenn Sommer <glemsom@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"Language: \n"
+"Language: da\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -78,14 +78,6 @@ msgid "sixth exit"
 msgstr "sjette afkørsel"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "om %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -94,14 +86,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d meter"
-
-#, c-format
-msgid "in %d meters"
-msgstr "om %d meter"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -110,14 +94,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d kilometer"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "om %d.%d kilometer"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -130,6 +106,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d meter"
+
+#, c-format
+msgid "in %d meters"
+msgstr "om %d meter"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d kilometer"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "om %d.%d kilometer"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "én kilometer"
@@ -168,27 +160,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "op på rampen"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sind i %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sind i %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sind i %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sind i %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -213,17 +205,17 @@ msgstr "Kør snart ind i rundkørslen"
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
 msgid "Enter the roundabout %s"
-msgstr ""
+msgstr "Kør ind i rundkørslen %s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "forlad så rundkørslen ved den %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Forlad rundkørslen ved den %1$s %2$s"
 
 msgid "soon"
 msgstr "snart"
@@ -232,7 +224,7 @@ msgid "now"
 msgstr "nu"
 
 msgid "then"
-msgstr ""
+msgstr "så"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -263,12 +255,12 @@ msgstr ""
 #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance
 #, c-format
 msgid "Take exit %1$s %2$s %3$s"
-msgstr ""
+msgstr "Tag den afkørslen %1$s %2$s %3$s"
 
 #. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
 #, c-format
 msgid "Take the exit %1$s %2$s%3$s"
-msgstr ""
+msgstr "Tag den afkørslen %1$s %2$s%3$s"
 
 #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
 msgid "at interchange"
@@ -335,25 +327,25 @@ msgstr "efter %i veje"
 #. 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 ""
+msgstr "Drej %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "vend så om"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Vend om %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "vend så om"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Vend om %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -368,7 +360,7 @@ msgstr ""
 #. *
 #. 
 msgid "follow"
-msgstr ""
+msgstr "følg"
 
 msgid "then you have reached your destination."
 msgstr "og så ankommer du til din destination"
@@ -380,10 +372,10 @@ msgstr "Du er fremme ved destinationen %s"
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
-msgstr ""
+msgstr "Motorvejskryds"
 
 msgid "Exit"
-msgstr ""
+msgstr "Afkørsel"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/de.po.in b/po/de.po.in
index 890da68f..2d8fa932 100644
--- a/po/de.po.in
+++ b/po/de.po.in
@@ -22,6 +22,7 @@
 # Mathias Klein https://launchpad.net/~ma-klein
 # Paulodile https://launchpad.net/~stuff4tschaka
 # Roadrunner IN https://launchpad.net/~online
+# Robotaxi https://launchpad.net/~robotaxi
 # Roschkor https://launchpad.net/~bound-one2000
 # S.E. https://launchpad.net/~stephan-evert
 # Stefan Sordon https://launchpad.net/~stefan-sordon
@@ -39,14 +40,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-04-22 22:10+0000\n"
+"PO-Revision-Date: 2015-07-20 21:54+0000\n"
 "Last-Translator: Mathias Klein <ma_klein@gmx.de>\n"
 "Language-Team: Martin Schaller <martin-s@sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"Language: \n"
+"Language: de\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -101,36 +102,40 @@ msgid "sixth exit"
 msgstr "sechsten Ausfahrt"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
+msgid "%d feet"
+msgstr "%d Fuss"
 
 #, c-format
-msgid "in %d m"
-msgstr "in %d m"
+msgid "in %d feet"
+msgstr "In %d Fuss"
 
 #, c-format
-msgid "%d feet"
-msgstr "%d Fuss"
+msgid "%d.%d miles"
+msgstr "%d,%d Meilen"
 
 #, c-format
-msgid "in %d feet"
-msgstr "in %d Fuss"
+msgid "in %d.%d miles"
+msgstr "In %d,%d Meilen"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d Meter"
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] "eine Meile"
+msgstr[1] "%d Meilen"
 
 #, c-format
-msgid "in %d meters"
-msgstr "In %d Metern"
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] "In einer Meile"
+msgstr[1] "In %d Meilen"
 
 #, c-format
-msgid "%d.%d miles"
-msgstr "%d.%d Meilen"
+msgid "%d meters"
+msgstr "%d Meter"
 
 #, c-format
-msgid "in %d.%d miles"
-msgstr "in %d.%d Meilen"
+msgid "in %d meters"
+msgstr "In %d Metern"
 
 #, c-format
 msgid "%d.%d kilometers"
@@ -141,18 +146,6 @@ msgid "in %d.%d kilometers"
 msgstr "In %d,%d Kilometern"
 
 #, c-format
-msgid "one mile"
-msgid_plural "%d miles"
-msgstr[0] "eine Meile"
-msgstr[1] "%d Meilen"
-
-#, c-format
-msgid "in one mile"
-msgid_plural "in %d miles"
-msgstr[0] "in einer Meile"
-msgstr[1] "in %d Meilen"
-
-#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "einen Kilometer"
@@ -167,51 +160,51 @@ msgstr[1] "In %d Kilometern"
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name
 #, c-format
 msgid "%1$sonto the %2$s%3$s%4$s"
-msgstr ""
+msgstr "%1$sauf die %2$s%3$s%4$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
 #, c-format
 msgid "%1$sonto %2$s"
-msgstr ""
+msgstr "%1$sauf die Straße %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|masculine form"
-msgstr ""
+msgstr "%1$sauf den %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|feminine form"
-msgstr ""
+msgstr "%1$sauf die %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|neuter form"
-msgstr ""
+msgstr "%1$sauf das %2$s"
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "auf die Auffahrt"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sauf die Straße %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sauf den %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sauf die %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sauf das %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -225,7 +218,7 @@ msgstr "Wenn möglich, bitte wenden"
 #. TRANSLATORS: the argument is the destination to follow
 #, c-format
 msgid "towards %s"
-msgstr ""
+msgstr "Richtung %s"
 
 #, c-format
 msgid "Follow the road for the next %s"
@@ -237,17 +230,17 @@ msgstr "Demnächst in den Kreisverkehr einfahren"
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
 msgid "Enter the roundabout %s"
-msgstr ""
+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 %1$s %2$s"
-msgstr ""
+msgstr "anschließend verlassen Sie den Kreisverkehr an der %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Verlassen Sie den Kreisverkehr an der %1$s %2$s"
 
 msgid "soon"
 msgstr "Demnächst"
@@ -256,80 +249,80 @@ msgid "now"
 msgstr "Jetzt"
 
 msgid "then"
-msgstr ""
+msgstr "dann"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "then merge%1$s|right"
-msgstr ""
+msgstr "dann auf die%1$s auffahren"
 
 #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Merge %1$s%2$s|right"
-msgstr ""
+msgstr "Fahren Sie %1$s%2$s auf"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "then merge%1$s|left"
-msgstr ""
+msgstr "dann auf die%1$s auffahren"
 
 #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Merge %1$s%2$s|left"
-msgstr ""
+msgstr "Fahren Sie %1$s%2$s auf"
 
 msgid "on your left"
-msgstr ""
+msgstr "links"
 
 msgid "on your right"
-msgstr ""
+msgstr "rechts"
 
 #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance
 #, c-format
 msgid "Take exit %1$s %2$s %3$s"
-msgstr ""
+msgstr "%3$s nehmen Sie %2$s die Ausfahrt %1$s"
 
 #. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
 #, c-format
 msgid "Take the exit %1$s %2$s%3$s"
-msgstr ""
+msgstr "%2$s nehmen Sie %1$s die Ausfahrt %3$s"
 
 #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
 msgid "at interchange"
-msgstr ""
+msgstr "am Autobahnknoten"
 
 msgid "at exit"
-msgstr ""
+msgstr "an der Ausfahrt"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then continue straight%1$s"
-msgstr ""
+msgstr "dann%1$s geradeaus fahren"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Continue straight %1$s%2$s%3$s"
-msgstr ""
+msgstr "%1$s%2$s geradeaus fahren%3$s"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then keep right%1$s"
-msgstr ""
+msgstr "dann rechts halten%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Keep right %1$s%2$s%3$s"
-msgstr ""
+msgstr "%1$s rechts halten%2$s%3$s"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then keep left%1$s"
-msgstr ""
+msgstr "dann links halten%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Keep left %1$s%2$s%3$s"
-msgstr ""
+msgstr "%1$s links halten%2$s%3$s"
 
 #. TRANSLATORS: "right" as in "turn right"
 msgid "right"
@@ -363,21 +356,21 @@ msgstr "%3$s %1$s%2$s abbiegen%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "dann wenden"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Wenden Sie %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "dann wenden"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Wenden Sie %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -392,7 +385,7 @@ msgstr ""
 #. *
 #. 
 msgid "follow"
-msgstr ""
+msgstr "folgen"
 
 msgid "then you have reached your destination."
 msgstr "dann haben Sie Ihr Ziel erreicht."
@@ -404,10 +397,10 @@ msgstr "Sie haben Ihr Ziel %s erreicht"
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
-msgstr ""
+msgstr "Autobahnknoten"
 
 msgid "Exit"
-msgstr ""
+msgstr "Ausfahrt"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1477,6 +1470,16 @@ msgid ""
 "\t-h: print this usage info and exit.\n"
 "\t-v: print the version and exit.\n"
 msgstr ""
+"navit Verwendung:\n"
+"navit [Option] [configfile]\n"
+"\t-c <Datei>: benutze <Datei> als Konfigurationsdatei, anstatt der "
+"Standardkonfigurationsdatei.\n"
+"\t-d <n>: setze den globalen debug-level auf <n> (0=Fehler, 1=Warnung, "
+"2=Info, 3=Debug).\n"
+"\tEinstellungen der Konfigurationsdatei werden weiterhin gültig sein, wenn "
+"sie einen höheren Wert angeben.\n"
+"\t-h: zeige diesen Hilfetext und beende.\n"
+"\t-v: zeige die Version und beende.\n"
 
 #. We have not found an existing config file from all possibilities
 msgid "No config file navit.xml, navit.xml.local found\n"
@@ -2074,6 +2077,9 @@ msgid ""
 "Please restart Navit after you attach an SD card or select a different map "
 "location."
 msgstr ""
+"Der Speicherpfad für die Karte ist nicht verfügbar.\n"
+"Setzen Sie eine SD Karte ein und starten Sie Navit erneut\n"
+"oder wählen Sie einen anderen Pfad aus."
 
 msgid "Downloaded maps"
 msgstr "Heruntergeladene Karten"
@@ -2095,6 +2101,8 @@ msgid ""
 "New location set to %s\n"
 "Restart Navit to apply the changes."
 msgstr ""
+"Karten-Speicherort ist %s\n"
+"Starten Sie Navit erneut."
 
 msgid "Whole Planet"
 msgstr "Ganze Welt"
@@ -2657,7 +2665,7 @@ msgstr "Sichern / Wiederherstellen"
 
 #. Android resource: @strings/optionsmenu_set_map_location
 msgid "Set map location"
-msgstr ""
+msgstr "Kartenort festlegen"
 
 #. Android resource: @strings/map_delete
 msgid "Delete this map?"
@@ -2745,7 +2753,7 @@ msgstr "Sicherungsverzeichnis konnte nicht erstellt werden"
 
 #. Android resource: @strings/backup_failed
 msgid "Backup failed"
-msgstr "Sicherung Fehlgeschlagen"
+msgstr "Sicherung fehlgeschlagen"
 
 #. Android resource: @strings/no_backup_found
 msgid "No backup found"
@@ -2797,3 +2805,12 @@ msgid ""
 "currently selected engine reports it is unable to speak in your language. "
 "Should we ask the system to show voice download dialog?"
 msgstr ""
+"Navit kann jede text-to-speech engine nutzen, die installiert ist. Die\r\n"
+"derzeit angewählte engine kann Ihre Sprache nicht wiedergeben.\r\n"
+"Soll das System den Voice-Download Dialog öffnen?"
+
+#~ msgid "%d m"
+#~ msgstr "%d m"
+
+#~ msgid "in %d m"
+#~ msgstr "in %d m"
diff --git a/po/de_CH.po.in b/po/de_CH.po.in
index 6e914a86..f2cdef94 100644
--- a/po/de_CH.po.in
+++ b/po/de_CH.po.in
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"Language: \n"
+"Language: de_CH\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -69,35 +69,39 @@ msgid "sixth exit"
 msgstr ""
 
 #, c-format
-msgid "%d m"
+msgid "%d feet"
 msgstr ""
 
 #, c-format
-msgid "in %d m"
+msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d feet"
+msgid "%d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "in %d feet"
+msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr ""
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "in %d meters"
-msgstr ""
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "%d.%d miles"
+msgid "%d meters"
 msgstr ""
 
 #, c-format
-msgid "in %d.%d miles"
+msgid "in %d meters"
 msgstr ""
 
 #, c-format
@@ -109,18 +113,6 @@ msgid "in %d.%d kilometers"
 msgstr ""
 
 #, c-format
-msgid "one mile"
-msgid_plural "%d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
-msgid "in one mile"
-msgid_plural "in %d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] ""
diff --git a/po/el.po.in b/po/el.po.in
index 7b861ea1..086bf3f1 100644
--- a/po/el.po.in
+++ b/po/el.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:
 # KaZeR https://launchpad.net/~kazer
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Roadrunner IN https://launchpad.net/~online
 # aitolos https://launchpad.net/~yang-hellug
 # alichani https://launchpad.net/~alichani
@@ -13,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-12-07 10:54+0000\n"
-"Last-Translator: aitolos <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:57+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -75,14 +76,6 @@ msgid "sixth exit"
 msgstr "έκτη έξοδο"
 
 #, c-format
-msgid "%d m"
-msgstr "%d μ"
-
-#, c-format
-msgid "in %d m"
-msgstr "σε %d μ"
-
-#, c-format
 msgid "%d feet"
 msgstr "%d πόδια"
 
@@ -91,14 +84,6 @@ msgid "in %d feet"
 msgstr "σε %d πόδια"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d μέτρα"
-
-#, c-format
-msgid "in %d meters"
-msgstr "σε %d μέτρα"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr "%d.%d μίλια"
 
@@ -107,14 +92,6 @@ msgid "in %d.%d miles"
 msgstr "σε %d.%d μίλια"
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d χιλιόμετρα"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "σε %d %d χιλιόμετρα"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] "ένα μίλι"
@@ -127,6 +104,22 @@ msgstr[0] "σε ένα μίλι"
 msgstr[1] "σε %d μίλια"
 
 #, c-format
+msgid "%d meters"
+msgstr "%d μέτρα"
+
+#, c-format
+msgid "in %d meters"
+msgstr "σε %d μέτρα"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d χιλιόμετρα"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "σε %d %d χιλιόμετρα"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "Ένα χιλιόμετρο"
@@ -165,32 +158,32 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "στη ράμπα"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sστην οδό %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sστον %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sστην %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sστο %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
 msgid "%sinto the %s"
-msgstr "%s στην %s"
+msgstr "%sστην %s"
 
 msgid "When possible, please turn around"
 msgstr "Όταν είναι δυνατόν, κάνε αναστροφή"
@@ -215,12 +208,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "και βγείτε απο την κυκλική πορεία στην %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Εξοδος απο την κυκλική πορεία στην %1$s %2$s"
 
 msgid "soon"
 msgstr "σύντομα"
@@ -229,7 +222,7 @@ msgid "now"
 msgstr "τώρα"
 
 msgid "then"
-msgstr ""
+msgstr "και"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -318,7 +311,7 @@ msgstr "ελαφρά "
 
 #. TRANSLATORS: as in "turn strongly right"
 msgid "strongly "
-msgstr "Κλειστά "
+msgstr "κλειστά "
 
 #, c-format
 msgid "Take the %1$s road to the %2$s"
@@ -332,25 +325,25 @@ msgstr "μετά από %i δρόμους"
 #. 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 ""
+msgstr "Στρίψτε %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "και κάνε αναστροφή"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Κάνε αναστροφή %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "και κάνε αναστροφή"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Κάνε αναστροφή %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -380,7 +373,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Εξοδος"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/en_AU.po.in b/po/en_AU.po.in
index 80975d4d..46f14131 100644
--- a/po/en_AU.po.in
+++ b/po/en_AU.po.in
@@ -4,19 +4,20 @@
 # Many thanks to the contributors of this translation:
 # Athol Mullen https://launchpad.net/~athol-mullen
 # KaZeR https://launchpad.net/~kazer
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-09-28 01:41+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:57+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: English (Australia) <en_AU@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"Language: \n"
+"Language: en_AU\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -71,14 +72,6 @@ msgid "sixth exit"
 msgstr "sixth exit"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "in %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -87,14 +80,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d metres"
-
-#, c-format
-msgid "in %d meters"
-msgstr "in %d metres"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -103,14 +88,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d kilometres"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "in %d.%d kilometres"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -123,6 +100,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d metres"
+
+#, c-format
+msgid "in %d meters"
+msgstr "in %d metres"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d kilometres"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "in %d.%d kilometres"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "one kilometre"
@@ -147,21 +140,21 @@ msgstr ""
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|masculine form"
-msgstr ""
+msgstr "%1$sonto %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|feminine form"
-msgstr ""
+msgstr "%1$sonto %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|neuter form"
-msgstr ""
+msgstr "%1$sonto %2$s"
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "onto the motorway ramp"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
@@ -171,17 +164,17 @@ msgstr ""
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sinto %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sinto %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sinto %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -230,22 +223,22 @@ msgstr ""
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "then merge%1$s|right"
-msgstr ""
+msgstr "then merge%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Merge %1$s%2$s|right"
-msgstr ""
+msgstr "Merge %1$s%2$s"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "then merge%1$s|left"
-msgstr ""
+msgstr "then merge%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Merge %1$s%2$s|left"
-msgstr ""
+msgstr "Merge %1$s%2$s"
 
 msgid "on your left"
 msgstr ""
@@ -328,25 +321,25 @@ msgstr "after %i roads"
 #. 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 ""
+msgstr "Turn %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "then make a U-turn"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Make a U-turn %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "then make a U-turn"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Make a U-turn %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -373,10 +366,10 @@ msgstr "You have reached your destination %s"
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
-msgstr ""
+msgstr "Interchange"
 
 msgid "Exit"
-msgstr ""
+msgstr "Exit"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/en_CA.po.in b/po/en_CA.po.in
index f97b9f87..97ec63eb 100644
--- a/po/en_CA.po.in
+++ b/po/en_CA.po.in
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2012-11-20 02:05+0000\n"
+"PO-Revision-Date: 2015-07-19 03:57+0000\n"
 "Last-Translator: Frank Bax <frank@bax.on.ca>\n"
 "Language-Team: English (Canada) <en_CA@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"Language: \n"
+"Language: en_CA\n"
 
 msgid "Running from source directory\n"
 msgstr "Running from source directory\n"
@@ -69,14 +69,6 @@ msgid "sixth exit"
 msgstr "sixth exit"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "in %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -85,14 +77,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d meters"
-
-#, c-format
-msgid "in %d meters"
-msgstr "in %d meters"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -101,14 +85,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d kilometres"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "in %d.%d kilometres"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -121,6 +97,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d meters"
+
+#, c-format
+msgid "in %d meters"
+msgstr "in %d meters"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d kilometres"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "in %d.%d kilometres"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "one kilometre"
@@ -145,21 +137,21 @@ msgstr ""
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|masculine form"
-msgstr ""
+msgstr "%1$sonto %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|feminine form"
-msgstr ""
+msgstr "%1$sonto %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|neuter form"
-msgstr ""
+msgstr "%1$sonto %2$s"
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "onto the motorway ramp"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
@@ -169,17 +161,17 @@ msgstr ""
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sinto %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sinto %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sinto %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -228,22 +220,22 @@ msgstr ""
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "then merge%1$s|right"
-msgstr ""
+msgstr "then merge%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Merge %1$s%2$s|right"
-msgstr ""
+msgstr "Merge %1$s%2$s"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "then merge%1$s|left"
-msgstr ""
+msgstr "then merge%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Merge %1$s%2$s|left"
-msgstr ""
+msgstr "Merge %1$s%2$s"
 
 msgid "on your left"
 msgstr ""
@@ -326,25 +318,25 @@ msgstr "after %i roads"
 #. 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 ""
+msgstr "Turn %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "then make a U-turn"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Make a U-turn %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "then make a U-turn"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Make a U-turn %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -371,10 +363,10 @@ msgstr "You have reached your destination %s"
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
-msgstr ""
+msgstr "Interchange"
 
 msgid "Exit"
-msgstr ""
+msgstr "Exit"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/en_GB.po.in b/po/en_GB.po.in
index b3c8d37c..a9494c87 100644
--- a/po/en_GB.po.in
+++ b/po/en_GB.po.in
@@ -16,14 +16,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-05-17 09:19+0000\n"
+"PO-Revision-Date: 2015-07-19 03:58+0000\n"
 "Last-Translator: jan <jandegr1@hotmail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"Language: \n"
+"Language: en_GB\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -78,14 +78,6 @@ msgid "sixth exit"
 msgstr "sixth exit"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "in %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr "%d feet"
 
@@ -94,14 +86,6 @@ msgid "in %d feet"
 msgstr "in %d feet"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d metres"
-
-#, c-format
-msgid "in %d meters"
-msgstr "in %d metres"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr "%d.%d miles"
 
@@ -110,14 +94,6 @@ msgid "in %d.%d miles"
 msgstr "in %d.%d miles"
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d kilometres"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "in %d.%d kilometres"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] "one mile"
@@ -130,6 +106,22 @@ msgstr[0] "in one mile"
 msgstr[1] "in %d miles"
 
 #, c-format
+msgid "%d meters"
+msgstr "%d metres"
+
+#, c-format
+msgid "in %d meters"
+msgstr "in %d metres"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d kilometres"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "in %d.%d kilometres"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "one kilometre"
@@ -154,21 +146,21 @@ msgstr ""
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|masculine form"
-msgstr ""
+msgstr "%1$sonto %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|feminine form"
-msgstr ""
+msgstr "%1$sonto %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|neuter form"
-msgstr ""
+msgstr "%1$sonto %2$s"
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "onto the slip road"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
@@ -178,17 +170,17 @@ msgstr ""
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sinto %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sinto %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sinto %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -237,22 +229,22 @@ msgstr ""
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "then merge%1$s|right"
-msgstr ""
+msgstr "then merge%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Merge %1$s%2$s|right"
-msgstr ""
+msgstr "Merge %1$s%2$s"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "then merge%1$s|left"
-msgstr ""
+msgstr "then merge%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Merge %1$s%2$s|left"
-msgstr ""
+msgstr "Merge %1$s%2$s"
 
 msgid "on your left"
 msgstr ""
@@ -335,25 +327,25 @@ msgstr "after %i roads"
 #. 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 ""
+msgstr "Turn %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "then make a U-turn"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Make a U-turn %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "then make a U-turn"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Make a U-turn %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -380,10 +372,10 @@ msgstr "You have reached your destination %s"
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
-msgstr ""
+msgstr "Interchange"
 
 msgid "Exit"
-msgstr ""
+msgstr "Exit"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/eo.po.in b/po/eo.po.in
index 1118e639..c31ea5c2 100644
--- a/po/eo.po.in
+++ b/po/eo.po.in
@@ -5,14 +5,15 @@
 # KaZeR https://launchpad.net/~kazer
 # Lucas Larson https://launchpad.net/~lucaslarson
 # Michael Moroni https://launchpad.net/~airon90
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # OlivierWeb https://launchpad.net/~olivierweb
 
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-09-27 21:43+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:58+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,14 +74,6 @@ msgid "sixth exit"
 msgstr "sesa eliro"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "en %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -89,14 +82,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d metroj"
-
-#, c-format
-msgid "in %d meters"
-msgstr "en %d metrojn"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -105,14 +90,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d kilometrojn"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "en %d.%d kilometrojn"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -125,6 +102,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d metroj"
+
+#, c-format
+msgid "in %d meters"
+msgstr "en %d metrojn"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d kilometrojn"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "en %d.%d kilometrojn"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "unu kilometro"
@@ -163,27 +156,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "al la ramplon"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sal la %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sal la %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sal la %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sal la %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -213,12 +206,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "do lasu la trafikcirklon ĉe la %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Lasu la trafikcirklon ĉe la %1$s %2$s"
 
 msgid "soon"
 msgstr "baldaŭ"
@@ -227,7 +220,7 @@ msgid "now"
 msgstr "nun"
 
 msgid "then"
-msgstr ""
+msgstr "do"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -330,25 +323,25 @@ msgstr "post %i stratoj"
 #. 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 ""
+msgstr "Turnu %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "do ĉirkaŭturnu"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Ĉirkaŭturnu %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "do ĉirkaŭturnu"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Ĉirkaŭturnu %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -363,7 +356,7 @@ msgstr ""
 #. *
 #. 
 msgid "follow"
-msgstr ""
+msgstr "sekvu"
 
 msgid "then you have reached your destination."
 msgstr "do vi atingis la celon"
@@ -378,7 +371,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Eliro"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/es.po.in b/po/es.po.in
index 798cec4c..1c2082c6 100644
--- a/po/es.po.in
+++ b/po/es.po.in
@@ -11,6 +11,7 @@
 # Jonay https://launchpad.net/~jonay-santana
 # KaZeR https://launchpad.net/~kazer
 # Luis Alejandro Rangel Sánchez https://launchpad.net/~xlarsx
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Paco Molinero https://launchpad.net/~franciscomol
 # Ricardo Jurado https://launchpad.net/~ricky131313
 # agerio https://launchpad.net/~agerio
@@ -24,14 +25,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-12-18 16:54+0000\n"
-"Last-Translator: iceman75 <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:58+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Chris Eubank <cteubank@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"Language: \n"
+"Language: es\n"
 
 msgid "Running from source directory\n"
 msgstr "Ejecutando desde el directorio fuente\n"
@@ -85,14 +86,6 @@ msgid "sixth exit"
 msgstr "sexta salida"
 
 #, c-format
-msgid "%d m"
-msgstr "%d metros"
-
-#, c-format
-msgid "in %d m"
-msgstr "en %d metros"
-
-#, c-format
 msgid "%d feet"
 msgstr "%d pies"
 
@@ -101,14 +94,6 @@ msgid "in %d feet"
 msgstr "en %d pies"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d metros"
-
-#, c-format
-msgid "in %d meters"
-msgstr "en %d metros"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr "%d,%d millas"
 
@@ -117,14 +102,6 @@ msgid "in %d.%d miles"
 msgstr "en %d,%d millas"
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d,%d kilómetros"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "en %d,%d kilómetros"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] "una milla"
@@ -137,6 +114,22 @@ msgstr[0] "en una milla"
 msgstr[1] "en %d millas"
 
 #, c-format
+msgid "%d meters"
+msgstr "%d metros"
+
+#, c-format
+msgid "in %d meters"
+msgstr "en %d metros"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d,%d kilómetros"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "en %d,%d kilómetros"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "un kilómetro"
@@ -151,56 +144,56 @@ msgstr[1] "en %d kilómetros"
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name
 #, c-format
 msgid "%1$sonto the %2$s%3$s%4$s"
-msgstr ""
+msgstr "%1$sen la %2$s%3$s%4$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
 #, c-format
 msgid "%1$sonto %2$s"
-msgstr ""
+msgstr "%1$sen la carretera %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|masculine form"
-msgstr ""
+msgstr "%1$sen el %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|feminine form"
-msgstr ""
+msgstr "%1$sen la %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|neuter form"
-msgstr ""
+msgstr "%1$sen la carretera %2$s"
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "en el carril de entrada"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sen la calle %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sen el %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sen la %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sen la calle %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
 msgid "%sinto the %s"
-msgstr "%s en la %s"
+msgstr "%sen la %s"
 
 msgid "When possible, please turn around"
 msgstr "Dé la vuelta cuando sea posible"
@@ -208,7 +201,7 @@ msgstr "Dé la vuelta cuando sea posible"
 #. TRANSLATORS: the argument is the destination to follow
 #, c-format
 msgid "towards %s"
-msgstr ""
+msgstr "hacia %s"
 
 #, c-format
 msgid "Follow the road for the next %s"
@@ -225,12 +218,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "después salga de la rotonda por la %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Salga de la rotonda por la %1$s %2$s"
 
 msgid "soon"
 msgstr "próximamente"
@@ -239,80 +232,80 @@ msgid "now"
 msgstr "ahora"
 
 msgid "then"
-msgstr ""
+msgstr "luego"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "then merge%1$s|right"
-msgstr ""
+msgstr "luego entre%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Merge %1$s%2$s|right"
-msgstr ""
+msgstr "Entre%2$s %1$s"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "then merge%1$s|left"
-msgstr ""
+msgstr "luego entre%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Merge %1$s%2$s|left"
-msgstr ""
+msgstr "Entre%2$s %1$s"
 
 msgid "on your left"
-msgstr ""
+msgstr "a la izquierda"
 
 msgid "on your right"
-msgstr ""
+msgstr "a la derecha"
 
 #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance
 #, c-format
 msgid "Take exit %1$s %2$s %3$s"
-msgstr ""
+msgstr "Tome la salida %1$s %2$s %3$s"
 
 #. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
 #, c-format
 msgid "Take the exit %1$s %2$s%3$s"
-msgstr ""
+msgstr "Tome la salida %1$s %2$s%3$s"
 
 #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
 msgid "at interchange"
-msgstr ""
+msgstr "al enlace"
 
 msgid "at exit"
-msgstr ""
+msgstr "a la salida"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then continue straight%1$s"
-msgstr ""
+msgstr "luego continúe todo recto%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Continue straight %1$s%2$s%3$s"
-msgstr ""
+msgstr "Continúe todo recto %1$s%2$s%3$s"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then keep right%1$s"
-msgstr ""
+msgstr "luego manténgase por la derecha%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Keep right %1$s%2$s%3$s"
-msgstr ""
+msgstr "Manténgase por la derecha %1$s%2$s%3$s"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then keep left%1$s"
-msgstr ""
+msgstr "luego manténgase por la izquierda%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Keep left %1$s%2$s%3$s"
-msgstr ""
+msgstr "Manténgase por la izquierda %1$s%2$s%3$s"
 
 #. TRANSLATORS: "right" as in "turn right"
 msgid "right"
@@ -342,25 +335,25 @@ msgstr "después de %i carreteras"
 #. 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 ""
+msgstr "Gire %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "luego dé la vuelta"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Dé la vuelta %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "luego dé la vuelta"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Dé la vuelta %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -375,7 +368,7 @@ msgstr ""
 #. *
 #. 
 msgid "follow"
-msgstr ""
+msgstr "continúe"
 
 msgid "then you have reached your destination."
 msgstr "entonces ha llegado a su destino."
@@ -387,10 +380,10 @@ msgstr "Ha llegado a su destino %s"
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
-msgstr ""
+msgstr "Enlace"
 
 msgid "Exit"
-msgstr ""
+msgstr "Salida"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1645,19 +1638,19 @@ msgid "Data"
 msgstr "Datos"
 
 msgid "Pharmacy"
-msgstr ""
+msgstr "Farmacia"
 
 msgid "Restaurant"
-msgstr ""
+msgstr "Restaurante"
 
 msgid "Restaurant. Fast food"
 msgstr ""
 
 msgid "Hotel"
-msgstr ""
+msgstr "Hotel"
 
 msgid "Car parking"
-msgstr ""
+msgstr "Estacionamiento"
 
 msgid "Fuel station"
 msgstr ""
@@ -1669,19 +1662,19 @@ msgid "Hospital"
 msgstr ""
 
 msgid "Cinema"
-msgstr ""
+msgstr "Cine"
 
 msgid "Train station"
 msgstr ""
 
 msgid "School"
-msgstr ""
+msgstr "Escuela"
 
 msgid "Police"
-msgstr ""
+msgstr "Policía"
 
 msgid "Justice"
-msgstr ""
+msgstr "Juzgado"
 
 msgid "Taxi"
 msgstr ""
@@ -2025,7 +2018,7 @@ msgstr "Vuelva a la ruta"
 
 #. warning told
 msgid "Look out! Camera!"
-msgstr "!Atención! Radar"
+msgstr "¡Atención! Radar"
 
 #. warning told
 msgid "Please decrease your speed"
@@ -2189,16 +2182,16 @@ msgid "Baden-Wuerttemberg"
 msgstr "Baden-Wuerttemberg"
 
 msgid "Bayern"
-msgstr "Bayern"
+msgstr "Baviera"
 
 msgid "Mittelfranken"
 msgstr "Franconia Media"
 
 msgid "Niederbayern"
-msgstr "Bajo Bayern"
+msgstr "Baja Baviera"
 
 msgid "Oberbayern"
-msgstr "Alto Bayern"
+msgstr "Alta Baviera"
 
 msgid "Oberfranken"
 msgstr "Alta Franconia"
diff --git a/po/et.po.in b/po/et.po.in
index 55f5fd8f..d802ab54 100644
--- a/po/et.po.in
+++ b/po/et.po.in
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-04-13 06:57+0000\n"
+"PO-Revision-Date: 2015-07-19 03:58+0000\n"
 "Last-Translator: Manuel Hohmann <mhohmann@physnet.uni-hamburg.de>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -74,14 +74,6 @@ msgid "sixth exit"
 msgstr "kuuendast mahasõidust"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "%d m pärast"
-
-#, c-format
 msgid "%d feet"
 msgstr "%d jalga"
 
@@ -90,14 +82,6 @@ msgid "in %d feet"
 msgstr "%d jala pärast"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d meetrit"
-
-#, c-format
-msgid "in %d meters"
-msgstr "%d meetri pärast"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr "%d.%d miili"
 
@@ -106,14 +90,6 @@ msgid "in %d.%d miles"
 msgstr "%d.%d miili pärast"
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d kilomeetrit"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "%d.%d kilomeetri pärast"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] "üks miil"
@@ -126,6 +102,22 @@ msgstr[0] "ühe miili pärast"
 msgstr[1] "%d miili pärast"
 
 #, c-format
+msgid "%d meters"
+msgstr "%d meetrit"
+
+#, c-format
+msgid "in %d meters"
+msgstr "%d meetri pärast"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d kilomeetrit"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "%d.%d kilomeetri pärast"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "üks kilomeeter"
@@ -164,27 +156,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "kaldteele"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%s %s%s%s tänavale"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%s %s%s%s tänavale"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%s %s%s%s tänavale"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%s %s%s%s tänavale"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -214,12 +206,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "siis lahku ringteelt %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Lahku ringteelt %1$s %2$s"
 
 msgid "soon"
 msgstr "varsti"
@@ -228,7 +220,7 @@ msgid "now"
 msgstr "nüüd"
 
 msgid "then"
-msgstr ""
+msgstr "siis"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -251,10 +243,10 @@ msgid "Merge %1$s%2$s|left"
 msgstr ""
 
 msgid "on your left"
-msgstr ""
+msgstr "vasakul pool"
 
 msgid "on your right"
-msgstr ""
+msgstr "paremal pool"
 
 #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance
 #, c-format
@@ -335,21 +327,21 @@ msgstr "Pööra %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "siis pööra ümber"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Pööra ümber %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "siis pööra ümber"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Pööra ümber %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -379,7 +371,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Mahasõit"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/eu.po.in b/po/eu.po.in
index 9d0555e6..49128aac 100644
--- a/po/eu.po.in
+++ b/po/eu.po.in
@@ -9,7 +9,7 @@ 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"
+"PO-Revision-Date: 2015-07-19 03:58+0000\n"
 "Last-Translator: Inaki Saez <Inaki.Saez@gmail.com>\n"
 "Language-Team: Basque <eu@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -71,14 +71,6 @@ msgid "sixth exit"
 msgstr "seigarren irteera"
 
 #, c-format
-msgid "%d m"
-msgstr "%d metro"
-
-#, c-format
-msgid "in %d m"
-msgstr "%d metrotan"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -87,14 +79,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d metro"
-
-#, c-format
-msgid "in %d meters"
-msgstr "%d metrotan"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -103,14 +87,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d,%d kilometro"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "%d,%d kilometrotan"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -123,6 +99,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d metro"
+
+#, c-format
+msgid "in %d meters"
+msgstr "%d metrotan"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d,%d kilometro"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "%d,%d kilometrotan"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "kilometro bat"
@@ -161,27 +153,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "maldan"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%s %s %s %s kalean"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%s %s%s%s-an"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%s %s%s%s-an"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%s %s%s%s-en"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -211,12 +203,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "gero, irten errotondatik %1$s-ean %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Irten errotondatik %1$s-ean %2$s"
 
 msgid "soon"
 msgstr "hurrengotan"
@@ -328,7 +320,7 @@ msgstr "%i bideen ondoren"
 #. 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 ""
+msgstr "Biratu %1$s%2$s-ra %3$s%4$s-tan"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
@@ -376,7 +368,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Irteera"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/fa.po.in b/po/fa.po.in
index 084b22e5..dd1838f3 100644
--- a/po/fa.po.in
+++ b/po/fa.po.in
@@ -2,14 +2,15 @@
 # Copyright (C) 2006-2015 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # the_cephalex https://launchpad.net/~ali-rashidi
 
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-06-28 21:57+0000\n"
-"Last-Translator: the_cephalex <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:58+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,14 +70,6 @@ msgid "sixth exit"
 msgstr "ششمین راه"
 
 #, c-format
-msgid "%d m"
-msgstr "%d دقیقه"
-
-#, c-format
-msgid "in %d m"
-msgstr ""
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -85,14 +78,6 @@ msgid "in %d feet"
 msgstr "%d فوت"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d متر"
-
-#, c-format
-msgid "in %d meters"
-msgstr ""
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -101,14 +86,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr ""
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr ""
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -121,6 +98,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d متر"
+
+#, c-format
+msgid "in %d meters"
+msgstr ""
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr ""
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] ""
@@ -159,7 +152,7 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "به سوی شیب"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
@@ -374,7 +367,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "بیرون"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/fi.po.in b/po/fi.po.in
index 37970f7c..3f5805c9 100644
--- a/po/fi.po.in
+++ b/po/fi.po.in
@@ -14,14 +14,14 @@ 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"
+"PO-Revision-Date: 2015-07-19 03:58+0000\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@canonical.com>\n"
 "Language-Team: Ossi Berg <o.berg@mail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"Language: \n"
+"Language: fi\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -76,14 +76,6 @@ msgid "sixth exit"
 msgstr "kuudennesta liittymästä"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "%d m päästä"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -92,14 +84,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d metriä"
-
-#, c-format
-msgid "in %d meters"
-msgstr "%d metrin päästä"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -108,14 +92,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d kilometriä"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "%d,%d kilometrin päästä"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -128,6 +104,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d metriä"
+
+#, c-format
+msgid "in %d meters"
+msgstr "%d metrin päästä"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d kilometriä"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "%d,%d kilometrin päästä"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "yksi kilometri"
@@ -166,27 +158,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "rampille"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%skadulle %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%skadulle %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%skadulle %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%skadulle %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -230,7 +222,7 @@ msgid "now"
 msgstr "nyt"
 
 msgid "then"
-msgstr ""
+msgstr "sitten"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -333,25 +325,25 @@ msgstr "%i tien jälkeen"
 #. 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 ""
+msgstr "Käänny %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "tee sitten u-käännös"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Tee u-käännös %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "tee sitten u-käännös"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Tee u-käännös %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -381,7 +373,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Poistumistie"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/fil.po.in b/po/fil.po.in
index e139750c..229770a1 100644
--- a/po/fil.po.in
+++ b/po/fil.po.in
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2012-09-26 07:21+0000\n"
+"PO-Revision-Date: 2015-07-19 03:58+0000\n"
 "Last-Translator: chito <cnuarin@gmail.com>\n"
 "Language-Team: Filipino <fil@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -69,35 +69,39 @@ msgid "sixth exit"
 msgstr "pang-anim na labasan"
 
 #, c-format
-msgid "%d m"
+msgid "%d feet"
 msgstr ""
 
 #, c-format
-msgid "in %d m"
+msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d feet"
+msgid "%d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "in %d feet"
+msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr ""
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "in %d meters"
-msgstr ""
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "%d.%d miles"
+msgid "%d meters"
 msgstr ""
 
 #, c-format
-msgid "in %d.%d miles"
+msgid "in %d meters"
 msgstr ""
 
 #, c-format
@@ -109,18 +113,6 @@ msgid "in %d.%d kilometers"
 msgstr "%d.%d kilometro"
 
 #, c-format
-msgid "one mile"
-msgid_plural "%d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
-msgid "in one mile"
-msgid_plural "in %d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] ""
@@ -164,22 +156,22 @@ msgstr ""
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%s sa kalyeng %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%s sa kalyeng %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%s sa kalyeng %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%s sa kalyeng %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -187,7 +179,7 @@ msgid "%sinto the %s"
 msgstr ""
 
 msgid "When possible, please turn around"
-msgstr "kung maari ay bumalik"
+msgstr "Kung maari ay bumalik"
 
 #. TRANSLATORS: the argument is the destination to follow
 #, c-format
@@ -209,12 +201,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "pagkatapos ay lumabas sa rotonda sa may %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Lisanin ang rotonda sa may %1$s %2$s"
 
 msgid "soon"
 msgstr ""
@@ -374,7 +366,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Labasan"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/fo.po.in b/po/fo.po.in
index 4e555193..9c5e40c7 100644
--- a/po/fo.po.in
+++ b/po/fo.po.in
@@ -9,7 +9,7 @@ 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"
+"PO-Revision-Date: 2015-07-19 03:58+0000\n"
 "Last-Translator: Cyberish <kajsten@gmail.com>\n"
 "Language-Team: Faroese <fo@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -71,14 +71,6 @@ msgid "sixth exit"
 msgstr "sætta avkoyring"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "um %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -87,14 +79,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d metrar"
-
-#, c-format
-msgid "in %d meters"
-msgstr "um %d metrar"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -103,14 +87,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d kilometrar"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "um %d.%d kilometrar"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -123,6 +99,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d metrar"
+
+#, c-format
+msgid "in %d meters"
+msgstr "um %d metrar"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d kilometrar"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "um %d.%d kilometrar"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "ein kilometur"
@@ -161,27 +153,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "uppá rampuna"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sinná gøtuna %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sinná %s%s%sur"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sinná %s%s%sa"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sinná %s%s%si"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -189,7 +181,7 @@ msgid "%sinto the %s"
 msgstr "%sinná %s"
 
 msgid "When possible, please turn around"
-msgstr "vend um skótast tilber"
+msgstr "Vend um skótast tilber"
 
 #. TRANSLATORS: the argument is the destination to follow
 #, c-format
@@ -211,12 +203,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "far so út úr rundkoyring við %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Far so út úr rundkoyring við %1$s %2$s"
 
 msgid "soon"
 msgstr "skjótt"
@@ -225,7 +217,7 @@ msgid "now"
 msgstr "nú"
 
 msgid "then"
-msgstr ""
+msgstr "so"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -328,25 +320,25 @@ msgstr "eftir %i vegir"
 #. 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 ""
+msgstr "dreya %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "vend so um"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Vend um %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "vend so um"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Vend um %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -376,7 +368,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Avkoyring"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/fr.po.in b/po/fr.po.in
index ca0cfae5..8b4d7624 100644
--- a/po/fr.po.in
+++ b/po/fr.po.in
@@ -11,6 +11,7 @@
 # Jean-Marc https://launchpad.net/~m-balthazar
 # Jérôme BLUM https://launchpad.net/~jblum
 # KaZeR https://launchpad.net/~kazer
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Roadrunner IN https://launchpad.net/~online
 # Thibault Lemaitre https://launchpad.net/~thibault.lemaitre
 # Thjazi https://launchpad.net/~pa2l
@@ -27,8 +28,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-04-21 18:51+0000\n"
-"Last-Translator: Jean-Marc <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:58+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: KaZeR <kazer@altern.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,14 +90,6 @@ msgid "sixth exit"
 msgstr "sixième sortie"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "dans %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr "%d pieds"
 
@@ -105,14 +98,6 @@ msgid "in %d feet"
 msgstr "dans %d pieds"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d mètres"
-
-#, c-format
-msgid "in %d meters"
-msgstr "dans %d mètres"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr "%d.%d milles"
 
@@ -121,14 +106,6 @@ msgid "in %d.%d miles"
 msgstr "dans %d.%d milles"
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d kilomètres %d"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "dans %d kilomètres %d"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] "un mile"
@@ -141,6 +118,22 @@ msgstr[0] "dans un mile"
 msgstr[1] "dans %d miles"
 
 #, c-format
+msgid "%d meters"
+msgstr "%d mètres"
+
+#, c-format
+msgid "in %d meters"
+msgstr "dans %d mètres"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d kilomètres %d"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "dans %d kilomètres %d"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "un kilomètre"
@@ -155,51 +148,51 @@ msgstr[1] "dans %d kilomètres"
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name
 #, c-format
 msgid "%1$sonto the %2$s%3$s%4$s"
-msgstr ""
+msgstr "%1$svers %2$s%3$s%4$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
 #, c-format
 msgid "%1$sonto %2$s"
-msgstr ""
+msgstr "%1$svers %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|masculine form"
-msgstr ""
+msgstr "%1$svers le %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|feminine form"
-msgstr ""
+msgstr "%1$svers la %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|neuter form"
-msgstr ""
+msgstr "%1$svers l'%2$s"
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "vers la bretelle"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%ssur %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%ssur le %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%ssur la %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%ssur l'%s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -212,7 +205,7 @@ msgstr "Dès que possible, faites demi-tour"
 #. TRANSLATORS: the argument is the destination to follow
 #, c-format
 msgid "towards %s"
-msgstr ""
+msgstr "vers %s"
 
 #, c-format
 msgid "Follow the road for the next %s"
@@ -229,12 +222,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "puis sortez du rond-point à la %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Sortez du rond-point à la %1$s %2$s"
 
 msgid "soon"
 msgstr "bientôt"
@@ -243,7 +236,7 @@ msgid "now"
 msgstr "maintenant"
 
 msgid "then"
-msgstr ""
+msgstr "puis"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -274,19 +267,19 @@ msgstr ""
 #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance
 #, c-format
 msgid "Take exit %1$s %2$s %3$s"
-msgstr ""
+msgstr "Prenez la sortie %1$s %2$s %3$s"
 
 #. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
 #, c-format
 msgid "Take the exit %1$s %2$s%3$s"
-msgstr ""
+msgstr "Prenez la sortie %1$s %2$s%3$s"
 
 #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
 msgid "at interchange"
-msgstr ""
+msgstr "à l'èchangeur"
 
 msgid "at exit"
-msgstr ""
+msgstr "à la sortie"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
@@ -353,21 +346,21 @@ msgstr ""
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "puis faites demi-tour"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Faites demi-tour %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "puis faites demi-tour"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Faites demi-tour %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -382,7 +375,7 @@ msgstr ""
 #. *
 #. 
 msgid "follow"
-msgstr ""
+msgstr "suivez"
 
 msgid "then you have reached your destination."
 msgstr "puis vous arriverez à destination"
@@ -390,14 +383,14 @@ 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"
+msgstr "Vous êtes arrivé à destination %s"
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
-msgstr ""
+msgstr "Echangeur"
 
 msgid "Exit"
-msgstr ""
+msgstr "Sortie"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/fr_CH.po.in b/po/fr_CH.po.in
index eb68ea32..070441b6 100644
--- a/po/fr_CH.po.in
+++ b/po/fr_CH.po.in
@@ -3,19 +3,20 @@
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-09-28 01:42+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:58+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: KaZeR <kazer@altern.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"Language: \n"
+"Language: fr_CH\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -70,14 +71,6 @@ msgid "sixth exit"
 msgstr "la sixième sortie"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "dans %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -86,14 +79,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d mètres"
-
-#, c-format
-msgid "in %d meters"
-msgstr "dans %d mètres"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -102,14 +87,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d kilomètres"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "dans %d.%d kilomètres"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -122,6 +99,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d mètres"
+
+#, c-format
+msgid "in %d meters"
+msgstr "dans %d mètres"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d kilomètres"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "dans %d.%d kilomètres"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "un kilomètre"
@@ -136,51 +129,51 @@ msgstr[1] "dans %d kilomètres"
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name
 #, c-format
 msgid "%1$sonto the %2$s%3$s%4$s"
-msgstr ""
+msgstr "%1$svers %2$s%3$s%4$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
 #, c-format
 msgid "%1$sonto %2$s"
-msgstr ""
+msgstr "%1$svers %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|masculine form"
-msgstr ""
+msgstr "%1$svers le %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|feminine form"
-msgstr ""
+msgstr "%1$svers la %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|neuter form"
-msgstr ""
+msgstr "%1$svers l'%2$s"
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "vers la bretelle"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%ssur %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%ssur le %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%ssur la %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%ssur l'%s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -193,7 +186,7 @@ msgstr "Dès que possible, faites demi-tour"
 #. TRANSLATORS: the argument is the destination to follow
 #, c-format
 msgid "towards %s"
-msgstr ""
+msgstr "vers %s"
 
 #, c-format
 msgid "Follow the road for the next %s"
@@ -210,12 +203,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "puis sortez du rond-point à la %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Sortez du rond-point à la %1$s %2$s"
 
 msgid "soon"
 msgstr "bientôt"
@@ -224,7 +217,7 @@ msgid "now"
 msgstr "maintenant"
 
 msgid "then"
-msgstr ""
+msgstr "puis"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -255,19 +248,19 @@ msgstr ""
 #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance
 #, c-format
 msgid "Take exit %1$s %2$s %3$s"
-msgstr ""
+msgstr "Prenez la sortie %1$s %2$s %3$s"
 
 #. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
 #, c-format
 msgid "Take the exit %1$s %2$s%3$s"
-msgstr ""
+msgstr "Prenez la sortie %1$s %2$s%3$s"
 
 #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
 msgid "at interchange"
-msgstr ""
+msgstr "à l'èchangeur"
 
 msgid "at exit"
-msgstr ""
+msgstr "à la sortie"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
@@ -334,21 +327,21 @@ msgstr ""
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "puis faites demi-tour"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Faites demi-tour %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "puis faites demi-tour"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Faites demi-tour %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -363,7 +356,7 @@ msgstr ""
 #. *
 #. 
 msgid "follow"
-msgstr ""
+msgstr "suivez"
 
 msgid "then you have reached your destination."
 msgstr "ensuite vous serez à destination"
@@ -371,14 +364,14 @@ msgstr "ensuite vous serez à destination"
 #. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
-msgstr "Vous êtes arrivé à destination : %s"
+msgstr "Vous êtes arrivé à destination %s"
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
-msgstr ""
+msgstr "Echangeur"
 
 msgid "Exit"
-msgstr ""
+msgstr "Sortie"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/fy.po.in b/po/fy.po.in
index 7953a637..27a8d22d 100644
--- a/po/fy.po.in
+++ b/po/fy.po.in
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"Language: \n"
+"Language: fy\n"
 
 msgid "Running from source directory\n"
 msgstr ""
@@ -69,35 +69,39 @@ msgid "sixth exit"
 msgstr ""
 
 #, c-format
-msgid "%d m"
+msgid "%d feet"
 msgstr ""
 
 #, c-format
-msgid "in %d m"
+msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d feet"
+msgid "%d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "in %d feet"
+msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr ""
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "in %d meters"
-msgstr ""
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "%d.%d miles"
+msgid "%d meters"
 msgstr ""
 
 #, c-format
-msgid "in %d.%d miles"
+msgid "in %d meters"
 msgstr ""
 
 #, c-format
@@ -109,18 +113,6 @@ msgid "in %d.%d kilometers"
 msgstr ""
 
 #, c-format
-msgid "one mile"
-msgid_plural "%d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
-msgid "in one mile"
-msgid_plural "in %d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] ""
diff --git a/po/gl.po.in b/po/gl.po.in
index aa79f047..b60b2861 100644
--- a/po/gl.po.in
+++ b/po/gl.po.in
@@ -11,7 +11,7 @@ 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"
+"PO-Revision-Date: 2015-07-19 03:58+0000\n"
 "Last-Translator: andreout <andre@outeiro.com>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -73,14 +73,6 @@ msgid "sixth exit"
 msgstr "sexta saída"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m."
-
-#, c-format
-msgid "in %d m"
-msgstr "en %d m."
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -89,14 +81,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d metros"
-
-#, c-format
-msgid "in %d meters"
-msgstr "en %d metros"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -105,14 +89,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d quilómetros"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "en %d.%d quilómetros"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -125,6 +101,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d metros"
+
+#, c-format
+msgid "in %d meters"
+msgstr "en %d metros"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d quilómetros"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "en %d.%d quilómetros"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "un quilómetro"
@@ -163,27 +155,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "na rampa"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%s na rúa %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%s no %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%s na %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%s no %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -213,12 +205,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "logo saia da rotonda pola %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Saia da rotonda pola %1$s %2$s"
 
 msgid "soon"
 msgstr "cedo"
@@ -227,7 +219,7 @@ msgid "now"
 msgstr "agora"
 
 msgid "then"
-msgstr ""
+msgstr "logo"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -258,12 +250,12 @@ msgstr ""
 #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance
 #, c-format
 msgid "Take exit %1$s %2$s %3$s"
-msgstr ""
+msgstr "Tome a saida %1$s %2$s %3$s"
 
 #. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
 #, c-format
 msgid "Take the exit %1$s %2$s%3$s"
-msgstr ""
+msgstr "Tome a saida %1$s %2$s%3$s"
 
 #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
 msgid "at interchange"
@@ -330,25 +322,25 @@ msgstr "despois de %i estradas"
 #. 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 ""
+msgstr "Xire %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "logo dea a volta"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Dea a volta %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "logo dea a volta"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Dea a volta %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -378,7 +370,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Saída"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/he.po.in b/po/he.po.in
index f586ec30..d17b4ac8 100644
--- a/po/he.po.in
+++ b/po/he.po.in
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-05-26 10:31+0000\n"
+"PO-Revision-Date: 2015-07-19 03:58+0000\n"
 "Last-Translator: Yaron <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -75,14 +75,6 @@ msgid "sixth exit"
 msgstr "היציאה השישית"
 
 #, c-format
-msgid "%d m"
-msgstr "%d מ'"
-
-#, c-format
-msgid "in %d m"
-msgstr "בעוד %d מ'"
-
-#, c-format
 msgid "%d feet"
 msgstr "%d רגל"
 
@@ -91,14 +83,6 @@ msgid "in %d feet"
 msgstr "בעוד %d רגל"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d מטרים"
-
-#, c-format
-msgid "in %d meters"
-msgstr "בעוד %d מטרים"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr "%d.%d מיילים"
 
@@ -107,14 +91,6 @@ msgid "in %d.%d miles"
 msgstr "בעוד %d.%d מיילים"
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d קילומטרים"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "בעוד  %d.%d קילומטרים"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] "מייל אחד"
@@ -127,6 +103,22 @@ msgstr[0] "בעוד מייל אחד"
 msgstr[1] "בעוד %d מיילם"
 
 #, c-format
+msgid "%d meters"
+msgstr "%d מטרים"
+
+#, c-format
+msgid "in %d meters"
+msgstr "בעוד %d מטרים"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d קילומטרים"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "בעוד  %d.%d קילומטרים"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "קילומטר אחד"
@@ -165,27 +157,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "אל הרמפה"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%s אל רחוב %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%s אל רחוב %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%s אל רחוב %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%s אל רחוב %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -215,12 +207,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "אחר כך צא מהכיכר ב%1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "צא מהכיכר ב%1$s %2$s"
 
 msgid "soon"
 msgstr "בקרוב"
@@ -332,7 +324,7 @@ msgstr "לאחר %i כבישים"
 #. 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 ""
+msgstr "פנה %1$s %2$s %4$s %3$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
@@ -380,7 +372,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "יציאה"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/hi.po.in b/po/hi.po.in
index c2db142f..06eff1c0 100644
--- a/po/hi.po.in
+++ b/po/hi.po.in
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # desh deep https://launchpad.net/~singhdeepdesh
 
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-11-15 22:03+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:58+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -70,14 +71,6 @@ msgid "sixth exit"
 msgstr "chatha nikas"
 
 #, c-format
-msgid "%d m"
-msgstr "%d meter"
-
-#, c-format
-msgid "in %d m"
-msgstr "%d meter mein"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -86,14 +79,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d meters"
-
-#, c-format
-msgid "in %d meters"
-msgstr "%d meters mein"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -102,14 +87,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d kilometero mein"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "%d.%d kilometero mein"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -122,6 +99,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d meters"
+
+#, c-format
+msgid "in %d meters"
+msgstr "%d meters mein"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d kilometero mein"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "%d.%d kilometero mein"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "ek kilometer"
@@ -160,27 +153,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "dhalan mein"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%ssheher mein %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%ssheher mein %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%ssheher mein %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%ssheher mein %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -210,12 +203,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "तो %1$s %2$s के राउंडअबाउट छोड़"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "%1$s %2$s के राउंडअबाउट छोड़ें"
 
 msgid "soon"
 msgstr "जल्दी"
@@ -224,7 +217,7 @@ msgid "now"
 msgstr "अब"
 
 msgid "then"
-msgstr ""
+msgstr "तो"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -331,21 +324,21 @@ msgstr ""
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "तो चारों ओर मोड़"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "चारों ओर मोड़ %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "तो चारों ओर मोड़"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "चारों ओर मोड़ %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -375,7 +368,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Nikas"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/hr.po.in b/po/hr.po.in
index 7e749768..d6216dea 100644
--- a/po/hr.po.in
+++ b/po/hr.po.in
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-03-06 22:33+0000\n"
+"PO-Revision-Date: 2015-07-19 03:58+0000\n"
 "Last-Translator: gogo <trebelnik2@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -74,14 +74,6 @@ msgid "sixth exit"
 msgstr "šesti izlaz"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "za %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -90,14 +82,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d metara"
-
-#, c-format
-msgid "in %d meters"
-msgstr "za %d metara"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -106,14 +90,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d kilometara"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "za %d.%d kilometara"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -126,6 +102,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d metara"
+
+#, c-format
+msgid "in %d meters"
+msgstr "za %d metara"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d kilometara"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "za %d.%d kilometara"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d kilometar"
@@ -166,27 +158,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "na rampu"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%su ulicu %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%su %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%su %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%su %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -216,12 +208,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "onda napustite kružni tok na %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Napustite kružni tok na %1$s %2$s"
 
 msgid "soon"
 msgstr "uskoro"
@@ -230,7 +222,7 @@ msgid "now"
 msgstr "sada"
 
 msgid "then"
-msgstr ""
+msgstr "onda"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -333,25 +325,25 @@ msgstr "nakon %i ceste"
 #. 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 ""
+msgstr "Krenite %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "onda okrenite se"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Okrenite se %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "onda okrenite se"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Okrenite se %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -381,7 +373,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Izlaz"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/hu.po.in b/po/hu.po.in
index cc075e28..62214621 100644
--- a/po/hu.po.in
+++ b/po/hu.po.in
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-05-12 16:58+0000\n"
+"PO-Revision-Date: 2015-07-19 03:58+0000\n"
 "Last-Translator: György Balló <ballogyor@gmail.com>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -76,14 +76,6 @@ msgid "sixth exit"
 msgstr "hatodik kijáraton"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "%d m után"
-
-#, c-format
 msgid "%d feet"
 msgstr "%d láb"
 
@@ -92,14 +84,6 @@ msgid "in %d feet"
 msgstr "%d láb múlva"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d méter"
-
-#, c-format
-msgid "in %d meters"
-msgstr "%d méter után"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr "%d.%d mérföld"
 
@@ -108,14 +92,6 @@ msgid "in %d.%d miles"
 msgstr "%d.%d mérföld múlva"
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d,%d kilométer"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "%d,%d kilométer után"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] "egy mérföld"
@@ -128,6 +104,22 @@ msgstr[0] "egy mérföld múlva"
 msgstr[1] "%d mérföld múlva"
 
 #, c-format
+msgid "%d meters"
+msgstr "%d méter"
+
+#, c-format
+msgid "in %d meters"
+msgstr "%d méter után"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d,%d kilométer"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "%d,%d kilométer után"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "egy kilométer"
@@ -166,27 +158,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "a felhajtóra"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sa(z) %s%s%s utcába"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sa(z) %s%s%s útra"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sa(z) %s%s%s útra"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sa(z) %s%s%s útra"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -216,12 +208,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "majd hagyja el a körforgalmat a(z) %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Hagyja el a körforgalmat a(z) %1$s %2$s"
 
 msgid "soon"
 msgstr "hamarosan"
@@ -230,7 +222,7 @@ msgid "now"
 msgstr "most"
 
 msgid "then"
-msgstr ""
+msgstr "aztán"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -333,25 +325,25 @@ msgstr "%i út után"
 #. 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 ""
+msgstr "Forduljon %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "aztán fordujon meg"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Fordujon meg %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "aztán fordujon meg"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Fordujon meg %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -381,7 +373,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Kijárat"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/id.po.in b/po/id.po.in
index 015075e1..9a6d8874 100644
--- a/po/id.po.in
+++ b/po/id.po.in
@@ -5,14 +5,15 @@
 # Joel-apobae.com https://launchpad.net/~amanda2000
 # KaZeR https://launchpad.net/~kazer
 # M Bambang I https://launchpad.net/~mbi-lawang
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Steve Kartantya https://launchpad.net/~jack-haz
 
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-09-28 01:43+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:58+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,14 +74,6 @@ msgid "sixth exit"
 msgstr "exit keenam"
 
 #, c-format
-msgid "%d m"
-msgstr "%d meter"
-
-#, c-format
-msgid "in %d m"
-msgstr "dalam %d meter"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -89,14 +82,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d meter"
-
-#, c-format
-msgid "in %d meters"
-msgstr "dalam %d meter"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -105,14 +90,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d kilometer"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "dalam %d.%d kilometer"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -125,6 +102,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d meter"
+
+#, c-format
+msgid "in %d meters"
+msgstr "dalam %d meter"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d kilometer"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "dalam %d.%d kilometer"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] ""
@@ -162,27 +155,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "menuju jalur yang melandai"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%smenuju ke %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%smenuju ke %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%smenuju ke %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%smenuju ke %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -190,7 +183,7 @@ msgid "%sinto the %s"
 msgstr "%smenuju ke %s"
 
 msgid "When possible, please turn around"
-msgstr "bila memungkinkan, balik arah"
+msgstr "Bila memungkinkan, balik arah"
 
 #. TRANSLATORS: the argument is the destination to follow
 #, c-format
@@ -212,12 +205,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "kemudian tinggalkan bundaran pada %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Tinggalkan bundaran pada %1$s %2$s"
 
 msgid "soon"
 msgstr "segera"
@@ -226,7 +219,7 @@ msgid "now"
 msgstr "saat ini"
 
 msgid "then"
-msgstr ""
+msgstr "kemudian"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -329,25 +322,25 @@ msgstr "setelah %i jalan"
 #. 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 ""
+msgstr "Beloklah %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "kemudian balik arah"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Balik arah %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "kemudian balik arah"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Balik arah %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -377,7 +370,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Keluar"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/it.po.in b/po/it.po.in
index 57e18d5d..c89eb9d6 100644
--- a/po/it.po.in
+++ b/po/it.po.in
@@ -8,6 +8,7 @@
 # Marco Lazzaroni https://launchpad.net/~marcolazzaroni
 # Matteo Zaffo &#x27;80 https://launchpad.net/~zaffo80
 # MeltingShell https://launchpad.net/~meltingshell
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Michele Olivo https://launchpad.net/~micheleolivo
 # Niccolo Rigacci https://launchpad.net/~niccolo
 # Stefano Angeleri https://launchpad.net/~weltall
@@ -23,14 +24,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-11-15 00:53+0000\n"
-"Last-Translator: giardia <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:58+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Italiano\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"Language: \n"
+"Language: it\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -85,14 +86,6 @@ msgid "sixth exit"
 msgstr "sesta uscita"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "tra %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr "%d piedi"
 
@@ -101,14 +94,6 @@ msgid "in %d feet"
 msgstr "tra %d piedi"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d metri"
-
-#, c-format
-msgid "in %d meters"
-msgstr "tra %d metri"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr "%d.%d miglia"
 
@@ -117,14 +102,6 @@ msgid "in %d.%d miles"
 msgstr "tra %d.%d miglia"
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d chilometri"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "tra %d,%d chilometri"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] "un miglio"
@@ -137,6 +114,22 @@ msgstr[0] "tra un miglio"
 msgstr[1] "tra %d miglia"
 
 #, c-format
+msgid "%d meters"
+msgstr "%d metri"
+
+#, c-format
+msgid "in %d meters"
+msgstr "tra %d metri"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d chilometri"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "tra %d,%d chilometri"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "un chilometro"
@@ -151,51 +144,51 @@ msgstr[1] "tra %d chilometri"
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name
 #, c-format
 msgid "%1$sonto the %2$s%3$s%4$s"
-msgstr ""
+msgstr "%1$ssulla %2$s%3$s%4$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
 #, c-format
 msgid "%1$sonto %2$s"
-msgstr ""
+msgstr "%1$ssulla strada %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|masculine form"
-msgstr ""
+msgstr "%1$ssul %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|feminine form"
-msgstr ""
+msgstr "%1$ssulla %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|neuter form"
-msgstr ""
+msgstr "%1$ssulla strada %2$s"
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "nella rampa"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sin %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sin %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sin %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sin %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -208,7 +201,7 @@ msgstr "Appena possibile, invertire il senso di marcia"
 #. TRANSLATORS: the argument is the destination to follow
 #, c-format
 msgid "towards %s"
-msgstr ""
+msgstr "verso %s"
 
 #, c-format
 msgid "Follow the road for the next %s"
@@ -225,12 +218,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "e alla rotonda prendere la %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Alla rotonda prendere la %1$s %2$s"
 
 msgid "soon"
 msgstr "tra poco"
@@ -239,80 +232,80 @@ msgid "now"
 msgstr "adesso"
 
 msgid "then"
-msgstr ""
+msgstr "poi"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "then merge%1$s|right"
-msgstr ""
+msgstr "poi entrare%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Merge %1$s%2$s|right"
-msgstr ""
+msgstr "Entrare %1$s%2$s"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "then merge%1$s|left"
-msgstr ""
+msgstr "poi entrare%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Merge %1$s%2$s|left"
-msgstr ""
+msgstr "Entrare %1$s%2$s"
 
 msgid "on your left"
-msgstr ""
+msgstr "a sinistra"
 
 msgid "on your right"
-msgstr ""
+msgstr "a destra"
 
 #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance
 #, c-format
 msgid "Take exit %1$s %2$s %3$s"
-msgstr ""
+msgstr "Prendere l'uscita %1$s %2$s %3$s"
 
 #. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
 #, c-format
 msgid "Take the exit %1$s %2$s%3$s"
-msgstr ""
+msgstr "Prendere l'uscita %1$s %2$s%3$s"
 
 #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
 msgid "at interchange"
-msgstr ""
+msgstr "all'intersezione"
 
 msgid "at exit"
-msgstr ""
+msgstr "all'uscita"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then continue straight%1$s"
-msgstr ""
+msgstr "poi procedere dritto%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Continue straight %1$s%2$s%3$s"
-msgstr ""
+msgstr "Procedere dritto %1$s%2$s%3$s"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then keep right%1$s"
-msgstr ""
+msgstr "poi tenere la destra%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Keep right %1$s%2$s%3$s"
-msgstr ""
+msgstr "Tenere la destra %1$s%2$s%3$s"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then keep left%1$s"
-msgstr ""
+msgstr "poi tenere la sinistra%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Keep left %1$s%2$s%3$s"
-msgstr ""
+msgstr "Tenere la sinistra %1$s%2$s%3$s"
 
 #. TRANSLATORS: "right" as in "turn right"
 msgid "right"
@@ -342,25 +335,25 @@ msgstr "tra %i strade"
 #. 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 ""
+msgstr "Svoltare %1$s %2$s %3$s %4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "poi invertire il senso di marcia"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Invertire il senso di marcia %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "poi invertire il senso di marcia"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Invertire il senso di marcia %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -375,7 +368,7 @@ msgstr ""
 #. *
 #. 
 msgid "follow"
-msgstr ""
+msgstr "seguire"
 
 msgid "then you have reached your destination."
 msgstr "poi sarete arrivati a destinazione"
@@ -387,10 +380,10 @@ msgstr "Siete arrivati a destinazione %s"
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
-msgstr ""
+msgstr "Intersezione"
 
 msgid "Exit"
-msgstr ""
+msgstr "Uscita"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1597,10 +1590,10 @@ msgid "Opens address search dialog"
 msgstr "Apri la finestra di ricerca indirizzo"
 
 msgid "_POI search"
-msgstr "_ricerca POI"
+msgstr "_Ricerca POI"
 
 msgid "Opens POI search dialog"
-msgstr "Apre finestra di ricerca POI"
+msgstr "Apri la finestra di ricerca POI"
 
 msgid "_Stop Navigation"
 msgstr "Interrompi la navigazione"
@@ -1673,7 +1666,7 @@ msgid "Cinema"
 msgstr "Cinema"
 
 msgid "Train station"
-msgstr "Stazione del treno"
+msgstr "Stazione ferroviaria"
 
 msgid "School"
 msgstr "Scuola"
@@ -1710,16 +1703,16 @@ msgid "Set next visit to %ld, %ld \n"
 msgstr "Imposta la prossima tappa a %ld, %ld \n"
 
 msgid "POI search"
-msgstr "ricerca POI"
+msgstr "Ricerca POI"
 
 msgid "Select a category"
-msgstr "Seleziona una categoria"
+msgstr "Selezionare una categoria"
 
 msgid "Select a distance to look for (km)"
-msgstr "Seleziona la distanza in cui cercare (km)"
+msgstr "Selezionare la distanza in cui cercare (km)"
 
 msgid "Select a POI"
-msgstr "Seleziona un POI"
+msgstr "Selezionare un POI"
 
 msgid " "
 msgstr " "
@@ -1731,7 +1724,7 @@ msgid "Direction"
 msgstr "Direzione"
 
 msgid "Distance(m)"
-msgstr "Distanza(m)"
+msgstr "Distanza (m)"
 
 msgid "Name"
 msgstr "Nome"
@@ -2065,7 +2058,7 @@ msgid ""
 msgstr ""
 
 msgid "Cancel"
-msgstr "Cancella"
+msgstr "Annulla"
 
 msgid "filenamePath"
 msgstr ""
@@ -2504,8 +2497,8 @@ msgid ""
 "Former\n"
 "Destinations"
 msgstr ""
-"Precedenti\n"
-"Destinazioni"
+"Destinazioni\n"
+"precedenti"
 
 msgid "Coordinates"
 msgstr "Coordinate"
@@ -2622,7 +2615,7 @@ msgstr "Scarica mappe"
 
 #. Android resource: @strings/optionsmenu_toggle_poi
 msgid "Toggle POIs"
-msgstr "Attiva/Disattiva Punti Di Interesse"
+msgstr "Mostra/nascondi POI"
 
 #. Android resource: @strings/optionsmenu_exit_navit
 msgid "Exit Navit"
diff --git a/po/ja.po.in b/po/ja.po.in
index 5ae6b3dc..39f70524 100644
--- a/po/ja.po.in
+++ b/po/ja.po.in
@@ -71,14 +71,6 @@ msgid "sixth exit"
 msgstr ""
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr ""
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -87,14 +79,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d メートル"
-
-#, c-format
-msgid "in %d meters"
-msgstr ""
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -103,14 +87,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr ""
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr ""
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -123,6 +99,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d メートル"
+
+#, c-format
+msgid "in %d meters"
+msgstr ""
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr ""
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] ""
diff --git a/po/jv.po.in b/po/jv.po.in
index 3d5f3144..3df25ba3 100644
--- a/po/jv.po.in
+++ b/po/jv.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:
 # Leonardus Priyo Handono https://launchpad.net/~leonardus-ymail
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-09-28 01:43+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:59+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Javanese <jv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,35 +74,39 @@ msgid "sixth exit"
 msgstr "metu kaenem"
 
 #, c-format
-msgid "%d m"
+msgid "%d feet"
 msgstr ""
 
 #, c-format
-msgid "in %d m"
+msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d feet"
+msgid "%d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "in %d feet"
+msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr ""
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "in %d meters"
-msgstr ""
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "%d.%d miles"
+msgid "%d meters"
 msgstr ""
 
 #, c-format
-msgid "in %d.%d miles"
+msgid "in %d meters"
 msgstr ""
 
 #, c-format
@@ -113,18 +118,6 @@ msgid "in %d.%d kilometers"
 msgstr ""
 
 #, c-format
-msgid "one mile"
-msgid_plural "%d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
-msgid "in one mile"
-msgid_plural "in %d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] ""
@@ -168,27 +161,27 @@ msgstr ""
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%s ing dalan %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%s ing dalan %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%s ing dalan %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%s ing dalan %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
 msgid "%sinto the %s"
-msgstr "%s ing dalan %s"
+msgstr "%sing dalan %s"
 
 msgid "When possible, please turn around"
 msgstr "Yen biso, mutero"
@@ -200,7 +193,7 @@ msgstr ""
 
 #, c-format
 msgid "Follow the road for the next %s"
-msgstr "tetep ing dalan iki nganti %s"
+msgstr "Tetep ing dalan iki nganti %s"
 
 msgid "Enter the roundabout soon"
 msgstr ""
@@ -213,18 +206,18 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "terus metu soko puteran ing cawang kaping %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Metu soko puteran ing cawang kaping %1$s %2$s"
 
 msgid "soon"
 msgstr "sedhelo maneh"
 
 msgid "then"
-msgstr ""
+msgstr "terus"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -375,7 +368,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Metu"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/kk.po.in b/po/kk.po.in
index a8d02f7d..428eca04 100644
--- a/po/kk.po.in
+++ b/po/kk.po.in
@@ -69,35 +69,39 @@ msgid "sixth exit"
 msgstr ""
 
 #, c-format
-msgid "%d m"
+msgid "%d feet"
 msgstr ""
 
 #, c-format
-msgid "in %d m"
+msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d feet"
+msgid "%d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "in %d feet"
+msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr ""
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "in %d meters"
-msgstr ""
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "%d.%d miles"
+msgid "%d meters"
 msgstr ""
 
 #, c-format
-msgid "in %d.%d miles"
+msgid "in %d meters"
 msgstr ""
 
 #, c-format
@@ -109,18 +113,6 @@ msgid "in %d.%d kilometers"
 msgstr ""
 
 #, c-format
-msgid "one mile"
-msgid_plural "%d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
-msgid "in one mile"
-msgid_plural "in %d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] ""
diff --git a/po/kn.po.in b/po/kn.po.in
index ed79e2f5..25bb0fa4 100644
--- a/po/kn.po.in
+++ b/po/kn.po.in
@@ -69,35 +69,39 @@ msgid "sixth exit"
 msgstr ""
 
 #, c-format
-msgid "%d m"
+msgid "%d feet"
 msgstr ""
 
 #, c-format
-msgid "in %d m"
+msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d feet"
+msgid "%d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "in %d feet"
+msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr ""
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "in %d meters"
-msgstr ""
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "%d.%d miles"
+msgid "%d meters"
 msgstr ""
 
 #, c-format
-msgid "in %d.%d miles"
+msgid "in %d meters"
 msgstr ""
 
 #, c-format
@@ -109,18 +113,6 @@ msgid "in %d.%d kilometers"
 msgstr ""
 
 #, c-format
-msgid "one mile"
-msgid_plural "%d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
-msgid "in one mile"
-msgid_plural "in %d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] ""
diff --git a/po/ko.po.in b/po/ko.po.in
index aa5a40fd..702660e4 100644
--- a/po/ko.po.in
+++ b/po/ko.po.in
@@ -2,19 +2,21 @@
 # Copyright (C) 2006-2015 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
+# KaZeR https://launchpad.net/~kazer
 # Seungjun, Lee https://launchpad.net/~cybercorean
 
 msgid ""
 msgstr ""
-"Project-Id-Version: navit\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"PO-Revision-Date: 2015-04-03 14:35+0000\n"
-"Last-Translator: Seungjun, Lee <cybercorean@gmail.com>\n"
+"Project-Id-Version: navit 0.5.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2015-07-19 21:39+0000\n"
+"Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"Language: ko\n"
 
 msgid "Running from source directory\n"
 msgstr ""
@@ -68,14 +70,6 @@ msgid "sixth exit"
 msgstr "여섯번째 출구"
 
 #, c-format
-msgid "%d m"
-msgstr "%d 미터"
-
-#, c-format
-msgid "in %d m"
-msgstr "%d 미터 후에"
-
-#, c-format
 msgid "%d feet"
 msgstr "%d 피트"
 
@@ -84,14 +78,6 @@ msgid "in %d feet"
 msgstr "%d 피트 후에"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d 미터"
-
-#, c-format
-msgid "in %d meters"
-msgstr "%d 미터 후에"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr "%d.%d 마일"
 
@@ -100,14 +86,6 @@ msgid "in %d.%d miles"
 msgstr "%d.%d 마일 후에"
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d 킬로미터"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "%d.%d 킬로미터 후에"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] "%d 마일"
@@ -118,6 +96,22 @@ msgid_plural "in %d miles"
 msgstr[0] "%d 마일 후에"
 
 #, c-format
+msgid "%d meters"
+msgstr "%d 미터"
+
+#, c-format
+msgid "in %d meters"
+msgstr "%d 미터 후에"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d 킬로미터"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "%d.%d 킬로미터 후에"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d 킬로미터"
@@ -179,10 +173,10 @@ msgstr ""
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
 msgid "%sinto the %s"
-msgstr ""
+msgstr "%s %s 방향으로"
 
 msgid "When possible, please turn around"
-msgstr ""
+msgstr "가능하면 유턴하세요"
 
 #. TRANSLATORS: the argument is the destination to follow
 #, c-format
@@ -191,15 +185,15 @@ msgstr ""
 
 #, c-format
 msgid "Follow the road for the next %s"
-msgstr ""
+msgstr "다음 %s 까지 직진하세요"
 
 msgid "Enter the roundabout soon"
-msgstr ""
+msgstr "로타리에 곧 진입합니다"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
 msgid "Enter the roundabout %s"
-msgstr ""
+msgstr "%s 로타리에 진입합니다"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
@@ -212,10 +206,10 @@ msgid "Leave the roundabout at the %1$s %2$s"
 msgstr ""
 
 msgid "soon"
-msgstr ""
+msgstr "곧"
 
 msgid "now"
-msgstr ""
+msgstr "지금"
 
 msgid "then"
 msgstr ""
@@ -295,33 +289,33 @@ msgstr ""
 
 #. TRANSLATORS: "right" as in "turn right"
 msgid "right"
-msgstr ""
+msgstr "우"
 
 #. TRANSLATORS: "left" as in "turn left"
 msgid "left"
-msgstr ""
+msgstr "좌"
 
 #. TRANSLATORS: as in "turn easily right"
 msgid "easily "
-msgstr ""
+msgstr "약간 "
 
 #. TRANSLATORS: as in "turn strongly right"
 msgid "strongly "
-msgstr ""
+msgstr "크게 "
 
 #, c-format
 msgid "Take the %1$s road to the %2$s"
-msgstr ""
+msgstr "%1$s 번째 출구에서 %2$s 로 나가세요"
 
 #, c-format
 msgid "after %i roads"
-msgstr ""
+msgstr "%i 도로 이후에"
 
 #. cave: no else - may come from 'if (skip_roads)' above !
 #. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgstr "%3$s%4$s %1$s%2$s 회전 하세요"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
@@ -357,12 +351,12 @@ msgid "follow"
 msgstr ""
 
 msgid "then you have reached your destination."
-msgstr ""
+msgstr "목적지에 도착하였습니다."
 
 #. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
-msgstr ""
+msgstr "%s 목적지에 도착합니다"
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
@@ -376,16 +370,16 @@ msgid "Position"
 msgstr ""
 
 msgid "Command"
-msgstr ""
+msgstr "명령"
 
 msgid "Length"
 msgstr ""
 
 msgid "km"
-msgstr ""
+msgstr "km"
 
 msgid "m"
-msgstr ""
+msgstr "m"
 
 msgid "Time"
 msgstr ""
@@ -407,10 +401,10 @@ msgid "Visit before..."
 msgstr ""
 
 msgid "Set as position"
-msgstr ""
+msgstr "지점으로설정"
 
 msgid "Set as destination"
-msgstr ""
+msgstr "목적지로설정"
 
 msgid "Add as bookmark"
 msgstr ""
@@ -425,107 +419,107 @@ msgstr ""
 
 #. 020
 msgid "Andorra"
-msgstr ""
+msgstr "안도라"
 
 #. 784
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "아랍에미리트연방"
 
 #. 004
 msgid "Afghanistan"
-msgstr ""
+msgstr "아프가니스탄"
 
 #. 028
 msgid "Antigua and Barbuda"
-msgstr ""
+msgstr "앤티가 바부다"
 
 #. 660
 msgid "Anguilla"
-msgstr ""
+msgstr "안길라"
 
 #. 008
 msgid "Albania"
-msgstr ""
+msgstr "알바니아"
 
 #. 051
 msgid "Armenia"
-msgstr ""
+msgstr "아르메니아"
 
 #. 530
 msgid "Netherlands Antilles"
-msgstr ""
+msgstr "앤틸러스제도"
 
 #. 024
 msgid "Angola"
-msgstr ""
+msgstr "앙골라"
 
 #. 010
 msgid "Antarctica"
-msgstr ""
+msgstr "남극"
 
 #. 032
 msgid "Argentina"
-msgstr ""
+msgstr "아르헨티나"
 
 #. 016
 msgid "American Samoa"
-msgstr ""
+msgstr "아메리칸사모아"
 
 #. 040
 msgid "Austria"
-msgstr ""
+msgstr "오스트리아"
 
 #. 036
 msgid "Australia"
-msgstr ""
+msgstr "오스트레일리아"
 
 #. 533
 msgid "Aruba"
-msgstr ""
+msgstr "아루바"
 
 #. 248
 msgid "Aland Islands"
-msgstr ""
+msgstr "올란드제도"
 
 #. 031
 msgid "Azerbaijan"
-msgstr ""
+msgstr "아제르바이잔"
 
 #. 070
 msgid "Bosnia and Herzegovina"
-msgstr ""
+msgstr "보스니아・헤르체고비나"
 
 #. 052
 msgid "Barbados"
-msgstr ""
+msgstr "바베이도스"
 
 #. 050
 msgid "Bangladesh"
-msgstr ""
+msgstr "방글라데시"
 
 #. 056
 msgid "Belgium"
-msgstr ""
+msgstr "벨기에"
 
 #. 854
 msgid "Burkina Faso"
-msgstr ""
+msgstr "부르키나파소"
 
 #. 100
 msgid "Bulgaria"
-msgstr ""
+msgstr "불가리아"
 
 #. 048
 msgid "Bahrain"
-msgstr ""
+msgstr "바레인"
 
 #. 108
 msgid "Burundi"
-msgstr ""
+msgstr "부룬디"
 
 #. 204
 msgid "Benin"
-msgstr ""
+msgstr "베닌"
 
 #. 652
 msgid "Saint Barthelemy"
@@ -533,15 +527,15 @@ msgstr ""
 
 #. 060
 msgid "Bermuda"
-msgstr ""
+msgstr "버뮤다제도"
 
 #. 096
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "브루나이"
 
 #. 068
 msgid "Bolivia"
-msgstr ""
+msgstr "볼리비아"
 
 #. 535
 msgid "Bonaire, Sint Eustatius and Saba"
@@ -549,359 +543,359 @@ msgstr ""
 
 #. 076
 msgid "Brazil"
-msgstr ""
+msgstr "브라질"
 
 #. 044
 msgid "Bahamas"
-msgstr ""
+msgstr "바하마"
 
 #. 064
 msgid "Bhutan"
-msgstr ""
+msgstr "부탄"
 
 #. 074
 msgid "Bouvet Island"
-msgstr ""
+msgstr "부베섬島"
 
 #. 072
 msgid "Botswana"
-msgstr ""
+msgstr "보츠와나"
 
 #. 112
 msgid "Belarus"
-msgstr ""
+msgstr "벨라루스"
 
 #. 084
 msgid "Belize"
-msgstr ""
+msgstr "벨리즈"
 
 #. 124
 msgid "Canada"
-msgstr ""
+msgstr "캐나다"
 
 #. 166
 msgid "Cocos (Keeling) Islands"
-msgstr ""
+msgstr "코코아 (킬링) 제도"
 
 #. 180
 msgid "Congo, Democratic Republic of the"
-msgstr ""
+msgstr "콩고민주공화국"
 
 #. 140
 msgid "Central African Republic"
-msgstr ""
+msgstr "중앙아프리카공화국"
 
 #. 178
 msgid "Congo"
-msgstr ""
+msgstr "콩고"
 
 #. 756
 msgid "Switzerland"
-msgstr ""
+msgstr "스위스"
 
 #. 384
 msgid "Cote d'Ivoire"
-msgstr ""
+msgstr "코트디부아르"
 
 #. 184
 msgid "Cook Islands"
-msgstr ""
+msgstr "쿡제도"
 
 #. 152
 msgid "Chile"
-msgstr ""
+msgstr "칠레"
 
 #. 120
 msgid "Cameroon"
-msgstr ""
+msgstr "카메룬"
 
 #. 156
 msgid "China"
-msgstr ""
+msgstr "중국"
 
 #. 170
 msgid "Colombia"
-msgstr ""
+msgstr "콜롬비아"
 
 #. 188
 msgid "Costa Rica"
-msgstr ""
+msgstr "코스타리카"
 
 #. 192
 msgid "Cuba"
-msgstr ""
+msgstr "쿠바"
 
 #. 132
 msgid "Cape Verde"
-msgstr ""
+msgstr "카보베르데"
 
 #. 531
 msgid "Curacao"
-msgstr ""
+msgstr "퀴라소"
 
 #. 162
 msgid "Christmas Island"
-msgstr ""
+msgstr "크리스마스섬"
 
 #. 196
 msgid "Cyprus"
-msgstr ""
+msgstr "키프로스"
 
 #. 203
 msgid "Czech Republic"
-msgstr ""
+msgstr "체코공화국"
 
 #. 276
 msgid "Germany"
-msgstr ""
+msgstr "독일"
 
 #. 262
 msgid "Djibouti"
-msgstr ""
+msgstr "지부티"
 
 #. 208
 msgid "Denmark"
-msgstr ""
+msgstr "덴마크"
 
 #. 212
 msgid "Dominica"
-msgstr ""
+msgstr "도미니카"
 
 #. 214
 msgid "Dominican Republic"
-msgstr ""
+msgstr "도미니카공화국"
 
 #. 012
 msgid "Algeria"
-msgstr ""
+msgstr "알제리"
 
 #. 218
 msgid "Ecuador"
-msgstr ""
+msgstr "에콰도르"
 
 #. 233
 msgid "Estonia"
-msgstr ""
+msgstr "에스토니아"
 
 #. 818
 msgid "Egypt"
-msgstr ""
+msgstr "이집트"
 
 #. 732
 msgid "Western Sahara"
-msgstr ""
+msgstr "서사하라"
 
 #. 232
 msgid "Eritrea"
-msgstr ""
+msgstr "에리트레아"
 
 #. 724
 msgid "Spain"
-msgstr ""
+msgstr "스페인"
 
 #. 231
 msgid "Ethiopia"
-msgstr ""
+msgstr "에티오피아"
 
 #. 246
 msgid "Finland"
-msgstr ""
+msgstr "핀란드"
 
 #. 242
 msgid "Fiji"
-msgstr ""
+msgstr "피지"
 
 #. 238
 msgid "Falkland Islands (Malvinas)"
-msgstr ""
+msgstr "포클랜드제도 (말비나스)"
 
 #. 583
 msgid "Micronesia, Federated States of"
-msgstr ""
+msgstr "미크로네시아연방국"
 
 #. 234
 msgid "Faroe Islands"
-msgstr ""
+msgstr "파로제도"
 
 #. 250
 msgid "France"
-msgstr ""
+msgstr "프랑스"
 
 #. 266
 msgid "Gabon"
-msgstr ""
+msgstr "가봉"
 
 #. 826
 msgid "United Kingdom"
-msgstr ""
+msgstr "영국"
 
 #. 308
 msgid "Grenada"
-msgstr ""
+msgstr "그레나다"
 
 #. 268
 msgid "Georgia"
-msgstr ""
+msgstr "조지아"
 
 #. 254
 msgid "French Guiana"
-msgstr ""
+msgstr "프랑스령기아나"
 
 #. 831
 msgid "Guernsey"
-msgstr ""
+msgstr "건지섬"
 
 #. 288
 msgid "Ghana"
-msgstr ""
+msgstr "가나"
 
 #. 292
 msgid "Gibraltar"
-msgstr ""
+msgstr "지브롤터"
 
 #. 304
 msgid "Greenland"
-msgstr ""
+msgstr "그린란드"
 
 #. 270
 msgid "Gambia"
-msgstr ""
+msgstr "감비아"
 
 #. 324
 msgid "Guinea"
-msgstr ""
+msgstr "기니"
 
 #. 312
 msgid "Guadeloupe"
-msgstr ""
+msgstr "과달루페섬"
 
 #. 226
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "적도기니"
 
 #. 300
 msgid "Greece"
-msgstr ""
+msgstr "그리스"
 
 #. 239
 msgid "South Georgia and the South Sandwich Islands"
-msgstr ""
+msgstr "남조지아섬・남샌드위치제도"
 
 #. 320
 msgid "Guatemala"
-msgstr ""
+msgstr "과테말라"
 
 #. 316
 msgid "Guam"
-msgstr ""
+msgstr "괌"
 
 #. 624
 msgid "Guinea-Bissau"
-msgstr ""
+msgstr "기니비소"
 
 #. 328
 msgid "Guyana"
-msgstr ""
+msgstr "가이아나"
 
 #. 344
 msgid "Hong Kong"
-msgstr ""
+msgstr "홍콩"
 
 #. 334
 msgid "Heard Island and McDonald Islands"
-msgstr ""
+msgstr "허드맥도날드제도"
 
 #. 340
 msgid "Honduras"
-msgstr ""
+msgstr "온두라스"
 
 #. 191
 msgid "Croatia"
-msgstr ""
+msgstr "크로아티아"
 
 #. 332
 msgid "Haiti"
-msgstr ""
+msgstr "아이티"
 
 #. 348
 msgid "Hungary"
-msgstr ""
+msgstr "헝가리"
 
 #. 360
 msgid "Indonesia"
-msgstr ""
+msgstr "인도네시아"
 
 #. 372
 msgid "Ireland"
-msgstr ""
+msgstr "아일랜드"
 
 #. 376
 msgid "Israel"
-msgstr ""
+msgstr "이스라엘"
 
 #. 833
 msgid "Isle of Man"
-msgstr ""
+msgstr "맨섬"
 
 #. 356
 msgid "India"
-msgstr ""
+msgstr "인도"
 
 #. 086
 msgid "British Indian Ocean Territory"
-msgstr ""
+msgstr "영국령인도양지역"
 
 #. 368
 msgid "Iraq"
-msgstr ""
+msgstr "이라크"
 
 #. 364
 msgid "Iran, Islamic Republic of"
-msgstr ""
+msgstr "이란공화국"
 
 #. 352
 msgid "Iceland"
-msgstr ""
+msgstr "아이슬란드"
 
 #. 380
 msgid "Italy"
-msgstr ""
+msgstr "이탈리아"
 
 #. 832
 msgid "Jersey"
-msgstr ""
+msgstr "저지섬"
 
 #. 388
 msgid "Jamaica"
-msgstr ""
+msgstr "자메이카"
 
 #. 400
 msgid "Jordan"
-msgstr ""
+msgstr "요르단"
 
 #. 392
 msgid "Japan"
-msgstr ""
+msgstr "일본"
 
 #. 404
 msgid "Kenya"
-msgstr ""
+msgstr "케냐"
 
 #. 417
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "키르기스탄"
 
 #. 116
 msgid "Cambodia"
-msgstr ""
+msgstr "캄보디아"
 
 #. 296
 msgid "Kiribati"
-msgstr ""
+msgstr "키리바시"
 
 #. 174
 msgid "Comoros"
-msgstr ""
+msgstr "코모로"
 
 #. 659
 msgid "Saint Kitts and Nevis"
@@ -909,83 +903,83 @@ msgstr ""
 
 #. 408
 msgid "Korea, Democratic People's Republic of"
-msgstr ""
+msgstr "조선민주주의인민공화국"
 
 #. 410
 msgid "Korea, Republic of"
-msgstr ""
+msgstr "대한민국"
 
 #. 414
 msgid "Kuwait"
-msgstr ""
+msgstr "쿠웨이트"
 
 #. 136
 msgid "Cayman Islands"
-msgstr ""
+msgstr "카이만제도"
 
 #. 398
 msgid "Kazakhstan"
-msgstr ""
+msgstr "카자흐스탄"
 
 #. 418
 msgid "Lao People's Democratic Republic"
-msgstr ""
+msgstr "라오스인민민주공화국"
 
 #. 422
 msgid "Lebanon"
-msgstr ""
+msgstr "레바논"
 
 #. 662
 msgid "Saint Lucia"
-msgstr ""
+msgstr "세인트루시아"
 
 #. 438
 msgid "Liechtenstein"
-msgstr ""
+msgstr "리히텐슈타인"
 
 #. 144
 msgid "Sri Lanka"
-msgstr ""
+msgstr "스리랑카"
 
 #. 430
 msgid "Liberia"
-msgstr ""
+msgstr "라이베리아"
 
 #. 426
 msgid "Lesotho"
-msgstr ""
+msgstr "레소토"
 
 #. 440
 msgid "Lithuania"
-msgstr ""
+msgstr "리투아니아"
 
 #. 442
 msgid "Luxembourg"
-msgstr ""
+msgstr "룩셈부르크"
 
 #. 428
 msgid "Latvia"
-msgstr ""
+msgstr "라트비아"
 
 #. 434
 msgid "Libya"
-msgstr ""
+msgstr "리비아"
 
 #. 504
 msgid "Morocco"
-msgstr ""
+msgstr "모로코"
 
 #. 492
 msgid "Monaco"
-msgstr ""
+msgstr "모나코"
 
 #. 498
 msgid "Moldova, Republic of"
-msgstr ""
+msgstr "몰도바공화국"
 
 #. 499
 msgid "Montenegro"
-msgstr ""
+msgstr "몬테네그로"
 
 #. 663
 msgid "Saint Martin (French part)"
@@ -993,379 +987,379 @@ msgstr ""
 
 #. 450
 msgid "Madagascar"
-msgstr ""
+msgstr "마다가스카르"
 
 #. 584
 msgid "Marshall Islands"
-msgstr ""
+msgstr "마셜제도"
 
 #. 807
 msgid "Macedonia, the former Yugoslav Republic of"
-msgstr ""
+msgstr "마케도니아"
 
 #. 466
 msgid "Mali"
-msgstr ""
+msgstr "말리"
 
 #. 104
 msgid "Myanmar"
-msgstr ""
+msgstr "미얀마"
 
 #. 496
 msgid "Mongolia"
-msgstr ""
+msgstr "몽골"
 
 #. 446
 msgid "Macao"
-msgstr ""
+msgstr "마카오"
 
 #. 580
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "북마리아나제도"
 
 #. 474
 msgid "Martinique"
-msgstr ""
+msgstr "마르티니크"
 
 #. 478
 msgid "Mauritania"
-msgstr ""
+msgstr "모리타니아"
 
 #. 500
 msgid "Montserrat"
-msgstr ""
+msgstr "몬세라트"
 
 #. 470
 msgid "Malta"
-msgstr ""
+msgstr "말타"
 
 #. 480
 msgid "Mauritius"
-msgstr ""
+msgstr "모리셔스"
 
 #. 462
 msgid "Maldives"
-msgstr ""
+msgstr "몰디브"
 
 #. 454
 msgid "Malawi"
-msgstr ""
+msgstr "말라위"
 
 #. 484
 msgid "Mexico"
-msgstr ""
+msgstr "멕시코"
 
 #. 458
 msgid "Malaysia"
-msgstr ""
+msgstr "말레이지아"
 
 #. 508
 msgid "Mozambique"
-msgstr ""
+msgstr "모잠비크"
 
 #. 516
 msgid "Namibia"
-msgstr ""
+msgstr "나미비다"
 
 #. 540
 msgid "New Caledonia"
-msgstr ""
+msgstr "뉴칼레도니아"
 
 #. 562
 msgid "Niger"
-msgstr ""
+msgstr "니제르"
 
 #. 574
 msgid "Norfolk Island"
-msgstr ""
+msgstr "노포크섬"
 
 #. 566
 msgid "Nigeria"
-msgstr ""
+msgstr "나이지리아"
 
 #. 558
 msgid "Nicaragua"
-msgstr ""
+msgstr "니카라과"
 
 #. 528
 msgid "Netherlands"
-msgstr ""
+msgstr "네덜란드"
 
 #. 578
 msgid "Norway"
-msgstr ""
+msgstr "노르웨이"
 
 #. 524
 msgid "Nepal"
-msgstr ""
+msgstr "네팔"
 
 #. 520
 msgid "Nauru"
-msgstr ""
+msgstr "나우루"
 
 #. 570
 msgid "Niue"
-msgstr ""
+msgstr "니우에"
 
 #. 554
 msgid "New Zealand"
-msgstr ""
+msgstr "뉴질랜드"
 
 #. 512
 msgid "Oman"
-msgstr ""
+msgstr "오만"
 
 #. 591
 msgid "Panama"
-msgstr ""
+msgstr "파나마"
 
 #. 604
 msgid "Peru"
-msgstr ""
+msgstr "페루"
 
 #. 258
 msgid "French Polynesia"
-msgstr ""
+msgstr "프랑스령폴리네시아"
 
 #. 598
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "파푸아뉴기니"
 
 #. 608
 msgid "Philippines"
-msgstr ""
+msgstr "필리핀"
 
 #. 586
 msgid "Pakistan"
-msgstr ""
+msgstr "파키스탄"
 
 #. 616
 msgid "Poland"
-msgstr ""
+msgstr "폴란드"
 
 #. 666
 msgid "Saint Pierre and Miquelon"
-msgstr ""
+msgstr "생피에르미클롱"
 
 #. 612
 msgid "Pitcairn"
-msgstr ""
+msgstr "핏케언제도"
 
 #. 630
 msgid "Puerto Rico"
-msgstr ""
+msgstr "푸에르토리코"
 
 #. 275
 msgid "Palestinian Territory, Occupied"
-msgstr ""
+msgstr "팔레스타인영토"
 
 #. 620
 msgid "Portugal"
-msgstr ""
+msgstr "포르투갈"
 
 #. 585
 msgid "Palau"
-msgstr ""
+msgstr "팔라우"
 
 #. 600
 msgid "Paraguay"
-msgstr ""
+msgstr "파라과이"
 
 #. 634
 msgid "Qatar"
-msgstr ""
+msgstr "카타르"
 
 #. 638
 msgid "Reunion"
-msgstr ""
+msgstr "레위니옹"
 
 #. 642
 msgid "Romania"
-msgstr ""
+msgstr "루마니아"
 
 #. 688
 msgid "Serbia"
-msgstr ""
+msgstr "세르비아"
 
 #. 643
 msgid "Russian Federation"
-msgstr ""
+msgstr "러시아연방"
 
 #. 646
 msgid "Rwanda"
-msgstr ""
+msgstr "르완다"
 
 #. 682
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "사우디아라비아"
 
 #. 090
 msgid "Solomon Islands"
-msgstr ""
+msgstr "솔로몬제도"
 
 #. 690
 msgid "Seychelles"
-msgstr ""
+msgstr "세이셸"
 
 #. 736
 msgid "Sudan"
-msgstr ""
+msgstr "수단"
 
 #. 752
 msgid "Sweden"
-msgstr ""
+msgstr "스웨덴"
 
 #. 702
 msgid "Singapore"
-msgstr ""
+msgstr "싱가포르"
 
 #. 654
 msgid "Saint Helena"
-msgstr ""
+msgstr "세인트헬레나"
 
 #. 705
 msgid "Slovenia"
-msgstr ""
+msgstr "슬로베니아"
 
 #. 744
 msgid "Svalbard and Jan Mayen"
-msgstr ""
+msgstr "스발바르얀마옌"
 
 #. 703
 msgid "Slovakia"
-msgstr ""
+msgstr "슬로바키아"
 
 #. 694
 msgid "Sierra Leone"
-msgstr ""
+msgstr "시에라리온"
 
 #. 674
 msgid "San Marino"
-msgstr ""
+msgstr "산마리노"
 
 #. 686
 msgid "Senegal"
-msgstr ""
+msgstr "세네갈"
 
 #. 706
 msgid "Somalia"
-msgstr ""
+msgstr "소말리아"
 
 #. 740
 msgid "Suriname"
-msgstr ""
+msgstr "수리남"
 
 #. 728
 msgid "South Sudan"
-msgstr ""
+msgstr "남수단"
 
 #. 678
 msgid "Sao Tome and Principe"
-msgstr ""
+msgstr "상투메・프린시페"
 
 #. 222
 msgid "El Salvador"
-msgstr ""
+msgstr "엘살바도르"
 
 #. 534
 msgid "Sint Maarten (Dutch part)"
-msgstr ""
+msgstr "신트마르턴 (네덜란드)"
 
 #. 760
 msgid "Syrian Arab Republic"
-msgstr ""
+msgstr "시리아"
 
 #. 748
 msgid "Swaziland"
-msgstr ""
+msgstr "스와질란드"
 
 #. 796
 msgid "Turks and Caicos Islands"
-msgstr ""
+msgstr "터커스케이커스제도"
 
 #. 148
 msgid "Chad"
-msgstr ""
+msgstr "차드"
 
 #. 260
 msgid "French Southern Territories"
-msgstr ""
+msgstr "프랑스령남부와남극지역"
 
 #. 768
 msgid "Togo"
-msgstr ""
+msgstr "토고"
 
 #. 764
 msgid "Thailand"
-msgstr ""
+msgstr "태국"
 
 #. 762
 msgid "Tajikistan"
-msgstr ""
+msgstr "타지키스탄"
 
 #. 772
 msgid "Tokelau"
-msgstr ""
+msgstr "토켈라우"
 
 #. 626
 msgid "Timor-Leste"
-msgstr ""
+msgstr "동티모르"
 
 #. 795
 msgid "Turkmenistan"
-msgstr ""
+msgstr "투르크메니스탄"
 
 #. 788
 msgid "Tunisia"
-msgstr ""
+msgstr "튀니지"
 
 #. 776
 msgid "Tonga"
-msgstr ""
+msgstr "통가"
 
 #. 792
 msgid "Turkey"
-msgstr ""
+msgstr "터키"
 
 #. 780
 msgid "Trinidad and Tobago"
-msgstr ""
+msgstr "트리니다드・토바고"
 
 #. 798
 msgid "Tuvalu"
-msgstr ""
+msgstr "투발루"
 
 #. 158
 msgid "Taiwan, Province of China"
-msgstr ""
+msgstr "대만"
 
 #. 834
 msgid "Tanzania, United Republic of"
-msgstr ""
+msgstr "탄자니아연합공화국"
 
 #. 804
 msgid "Ukraine"
-msgstr ""
+msgstr "우크라이나"
 
 #. 800
 msgid "Uganda"
-msgstr ""
+msgstr "우간다"
 
 #. 581
 msgid "United States Minor Outlying Islands"
-msgstr ""
+msgstr "미국령군소제도"
 
 #. 840
 msgid "United States"
-msgstr ""
+msgstr "미국"
 
 #. 858
 msgid "Uruguay"
-msgstr ""
+msgstr "우루과이"
 
 #. 860
 msgid "Uzbekistan"
-msgstr ""
+msgstr "우즈베키스탄"
 
 #. 336
 msgid "Holy See (Vatican City State)"
@@ -1377,23 +1371,23 @@ msgstr ""
 
 #. 862
 msgid "Venezuela"
-msgstr ""
+msgstr "베네수엘라"
 
 #. 092
 msgid "Virgin Islands, British"
-msgstr ""
+msgstr "영국령버진제도"
 
 #. 850
 msgid "Virgin Islands, U.S."
-msgstr ""
+msgstr "미국령버진제도"
 
 #. 704
 msgid "Viet Nam"
-msgstr ""
+msgstr "베트남"
 
 #. 548
 msgid "Vanuatu"
-msgstr ""
+msgstr "바누아투"
 
 #. 876
 msgid "Wallis and Futuna"
@@ -1401,11 +1395,11 @@ msgstr ""
 
 #. 882
 msgid "Samoa"
-msgstr ""
+msgstr "사모아"
 
 #. 887
 msgid "Yemen"
-msgstr ""
+msgstr "예멘"
 
 #. 175
 msgid "Mayotte"
@@ -1413,15 +1407,15 @@ msgstr ""
 
 #. 710
 msgid "South Africa"
-msgstr ""
+msgstr "남아프리카"
 
 #. 894
 msgid "Zambia"
-msgstr ""
+msgstr "잠비아"
 
 #. 716
 msgid "Zimbabwe"
-msgstr ""
+msgstr "짐바브웨"
 
 msgid "* Unknown, add is_in tags to those cities"
 msgstr ""
@@ -1482,59 +1476,59 @@ msgid "Iso3"
 msgstr ""
 
 msgid "Country"
-msgstr ""
+msgstr "나라"
 
 msgid "Postal"
 msgstr ""
 
 msgid "Town"
-msgstr ""
+msgstr "마을"
 
 msgid "District"
-msgstr ""
+msgstr "지역"
 
 msgid "Street"
-msgstr ""
+msgstr "거리"
 
 msgid "Number"
 msgstr ""
 
 msgid "Enter Destination"
-msgstr ""
+msgstr "목적지입력"
 
 msgid "Zip Code"
-msgstr ""
+msgstr "우편번호"
 
 msgid "City"
-msgstr ""
+msgstr "도시"
 
 msgid "District/Township"
 msgstr ""
 
 msgid "Map"
-msgstr ""
+msgstr "지도"
 
 msgid "Bookmark"
-msgstr ""
+msgstr "북마크"
 
 msgid "Destination"
-msgstr ""
+msgstr "목적지"
 
 #. TRANSLATORS: These texts are for menu items in GTK GUI. The _ indicates the mnemonic key (=underlined character) for this menu item. Please place the _ before a suitable character in the translation (or omit it if no mnemonic key is desired).
 msgid "_Display"
 msgstr ""
 
 msgid "_Route"
-msgstr ""
+msgstr "경로"
 
 msgid "_Former Destinations"
-msgstr ""
+msgstr "이전목적지"
 
 msgid "_Bookmarks"
-msgstr ""
+msgstr "북마크"
 
 msgid "_Map"
-msgstr ""
+msgstr "지도"
 
 msgid "_Layout"
 msgstr ""
@@ -1546,19 +1540,19 @@ msgid "_Vehicle"
 msgstr ""
 
 msgid "Zoom_Out"
-msgstr ""
+msgstr "줌아웃"
 
 msgid "Decrease zoom level"
 msgstr ""
 
 msgid "Zoom_In"
-msgstr ""
+msgstr "줌인"
 
 msgid "Increase zoom level"
 msgstr ""
 
 msgid "_Recalculate"
-msgstr ""
+msgstr "재계산"
 
 msgid "Redraw map"
 msgstr ""
@@ -1579,13 +1573,13 @@ msgid "Opens POI search dialog"
 msgstr ""
 
 msgid "_Stop Navigation"
-msgstr ""
+msgstr "안내중지"
 
 msgid "Test"
-msgstr ""
+msgstr "테스트"
 
 msgid "_Quit"
-msgstr ""
+msgstr "종료"
 
 msgid "Quit the application"
 msgstr ""
@@ -1615,7 +1609,7 @@ msgid "Enable/disable automatic zoom level changing"
 msgstr ""
 
 msgid "_Fullscreen"
-msgstr ""
+msgstr "전체화면"
 
 msgid "Data"
 msgstr ""
@@ -1715,28 +1709,28 @@ msgid "Visit Before"
 msgstr ""
 
 msgid "N"
-msgstr ""
+msgstr "북"
 
 msgid "NE"
-msgstr ""
+msgstr "복동"
 
 msgid "E"
-msgstr ""
+msgstr "동"
 
 msgid "SE"
-msgstr ""
+msgstr "남동"
 
 msgid "S"
-msgstr ""
+msgstr "남"
 
 msgid "SW"
-msgstr ""
+msgstr "남서"
 
 msgid "W"
-msgstr ""
+msgstr "서"
 
 msgid "NW"
-msgstr ""
+msgstr "북서"
 
 #. Android resource: @strings/no
 msgid "No"
@@ -1763,7 +1757,7 @@ msgstr ""
 
 #, c-format
 msgid "Waypoint %s"
-msgstr ""
+msgstr "경유지 %s"
 
 msgid "Select waypoint to insert the new one before"
 msgstr ""
@@ -1818,7 +1812,7 @@ msgid "Delete waypoint"
 msgstr ""
 
 msgid "Bookmarks"
-msgstr ""
+msgstr "북마크"
 
 msgid "Bookmarks as waypoints"
 msgstr ""
@@ -1970,7 +1964,7 @@ msgid "Show Locale"
 msgstr ""
 
 msgid "Former Destinations"
-msgstr ""
+msgstr "이전목적지"
 
 msgid "- No former destinations available -"
 msgstr ""
@@ -2462,7 +2456,7 @@ msgid "Tools"
 msgstr ""
 
 msgid "Route"
-msgstr ""
+msgstr "경로"
 
 msgid "About"
 msgstr ""
@@ -2490,7 +2484,7 @@ msgid "Display"
 msgstr ""
 
 msgid "Fullscreen"
-msgstr ""
+msgstr "전체화면"
 
 msgid "Window Mode"
 msgstr ""
diff --git a/po/ku.po.in b/po/ku.po.in
index ae3f0139..29359c64 100644
--- a/po/ku.po.in
+++ b/po/ku.po.in
@@ -69,35 +69,39 @@ msgid "sixth exit"
 msgstr ""
 
 #, c-format
-msgid "%d m"
+msgid "%d feet"
 msgstr ""
 
 #, c-format
-msgid "in %d m"
+msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d feet"
+msgid "%d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "in %d feet"
+msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr ""
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "in %d meters"
-msgstr ""
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "%d.%d miles"
+msgid "%d meters"
 msgstr ""
 
 #, c-format
-msgid "in %d.%d miles"
+msgid "in %d meters"
 msgstr ""
 
 #, c-format
@@ -109,18 +113,6 @@ msgid "in %d.%d kilometers"
 msgstr ""
 
 #, c-format
-msgid "one mile"
-msgid_plural "%d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
-msgid "in one mile"
-msgid_plural "in %d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] ""
diff --git a/po/lb.po.in b/po/lb.po.in
index 216e2e7b..128e4611 100644
--- a/po/lb.po.in
+++ b/po/lb.po.in
@@ -3,19 +3,20 @@
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Kevin G https://launchpad.net/~kev912002
+# MaXaM https://launchpad.net/~maxschaal
 
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2011-09-29 17:56+0000\n"
-"Last-Translator: Kevin G <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:59+0000\n"
+"Last-Translator: MaXaM <maxschaal@yahoo.de>\n"
 "Language-Team: Luxembourgish <lb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"Language: \n"
+"Language: lb\n"
 
 msgid "Running from source directory\n"
 msgstr "Aus dem Quellverzeechnis starten\n"
@@ -32,16 +33,16 @@ msgid "first"
 msgstr "éischt"
 
 msgid "second"
-msgstr "Sekonn"
+msgstr "Zweet"
 
 msgid "third"
 msgstr "drett"
 
 msgid "fourth"
-msgstr "veiert"
+msgstr "véiert"
 
 msgid "fifth"
-msgstr "feneft"
+msgstr "fëneft"
 
 msgid "sixth"
 msgstr "sechst"
@@ -51,7 +52,7 @@ msgid "zeroth exit"
 msgstr "nullt Ausfahrt"
 
 msgid "first exit"
-msgstr "Eischt Ausfahrt"
+msgstr "Éischt Ausfahrt"
 
 msgid "second exit"
 msgstr "Zweet Ausfahrt"
@@ -69,14 +70,6 @@ msgid "sixth exit"
 msgstr "sechst Ausfahrt"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "an %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -85,14 +78,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d Meter"
-
-#, c-format
-msgid "in %d meters"
-msgstr "An %d Meter"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -101,14 +86,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d,%d Kilometer"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "An %d,%d Kilometer"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -121,6 +98,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d Meter"
+
+#, c-format
+msgid "in %d meters"
+msgstr "An %d Meter"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d,%d Kilometer"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "An %d,%d Kilometer"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "Een Kilometer"
@@ -135,51 +128,51 @@ msgstr[1] "An %d Kilometer"
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name
 #, c-format
 msgid "%1$sonto the %2$s%3$s%4$s"
-msgstr ""
+msgstr "%1$sop d' %2$s%3$s%4$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
 #, c-format
 msgid "%1$sonto %2$s"
-msgstr ""
+msgstr "%1$sop d' Stross %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|masculine form"
-msgstr ""
+msgstr "%1$sop den %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|feminine form"
-msgstr ""
+msgstr "%1$sop d' %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|neuter form"
-msgstr ""
+msgstr "%1$sop d' %2$s"
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "op d' Opfahrt"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sop d' Stross %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sop den %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sop d' %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sop d' %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -335,7 +328,7 @@ msgstr ""
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Dreinen %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
@@ -344,7 +337,7 @@ msgstr ""
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Dreinen %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -371,10 +364,10 @@ msgstr ""
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
-msgstr ""
+msgstr "Verdeeler"
 
 msgid "Exit"
-msgstr ""
+msgstr "Ausfaart"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/lt.po.in b/po/lt.po.in
index c4886739..31da2edb 100644
--- a/po/lt.po.in
+++ b/po/lt.po.in
@@ -5,6 +5,7 @@
 # Aidas Kasparas https://launchpad.net/~a-kasparas
 # KaZeR https://launchpad.net/~kazer
 # Mantas Kriaučiūnas https://launchpad.net/~mantas
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Rytis Ūsalis https://launchpad.net/~rytis-usalis
 # laimonas https://launchpad.net/~laimonas-mockus
 
@@ -12,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-04-15 00:07+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:59+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -75,36 +76,42 @@ msgid "sixth exit"
 msgstr "šeštas išvažiavimas"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
+msgid "%d feet"
+msgstr "%d pėdos"
 
 #, c-format
-msgid "in %d m"
-msgstr "už %d m"
+msgid "in %d feet"
+msgstr "už %d pėdų"
 
 #, c-format
-msgid "%d feet"
-msgstr ""
+msgid "%d.%d miles"
+msgstr "%d.%d mylios"
 
 #, c-format
-msgid "in %d feet"
-msgstr ""
+msgid "in %d.%d miles"
+msgstr "už %d.%d mylių"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d metrai"
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] "%d mylia"
+msgstr[1] "%d mylios"
+msgstr[2] "%d mylių"
 
 #, c-format
-msgid "in %d meters"
-msgstr "už %d metrų"
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] "už %d mylios"
+msgstr[1] "už %d mylių"
+msgstr[2] "už %d mylių"
 
 #, c-format
-msgid "%d.%d miles"
-msgstr ""
+msgid "%d meters"
+msgstr "%d metrai"
 
 #, c-format
-msgid "in %d.%d miles"
-msgstr ""
+msgid "in %d meters"
+msgstr "už %d metrų"
 
 #, c-format
 msgid "%d.%d kilometers"
@@ -115,19 +122,6 @@ msgid "in %d.%d kilometers"
 msgstr "už %d.%d kilometrų"
 
 #, c-format
-msgid "one mile"
-msgid_plural "%d miles"
-msgstr[0] "%d mylia"
-msgstr[1] "%d mylios"
-msgstr[2] "%d mylių"
-
-#, c-format
-msgid "in one mile"
-msgid_plural "in %d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d kilometras"
@@ -144,64 +138,64 @@ msgstr[2] "už %d kilometrų"
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name
 #, c-format
 msgid "%1$sonto the %2$s%3$s%4$s"
-msgstr ""
+msgstr "%1$sį %2$s%3$s%4$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
 #, c-format
 msgid "%1$sonto %2$s"
-msgstr ""
+msgstr "%1$sį %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|masculine form"
-msgstr ""
+msgstr "%1$sį %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|feminine form"
-msgstr ""
+msgstr "%1$sį %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|neuter form"
-msgstr ""
+msgstr "%1$sį %2$s"
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "į rampą"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sį %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sį %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sį %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sį %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
 msgid "%sinto the %s"
-msgstr "%s į %s"
+msgstr "%sį %s"
 
 msgid "When possible, please turn around"
-msgstr "kai įmanoma, apsisukite"
+msgstr "Kai įmanoma, apsisukite"
 
 #. TRANSLATORS: the argument is the destination to follow
 #, c-format
 msgid "towards %s"
-msgstr ""
+msgstr "link %s"
 
 #, c-format
 msgid "Follow the road for the next %s"
@@ -213,17 +207,17 @@ msgstr "Netrukus įsukite į žiedą"
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
 msgid "Enter the roundabout %s"
-msgstr ""
+msgstr "Įsukite į žiedą %s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "tada išsukite iš žiedo %1$s išvažiavime %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Išsukite iš žiedo %1$s išvažiavime %2$s"
 
 msgid "soon"
 msgstr "netrukus"
@@ -232,50 +226,50 @@ msgid "now"
 msgstr "dabar"
 
 msgid "then"
-msgstr ""
+msgstr "tada"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "then merge%1$s|right"
-msgstr ""
+msgstr "tada užvažiuokite už%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Merge %1$s%2$s|right"
-msgstr ""
+msgstr "Užvažiuokite už%1$s%2$s"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "then merge%1$s|left"
-msgstr ""
+msgstr "tada užvažiuokite už%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Merge %1$s%2$s|left"
-msgstr ""
+msgstr "Užvažiuokite už%1$s%2$s"
 
 msgid "on your left"
-msgstr ""
+msgstr "kairėje"
 
 msgid "on your right"
-msgstr ""
+msgstr "dešinėje"
 
 #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance
 #, c-format
 msgid "Take exit %1$s %2$s %3$s"
-msgstr ""
+msgstr "Išvažiuokite per išvažiavimą %1$s %2$s %3$s"
 
 #. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
 #, c-format
 msgid "Take the exit %1$s %2$s%3$s"
-msgstr ""
+msgstr "Išvažiuokite per išvažiavimą %1$s %2$s%3$s"
 
 #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
 msgid "at interchange"
-msgstr ""
+msgstr "sankryžoje"
 
 msgid "at exit"
-msgstr ""
+msgstr "išvažiavime"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
@@ -290,22 +284,22 @@ msgstr ""
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then keep right%1$s"
-msgstr ""
+msgstr "tada laikykitės dešinės%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Keep right %1$s%2$s%3$s"
-msgstr ""
+msgstr "Laikykitės dešinės %1$s%2$s%3$s"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then keep left%1$s"
-msgstr ""
+msgstr "tada laikykitės kairės%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Keep left %1$s%2$s%3$s"
-msgstr ""
+msgstr "Laikykitės kairės %1$s%2$s%3$s"
 
 #. TRANSLATORS: "right" as in "turn right"
 msgid "right"
@@ -335,25 +329,25 @@ msgstr "už %i kelių"
 #. 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 ""
+msgstr "Pasukite %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "tada apsisukite"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Apsisukite %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "tada apsisukite"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Apsisukite %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -368,7 +362,7 @@ msgstr ""
 #. *
 #. 
 msgid "follow"
-msgstr ""
+msgstr "laikykitės kelio"
 
 msgid "then you have reached your destination."
 msgstr "tada jūs pasiekėte kelionės tikslą."
@@ -380,10 +374,10 @@ msgstr "Jūs pasiekėte tikslą %s"
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
-msgstr ""
+msgstr "Sankryža"
 
 msgid "Exit"
-msgstr ""
+msgstr "Išvažiavimas"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -418,16 +412,16 @@ msgid "Waypoint %d"
 msgstr ""
 
 msgid "Visit before..."
-msgstr ""
+msgstr "Lankyti prieš..."
 
 msgid "Set as position"
-msgstr "Nustatykite poziciją"
+msgstr "Nustatyti poziciją"
 
 msgid "Set as destination"
-msgstr "Nustatykite tikslą"
+msgstr "Nustatyti tikslą"
 
 msgid "Add as bookmark"
-msgstr "Pridėkite žymę"
+msgstr "Pridėti žymę"
 
 #, c-format
 msgid "Point 0x%x 0x%x"
@@ -435,7 +429,7 @@ msgstr "Taškas 0x%x 0x%x"
 
 #, c-format
 msgid "Screen coord : %d %d"
-msgstr "Ekrano koordinatės  : %d %d"
+msgstr "Ekrano koordinatės : %d %d"
 
 #. 020
 msgid "Andorra"
@@ -1477,7 +1471,7 @@ msgstr "nežinoma gatvė"
 
 #. Safe cast: attr_generic_set_attr does not modify its parameter.
 msgid "Unnamed vehicle"
-msgstr ""
+msgstr "Bevardė transporto priemonė"
 
 msgid "Failed to write bookmarks file"
 msgstr ""
@@ -1542,7 +1536,7 @@ msgid "_Route"
 msgstr "Parinkti kelią"
 
 msgid "_Former Destinations"
-msgstr "Ankstesnės vietos"
+msgstr "Ankstesni tikslai"
 
 msgid "_Bookmarks"
 msgstr "Adresynas"
@@ -1587,10 +1581,10 @@ msgid "Opens address search dialog"
 msgstr "Atidaro adreso paieškos dialogą"
 
 msgid "_POI search"
-msgstr ""
+msgstr "Lankytinų vietų paieška"
 
 msgid "Opens POI search dialog"
-msgstr ""
+msgstr "Atidaro lankytinų vietų paieškos dialogą"
 
 msgid "_Stop Navigation"
 msgstr "Stabdyti navigaciją"
@@ -1635,7 +1629,7 @@ msgid "Data"
 msgstr "Duomenys"
 
 msgid "Pharmacy"
-msgstr ""
+msgstr "Vaistinė"
 
 msgid "Restaurant"
 msgstr "Restoranas"
@@ -1671,20 +1665,20 @@ msgid "Police"
 msgstr "Policija"
 
 msgid "Justice"
-msgstr ""
+msgstr "Teismas"
 
 msgid "Taxi"
 msgstr "Taksi"
 
 msgid "Shopping"
-msgstr ""
+msgstr "Parduotuvė"
 
 msgid "Distance from screen center (km)"
-msgstr ""
+msgstr "Atstumas nuo ekrano vidaus (km)"
 
 #, c-format
 msgid "POI %s. %s"
-msgstr ""
+msgstr "Lankytina vieta %s. %s"
 
 #, c-format
 msgid "Set destination to %ld, %ld \n"
@@ -1692,23 +1686,23 @@ msgstr "Nustatyti tikslą į %ld, %ld \n"
 
 #, c-format
 msgid "Set map to %ld, %ld \n"
-msgstr ""
+msgstr "Nustatyti žemėlapį į %ld, %ld \n"
 
 #, c-format
 msgid "Set next visit to %ld, %ld \n"
 msgstr ""
 
 msgid "POI search"
-msgstr ""
+msgstr "Lankytinų vietų paieška"
 
 msgid "Select a category"
 msgstr "Pasirinkite kategoriją"
 
 msgid "Select a distance to look for (km)"
-msgstr ""
+msgstr "Išrinkite atstumą, kuriame ieškoti (km)"
 
 msgid "Select a POI"
-msgstr ""
+msgstr "Išrinkite lankytiną vietą"
 
 msgid " "
 msgstr " "
@@ -1723,10 +1717,10 @@ msgid "Distance(m)"
 msgstr "Atstumas (m)"
 
 msgid "Name"
-msgstr ""
+msgstr "Vardas"
 
 msgid "Visit Before"
-msgstr ""
+msgstr "Aplankyi prieš"
 
 msgid "N"
 msgstr "Š"
@@ -1799,7 +1793,7 @@ msgid "View Attributes"
 msgstr "Rodyti savybes"
 
 msgid "Set as position (and deactivate vehicle)"
-msgstr ""
+msgstr "Nustatyti poziciją (išjungdamas transporto priemonę)"
 
 msgid "POIs"
 msgstr "Lankytinos vietos"
@@ -1808,10 +1802,10 @@ msgid "View on map"
 msgstr "Rodyti žemėlapyje"
 
 msgid "Remove search results from the map"
-msgstr ""
+msgstr "Pašalinti paieškos rezultatas nuo žemėlapio"
 
 msgid "Show results on the map"
-msgstr ""
+msgstr "Rodyti rezultatus žemelapyje"
 
 msgid "Cut Bookmark"
 msgstr "Iškirpti žymą"
@@ -1844,7 +1838,7 @@ msgid "Replace with waypoints"
 msgstr ""
 
 msgid "Delete Folder"
-msgstr "Trinti aplanką"
+msgstr "Pašalinti katalogą"
 
 #. Adds the Bookmark folders
 msgid "Add Bookmark folder"
@@ -1866,7 +1860,7 @@ msgid "Map Download"
 msgstr ""
 
 msgid "Active"
-msgstr ""
+msgstr "Aktyvus"
 
 msgid "Download Enabled"
 msgstr ""
@@ -1923,7 +1917,7 @@ msgstr "Apie Navit"
 
 #. Authors
 msgid "By"
-msgstr ""
+msgstr "Sukūrė"
 
 #. Contributors
 msgid "And all the Navit Team"
@@ -1936,7 +1930,7 @@ msgid "Waypoints"
 msgstr ""
 
 msgid "Enter Coordinates"
-msgstr ""
+msgstr "Įvėskite koordinates"
 
 #. 
 #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
@@ -1945,10 +1939,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 "Platuma Ilguma"
 
 msgid "Enter coordinates, for example:"
-msgstr ""
+msgstr "Įvėskitė koordinates, pvz.:"
 
 msgid "Vehicle"
 msgstr "Transporto priemonė"
@@ -1984,10 +1978,10 @@ msgid "Show Locale"
 msgstr ""
 
 msgid "Former Destinations"
-msgstr "Ankstesnės vietos"
+msgstr "Ankstesni tikslai"
 
 msgid "- No former destinations available -"
-msgstr ""
+msgstr "- Nėra ankstesnių tikslų -"
 
 msgid "Message"
 msgstr "Žinutė"
@@ -1996,7 +1990,7 @@ msgid "Back"
 msgstr "Grįžti"
 
 msgid "Back to map"
-msgstr "Grižti į žemėlapį"
+msgstr "Grįžti į žemėlapį"
 
 msgid "Main Menu"
 msgstr "Pagrindinis meniu"
@@ -2011,7 +2005,7 @@ msgid "Prev"
 msgstr ""
 
 msgid "Return to route!"
-msgstr ""
+msgstr "Grįžti į maršrutą!"
 
 #. warning told
 msgid "Look out! Camera!"
@@ -2019,22 +2013,22 @@ msgstr ""
 
 #. warning told
 msgid "Please decrease your speed"
-msgstr ""
+msgstr "Prašom sumažinti greitį"
 
 msgid "partial match"
 msgstr ""
 
 #. Android resource: @strings/address_search_button
 msgid "Search"
-msgstr ""
+msgstr "Paieška"
 
 #. Android resource: @strings/address_search_towns
 msgid "Towns"
-msgstr ""
+msgstr "Miestai"
 
 #. Android resource: @strings/position_popup_drive_here
 msgid "Route to here"
-msgstr ""
+msgstr "Maršrutas iki čia"
 
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
@@ -2046,7 +2040,7 @@ msgid ""
 msgstr ""
 
 msgid "Downloaded maps"
-msgstr ""
+msgstr "Atsisiųsti žemėlapiai"
 
 msgid ""
 "Sorry, we currently do not support maps above 3.8G on Android, please select "
@@ -2179,7 +2173,7 @@ msgid "Baden-Wuerttemberg"
 msgstr ""
 
 msgid "Bayern"
-msgstr ""
+msgstr "Bavarija"
 
 msgid "Mittelfranken"
 msgstr ""
@@ -2493,6 +2487,8 @@ msgid ""
 "Former\n"
 "Destinations"
 msgstr ""
+"Ankstesni\n"
+"tikslai"
 
 msgid "Coordinates"
 msgstr "Koordinatės"
@@ -2533,7 +2529,7 @@ msgid "NMEA Data"
 msgstr ""
 
 msgid "car_shortest"
-msgstr ""
+msgstr "Automobilis (trumpiausias maršrutas)"
 
 msgid "car_avoid_tolls"
 msgstr ""
@@ -2586,11 +2582,11 @@ msgstr "Daugiau informacijos"
 
 #. Android resource: @strings/optionsmenu_zoom_in
 msgid "Zoom in"
-msgstr "Artinti"
+msgstr "Padidinti"
 
 #. Android resource: @strings/optionsmenu_zoom_out
 msgid "Zoom out"
-msgstr "Tolinti"
+msgstr "Sumažinti"
 
 #. Android resource: @strings/optionsmenu_download_maps
 msgid "Download maps"
@@ -2598,7 +2594,7 @@ msgstr "Atsisiųsti žemėlapius"
 
 #. Android resource: @strings/optionsmenu_toggle_poi
 msgid "Toggle POIs"
-msgstr ""
+msgstr "Rodyti/slėpti lankytinas vietas"
 
 #. Android resource: @strings/optionsmenu_exit_navit
 msgid "Exit Navit"
@@ -2614,7 +2610,7 @@ msgstr ""
 
 #. Android resource: @strings/map_delete
 msgid "Delete this map?"
-msgstr "Ištrinti šį žemėlapį?"
+msgstr "Pašalinti šį žemėlapį?"
 
 #. Android resource: @strings/map_download_downloading
 msgid "Downloading:"
@@ -2638,7 +2634,7 @@ msgstr ""
 
 #. Android resource: @strings/address_search_title
 msgid "Address search"
-msgstr "Ieškoti adreso"
+msgstr "Adresų paieška"
 
 #. Android resource: @strings/address_enter_destination
 msgid "Enter destination"
diff --git a/po/lv.po.in b/po/lv.po.in
index c7a18d8f..142c0843 100644
--- a/po/lv.po.in
+++ b/po/lv.po.in
@@ -4,6 +4,7 @@
 # Many thanks to the contributors of this translation:
 # Janis https://launchpad.net/~janis-zl
 # KaZeR https://launchpad.net/~kazer
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Stendec https://launchpad.net/~stendec
 # sieks https://launchpad.net/~sieks
 
@@ -11,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-01-05 13:24+0000\n"
-"Last-Translator: Stendec <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:59+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,14 +74,6 @@ msgid "sixth exit"
 msgstr "sestā izeja"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "pēc %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr "%d pēdas"
 
@@ -89,14 +82,6 @@ msgid "in %d feet"
 msgstr "pēc %d pēdām"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d metri"
-
-#, c-format
-msgid "in %d meters"
-msgstr "pēc %d metriem"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr "%d.%d jūdzes"
 
@@ -105,14 +90,6 @@ msgid "in %d.%d miles"
 msgstr "pēc %d.%d jūdzēm"
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d kilometri"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "pēc %d.%d kilometr(a,iem"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] "%d jūdze"
@@ -127,6 +104,22 @@ msgstr[1] "pēc %d jūdzēm"
 msgstr[2] "pēc %d jūdzēm"
 
 #, c-format
+msgid "%d meters"
+msgstr "%d metri"
+
+#, c-format
+msgid "in %d meters"
+msgstr "pēc %d metriem"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d kilometri"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "pēc %d.%d kilometr(a,iem"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d kilometru"
@@ -167,27 +160,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "uz uzbrauktuves"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%suz %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%suz %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%suz %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%suz %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -217,12 +210,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "pēc tam izbraukt no apļa pa %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Nobraukt no apļa pa %1$s %2$s"
 
 msgid "soon"
 msgstr "drīz"
@@ -231,7 +224,7 @@ msgid "now"
 msgstr "tagad"
 
 msgid "then"
-msgstr ""
+msgstr "pēc tam"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -274,7 +267,7 @@ msgid "at interchange"
 msgstr ""
 
 msgid "at exit"
-msgstr ""
+msgstr "nobrauktuvē"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
@@ -334,25 +327,25 @@ msgstr "pēc %i ceļiem"
 #. 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 ""
+msgstr "Pagriezties %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "pēc tam apgriezieties"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Apgriezieties %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "pēc tam apgriezieties"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Apgriezieties %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -367,7 +360,7 @@ msgstr ""
 #. *
 #. 
 msgid "follow"
-msgstr ""
+msgstr "turpiniet"
 
 msgid "then you have reached your destination."
 msgstr "tad Jūs sasniegsiet glamērķi"
@@ -382,7 +375,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Nobrauktuve"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/mk.po.in b/po/mk.po.in
index a66f736d..6d208fc1 100644
--- a/po/mk.po.in
+++ b/po/mk.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:
 # Dejan Angelov https://launchpad.net/~dejanangelov
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Naum Spaseski https://launchpad.net/~naum-spaseski-gmail
 # Robert Mileski https://launchpad.net/~mileski
 # goran.cvetkovski https://launchpad.net/~goran-cvetkovski
@@ -11,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-12-10 00:53+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:59+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,14 +74,6 @@ msgid "sixth exit"
 msgstr "шести излез"
 
 #, c-format
-msgid "%d m"
-msgstr "%d м"
-
-#, c-format
-msgid "in %d m"
-msgstr "после %d м"
-
-#, c-format
 msgid "%d feet"
 msgstr "%d стапки"
 
@@ -89,14 +82,6 @@ msgid "in %d feet"
 msgstr "за %d стапки"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d метри"
-
-#, c-format
-msgid "in %d meters"
-msgstr "после %d метра"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr "%d.%d милји"
 
@@ -105,14 +90,6 @@ msgid "in %d.%d miles"
 msgstr "за %d.%d милји"
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d километри"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "после %d.%d километри"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -125,6 +102,22 @@ msgstr[0] ""
 msgstr[1] "за %d милји"
 
 #, c-format
+msgid "%d meters"
+msgstr "%d метри"
+
+#, c-format
+msgid "in %d meters"
+msgstr "после %d метра"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d километри"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "после %d.%d километри"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d километри"
@@ -163,27 +156,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "на рампа"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sна %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sна %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sна %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sна %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -213,12 +206,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "потоа излегувате од кружен тек на %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Излегувате од кружен тек на %1$s %2$s"
 
 msgid "soon"
 msgstr "наскоро"
@@ -227,7 +220,7 @@ msgid "now"
 msgstr "сега"
 
 msgid "then"
-msgstr ""
+msgstr "тогаш"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -330,25 +323,25 @@ msgstr "после %i патишта"
 #. 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 ""
+msgstr "Свртете %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "тогаш свртете"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Свртете %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "тогаш свртете"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Свртете %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -378,7 +371,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Излез"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/ml.po.in b/po/ml.po.in
index dbaa0c67..1dc2f77d 100644
--- a/po/ml.po.in
+++ b/po/ml.po.in
@@ -3,19 +3,21 @@
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Faju https://launchpad.net/~gotoarunk
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Sunil K https://launchpad.net/~sunilk
 
 msgid ""
 msgstr ""
-"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"
+"Project-Id-Version: navit 0.5.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2015-07-19 03:59+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Malayalam <ml@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: ml\n"
 
 msgid "Running from source directory\n"
 msgstr "സോര്‍സ് ഡൈരക്ടറിയില് നിന്നും പ്രവര്ത്തിക്കുന്നു\n"
@@ -69,14 +71,6 @@ msgid "sixth exit"
 msgstr "ആറാമത്തെ വഴി"
 
 #, c-format
-msgid "%d m"
-msgstr "%d മീറ്റര്‍"
-
-#, c-format
-msgid "in %d m"
-msgstr "%d മീറ്ററില്‍"
-
-#, c-format
 msgid "%d feet"
 msgstr "%d അടി"
 
@@ -85,14 +79,6 @@ msgid "in %d feet"
 msgstr "%d അടിയില്‍"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d മീറ്റര്‍"
-
-#, c-format
-msgid "in %d meters"
-msgstr "%d മീറ്ററില്‍"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr "%d.%d മൈല്‍"
 
@@ -101,14 +87,6 @@ msgid "in %d.%d miles"
 msgstr "%d.%d മൈലില്‍"
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d കിലോമീറ്റര്‍"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "%d.%d കിലോമീറ്ററില്‍"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] "ഒരു മൈല്‍"
@@ -121,6 +99,22 @@ msgstr[0] "ഒരു മൈലില്‍"
 msgstr[1] "%d മൈലില്‍"
 
 #, c-format
+msgid "%d meters"
+msgstr "%d മീറ്റര്‍"
+
+#, c-format
+msgid "in %d meters"
+msgstr "%d മീറ്ററില്‍"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d കിലോമീറ്റര്‍"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "%d.%d കിലോമീറ്ററില്‍"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "ഒരു കിലോമീറ്റര്‍"
@@ -164,22 +158,22 @@ msgstr ""
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sകഴിഞ്ഞു %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sകഴിഞ്ഞു %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sകഴിഞ്ഞു %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sകഴിഞ്ഞു %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -209,12 +203,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "%1$s- ല്‍ റൗണ്ടാനയില്‍ നിന്നും പുറത്തോട്ട് പോവുക %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "%1$s-ലൂടെ റൗണ്ടാനയില്‍ നിന്നും പുറത്തു പോവുകാ %2$s"
 
 msgid "soon"
 msgstr "അല്പസമയത്തിനുള്ളില്‍"
@@ -326,7 +320,7 @@ msgstr "%i വഴികൾക്കു ശേഷം"
 #. 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 ""
+msgstr "%4$s ലേക്ക്  %3$s %2$s %1$s തിരിയുക"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
@@ -374,7 +368,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "പുറത്തേക്ക്"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/mn.po.in b/po/mn.po.in
index 8ac36569..42687827 100644
--- a/po/mn.po.in
+++ b/po/mn.po.in
@@ -6,8 +6,8 @@
 
 msgid ""
 msgstr ""
-"Project-Id-Version: navit\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Project-Id-Version: navit 0.5.0\n"
+"Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2015-03-11 06:11+0000\n"
 "Last-Translator: Enkhbold <enkhbold_baatar@yahoo.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
@@ -15,6 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"Language: mn\n"
 
 msgid "Running from source directory\n"
 msgstr "Эх байгаа сангаас нь ажиллуулах\n"
@@ -68,35 +69,39 @@ msgid "sixth exit"
 msgstr ""
 
 #, c-format
-msgid "%d m"
+msgid "%d feet"
 msgstr ""
 
 #, c-format
-msgid "in %d m"
+msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d feet"
+msgid "%d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "in %d feet"
+msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr ""
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "in %d meters"
-msgstr ""
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "%d.%d miles"
+msgid "%d meters"
 msgstr ""
 
 #, c-format
-msgid "in %d.%d miles"
+msgid "in %d meters"
 msgstr ""
 
 #, c-format
@@ -108,18 +113,6 @@ msgid "in %d.%d kilometers"
 msgstr ""
 
 #, c-format
-msgid "one mile"
-msgid_plural "%d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
-msgid "in one mile"
-msgid_plural "in %d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] ""
diff --git a/po/mr.po.in b/po/mr.po.in
index 38e4ee77..de286a97 100644
--- a/po/mr.po.in
+++ b/po/mr.po.in
@@ -69,14 +69,6 @@ msgid "sixth exit"
 msgstr "सहावा बाहेर जाण्याचा मार्ग"
 
 #, c-format
-msgid "%d m"
-msgstr "%d मि."
-
-#, c-format
-msgid "in %d m"
-msgstr "%d मिनीटांत"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -85,14 +77,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr ""
-
-#, c-format
-msgid "in %d meters"
-msgstr ""
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -101,14 +85,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr ""
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr ""
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -121,6 +97,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr ""
+
+#, c-format
+msgid "in %d meters"
+msgstr ""
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr ""
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] ""
diff --git a/po/nb.po.in b/po/nb.po.in
index 05f639d8..da29d3a3 100644
--- a/po/nb.po.in
+++ b/po/nb.po.in
@@ -5,6 +5,7 @@
 # KaZeR https://launchpad.net/~kazer
 # Kenneth Langdalen https://launchpad.net/~spam-klnetworks
 # Kurt Nielsen https://launchpad.net/~kurtn-penguins
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Skippern https://launchpad.net/~gay-today
 # Thor H. Johansen https://launchpad.net/~thorhajo
 # burner https://launchpad.net/~bendik-xplore
@@ -13,14 +14,14 @@ 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"
+"PO-Revision-Date: 2015-07-19 03:59+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Bendik Brenne <bendik@xplore.nu>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"Language: \n"
+"Language: nb\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -75,14 +76,6 @@ msgid "sixth exit"
 msgstr "sjette avkjøring"
 
 #, c-format
-msgid "%d m"
-msgstr "%d meter"
-
-#, c-format
-msgid "in %d m"
-msgstr "om %d meter"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -91,14 +84,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d meter"
-
-#, c-format
-msgid "in %d meters"
-msgstr "om %d meter"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -107,14 +92,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d kilometer"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "om %d,%d kilometer"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -127,6 +104,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d meter"
+
+#, c-format
+msgid "in %d meters"
+msgstr "om %d meter"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d kilometer"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "om %d,%d kilometer"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "en kilometer"
@@ -165,27 +158,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "ut på akselerasjonsfeltet"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sinn på gaten %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sinn på %s%s%sen"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sinn på %s%s%sa"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sin på %s%s%set"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -210,17 +203,17 @@ msgstr "Kjør inn i rundkjøringen snart"
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
 msgid "Enter the roundabout %s"
-msgstr ""
+msgstr "Kjør inn i rundkjøringen %s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "forlat så rundkjøringen ut %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Forlat rundkjøringen ut %1$s %2$s"
 
 msgid "soon"
 msgstr "snart"
@@ -229,7 +222,7 @@ msgid "now"
 msgstr "nå"
 
 msgid "then"
-msgstr ""
+msgstr "så"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -332,25 +325,25 @@ msgstr "etter %i avkjøringer"
 #. 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 ""
+msgstr "Sving %1$s til %2$s om %3$s %4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "snu så"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Snu %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "snu så"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Snu %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -365,7 +358,7 @@ msgstr ""
 #. *
 #. 
 msgid "follow"
-msgstr ""
+msgstr "følg"
 
 msgid "then you have reached your destination."
 msgstr "så har du nådd ditt reisemål."
@@ -380,7 +373,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Avkjørsel"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/nds.po.in b/po/nds.po.in
index 1672e3b9..ca715fb5 100644
--- a/po/nds.po.in
+++ b/po/nds.po.in
@@ -5,6 +5,7 @@
 # Christian Moll https://launchpad.net/~christian-chrmoll
 # KaZeR https://launchpad.net/~kazer
 # Lars Hennig https://launchpad.net/~elhennig
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Roadrunner IN https://launchpad.net/~online
 # Roschkor https://launchpad.net/~bound-one2000
 # everyone https://launchpad.net/~anonymus1338
@@ -14,14 +15,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-09-28 01:42+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:59+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: German, Low <nds@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"Language: \n"
+"Language: nds\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -76,14 +77,6 @@ msgid "sixth exit"
 msgstr "sechste Ausfahrt"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "in %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -92,14 +85,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d Meter"
-
-#, c-format
-msgid "in %d meters"
-msgstr "in %d Metern"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -108,14 +93,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d Kilometer"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "in %d %d Kilometern"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -128,6 +105,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d Meter"
+
+#, c-format
+msgid "in %d meters"
+msgstr "in %d Metern"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d Kilometer"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "in %d %d Kilometern"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "ein Kilometer"
@@ -166,32 +159,32 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "auf die Auffahrt"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sin die Straße %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sin den %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sin die %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sin das %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
 msgid "%sinto the %s"
-msgstr "%s in die %s"
+msgstr "%sin die %s"
 
 msgid "When possible, please turn around"
 msgstr "Wenn möglich, bitte wenden"
@@ -216,12 +209,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "dann den Kreisverkehr an der %1$s %2$s verlassen"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Den Kreisverkehr an der %1$s %2$s verlassen"
 
 msgid "soon"
 msgstr "in Kürze"
@@ -230,7 +223,7 @@ msgid "now"
 msgstr "jetzt"
 
 msgid "then"
-msgstr ""
+msgstr "dann"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -333,7 +326,7 @@ msgstr "nach %i Straßen"
 #. 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 ""
+msgstr "In %3$s %1$s%2$s %4$s abbiegen"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
@@ -381,7 +374,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Ausfahrt"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/nl.po.in b/po/nl.po.in
index 952b8791..a7c8d71c 100644
--- a/po/nl.po.in
+++ b/po/nl.po.in
@@ -24,14 +24,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-06-07 07:03+0000\n"
+"PO-Revision-Date: 2015-07-19 03:59+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"Language: \n"
+"Language: nl\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "soon"
@@ -89,14 +89,6 @@ msgid "sixth exit"
 msgstr "zesde afslag"
 
 #, c-format
-msgid "%d m"
-msgstr "%d meter"
-
-#, c-format
-msgid "in %d m"
-msgstr "na %d meter"
-
-#, c-format
 msgid "%d feet"
 msgstr "%d voet"
 
@@ -105,14 +97,6 @@ msgid "in %d feet"
 msgstr "na %d voet"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d meter"
-
-#, c-format
-msgid "in %d meters"
-msgstr "na %d meter"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr "%d.%d. mijl"
 
@@ -121,14 +105,6 @@ msgid "in %d.%d miles"
 msgstr "na %d.%d mijl"
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d kilometer"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "na %d,%d kilometer"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] "%d mijl"
@@ -141,6 +117,22 @@ msgstr[0] "na %d mijl"
 msgstr[1] "na %d mijl"
 
 #, c-format
+msgid "%d meters"
+msgstr "%d meter"
+
+#, c-format
+msgid "in %d meters"
+msgstr "na %d meter"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d kilometer"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "na %d,%d kilometer"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "één kilometer"
@@ -229,12 +221,12 @@ msgstr "%s de rotonde oprijden"
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr "daarna de rotonde verlaten bij de  %1$s %2$s"
+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 "Leave the roundabout at the %1$s %2$s"
-msgstr "verlaat de rotonde bij de  %1$s %2$s"
+msgstr "Verlaat de rotonde bij de %1$s %2$s"
 
 msgid "now"
 msgstr "nu"
@@ -343,7 +335,7 @@ msgstr "na %i wegen"
 #. 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 "Ga %3$s%1$s naar %2$s%4$s"
+msgstr "Ga %3$s %1$s naar %2$s %4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
@@ -388,10 +380,10 @@ msgstr "Bestemming %s bereikt"
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
-msgstr ""
+msgstr "Knooppunt"
 
 msgid "Exit"
-msgstr "afslag"
+msgstr "Afslag"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -2786,5 +2778,5 @@ msgid ""
 "Should we ask the system to show voice download dialog?"
 msgstr ""
 "Navit kan elke tekst naar spraak-engine geïnstalleerd op uw apparaat "
-"gebruiken . De momenteel geselecteerde engine meldt dat het niet in uw taal "
-"kan spreken . Wil U de  spraak download dialoog van Uw toestel starten?"
+"gebruiken. De momenteel geselecteerde engine meldt dat het niet in uw taal "
+"kan spreken. Wil U de spraak download dialoog van Uw toestel starten?"
diff --git a/po/nn.po.in b/po/nn.po.in
index b279c332..42a64446 100644
--- a/po/nn.po.in
+++ b/po/nn.po.in
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Skippern https://launchpad.net/~gay-today
 
 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"
+"PO-Revision-Date: 2015-07-19 03:59+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Norwegian Nynorsk <nn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -71,14 +72,6 @@ msgid "sixth exit"
 msgstr "sjette avkjøyring"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "om %d meter"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -87,14 +80,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d meter"
-
-#, c-format
-msgid "in %d meters"
-msgstr "om %d meter"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -103,14 +88,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr ""
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "om %d,%d kilometer"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -123,6 +100,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d meter"
+
+#, c-format
+msgid "in %d meters"
+msgstr "om %d meter"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "om %d,%d kilometer"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "ein kilometer"
@@ -376,7 +369,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Avkjøyring"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/pl.po.in b/po/pl.po.in
index 34ff79bb..dd52a22b 100644
--- a/po/pl.po.in
+++ b/po/pl.po.in
@@ -7,6 +7,7 @@
 # Jarosław Ogrodnik https://launchpad.net/~goz
 # KaZeR https://launchpad.net/~kazer
 # Marcin Ostajewski (panszpik) https://launchpad.net/~panszpik
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Mineque https://launchpad.net/~mineque
 # Patryk &quot;LeadMan&quot; Benderz https://launchpad.net/~leadman
 # S0Cool https://launchpad.net/~mareksok
@@ -19,15 +20,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-11-04 21:48+0000\n"
-"Last-Translator: DarkAlexis <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 04:00+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Translators\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==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"Language: \n"
+"Language: pl\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -82,14 +83,6 @@ msgid "sixth exit"
 msgstr "szóstym wyjeździe"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "za %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr "%d stopa"
 
@@ -98,14 +91,6 @@ msgid "in %d feet"
 msgstr "za %d stóp"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d metrów"
-
-#, c-format
-msgid "in %d meters"
-msgstr "za %d metrów"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr "%d.%d mil"
 
@@ -114,14 +99,6 @@ msgid "in %d.%d miles"
 msgstr "za %d.%d mil"
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d kilometrów"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "za %d.%d kilometrów"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] "jedna mila"
@@ -136,6 +113,22 @@ msgstr[1] "za %d mile"
 msgstr[2] "za %d mil"
 
 #, c-format
+msgid "%d meters"
+msgstr "%d metrów"
+
+#, c-format
+msgid "in %d meters"
+msgstr "za %d metrów"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d kilometrów"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "za %d.%d kilometrów"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "jeden kilometr"
@@ -176,27 +169,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "na wjazd"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sw %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sw %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sw %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sw %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -226,12 +219,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "następnie zjedź z ronda na %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Zjedź z ronda na %1$s %2$s"
 
 msgid "soon"
 msgstr "wkrótce"
@@ -240,7 +233,7 @@ msgid "now"
 msgstr "teraz"
 
 msgid "then"
-msgstr ""
+msgstr "następnie"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -343,25 +336,25 @@ msgstr "po drodze %i"
 #. 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 ""
+msgstr "Skręć %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "następnie zawróc"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Zawróc %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "następnie zawróc"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Zawróc %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -388,10 +381,10 @@ msgstr "Dotarłeś do celu %s"
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
-msgstr ""
+msgstr "Węzeł"
 
 msgid "Exit"
-msgstr ""
+msgstr "Zjazd"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/pms.po.in b/po/pms.po.in
index c0cd22dd..9bfc7210 100644
--- a/po/pms.po.in
+++ b/po/pms.po.in
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2012-09-14 10:28+0000\n"
+"PO-Revision-Date: 2015-07-19 04:00+0000\n"
 "Last-Translator: Simone Briatore <simone.bri@alice.it>\n"
 "Language-Team: Piemontese <pms@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"Language: \n"
+"Language: pms\n"
 
 msgid "Running from source directory\n"
 msgstr ""
@@ -69,14 +69,6 @@ msgid "sixth exit"
 msgstr "sescia surtia"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr ""
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -85,14 +77,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d meter"
-
-#, c-format
-msgid "in %d meters"
-msgstr ""
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -101,14 +85,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d chilometer"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "tra %d.%d chilometer"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -121,6 +97,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d meter"
+
+#, c-format
+msgid "in %d meters"
+msgstr ""
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d chilometer"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "tra %d.%d chilometer"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] ""
@@ -159,7 +151,7 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "in tla rampa"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
@@ -374,7 +366,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Surtia"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/pt.po.in b/po/pt.po.in
index bb9cb908..ede25aaf 100644
--- a/po/pt.po.in
+++ b/po/pt.po.in
@@ -6,6 +6,7 @@
 # Carla Pita https://launchpad.net/~carla-pita
 # Diogo Lavareda https://launchpad.net/~diogolavareda
 # Joel Patrão https://launchpad.net/~jpatrao
+# João Pirralha https://launchpad.net/~joaopirralha
 # Rui Correia https://launchpad.net/~rds-correia
 # Skippern https://launchpad.net/~gay-today
 # Sérgio Marques https://launchpad.net/~sergio+marques
@@ -19,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-12-01 01:04+0000\n"
-"Last-Translator: Sérgio Marques <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 04:00+0000\n"
+"Last-Translator: João Pirralha <joaopirralha@gmail.com>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,7 +45,7 @@ msgid "first"
 msgstr "primeira"
 
 msgid "second"
-msgstr "Segundo"
+msgstr "segunda"
 
 msgid "third"
 msgstr "terceira"
@@ -81,28 +82,12 @@ msgid "sixth exit"
 msgstr "sexta saída"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "a %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr "%d pés"
 
 #, c-format
 msgid "in %d feet"
-msgstr "a %d pés"
-
-#, c-format
-msgid "%d meters"
-msgstr "%d metros"
-
-#, c-format
-msgid "in %d meters"
-msgstr "a %d metros"
+msgstr "em %d pés"
 
 #, c-format
 msgid "%d.%d miles"
@@ -110,15 +95,7 @@ msgstr "%d.%d milhas"
 
 #, c-format
 msgid "in %d.%d miles"
-msgstr "a %d.%d milhas"
-
-#, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d quilómetro"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "a %d.%d quilómetros"
+msgstr "em %d.%d milhas"
 
 #, c-format
 msgid "one mile"
@@ -129,8 +106,24 @@ msgstr[1] "%d milhas"
 #, c-format
 msgid "in one mile"
 msgid_plural "in %d miles"
-msgstr[0] "a uma milha"
-msgstr[1] "a %d milhas"
+msgstr[0] "em uma milha"
+msgstr[1] "em %d milhas"
+
+#, c-format
+msgid "%d meters"
+msgstr "%d metros"
+
+#, c-format
+msgid "in %d meters"
+msgstr "em %d metros"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d quilómetro"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "em %d.%d quilómetros"
 
 #, c-format
 msgid "one kilometer"
@@ -141,62 +134,62 @@ msgstr[1] "%d quilómetros"
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
-msgstr[0] "a um quilómetro"
-msgstr[1] "a %d quilómetros"
+msgstr[0] "em um quilómetro"
+msgstr[1] "em %d quilómetros"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name
 #, c-format
 msgid "%1$sonto the %2$s%3$s%4$s"
-msgstr ""
+msgstr "%1$spara %2$s%3$s%4$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
 #, c-format
 msgid "%1$sonto %2$s"
-msgstr ""
+msgstr "%1$spara %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|masculine form"
-msgstr ""
+msgstr "%1$spara o %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|feminine form"
-msgstr ""
+msgstr "%1$spara a %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|neuter form"
-msgstr ""
+msgstr "%1$spara %2$s"
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "no acesso à auto-estrada"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sem %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sno %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sna %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sem %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
 msgid "%sinto the %s"
-msgstr "%s na %s"
+msgstr "%sna %s"
 
 msgid "When possible, please turn around"
 msgstr "Quando for possível, inverta o sentido de marcha"
@@ -204,7 +197,7 @@ msgstr "Quando for possível, inverta o sentido de marcha"
 #. TRANSLATORS: the argument is the destination to follow
 #, c-format
 msgid "towards %s"
-msgstr ""
+msgstr "rumo a %s"
 
 #, c-format
 msgid "Follow the road for the next %s"
@@ -216,17 +209,17 @@ msgstr "Entre na próxima rotunda"
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
 msgid "Enter the roundabout %s"
-msgstr ""
+msgstr "Entre na rotunda %s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "e saia da rotunda na %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Saia da rotunda na %1$s %2$s"
 
 msgid "soon"
 msgstr "logo"
@@ -235,96 +228,96 @@ msgid "now"
 msgstr "agora"
 
 msgid "then"
-msgstr ""
+msgstr "e depois"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "then merge%1$s|right"
-msgstr ""
+msgstr "e juntar à direita%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Merge %1$s%2$s|right"
-msgstr ""
+msgstr "Juntar à direita %1$s%2$s"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "then merge%1$s|left"
-msgstr ""
+msgstr "e juntar à esquerda%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Merge %1$s%2$s|left"
-msgstr ""
+msgstr "Juntar à esquerda %1$s%2$s"
 
 msgid "on your left"
-msgstr ""
+msgstr "à sua esquerda"
 
 msgid "on your right"
-msgstr ""
+msgstr "à sua direita"
 
 #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance
 #, c-format
 msgid "Take exit %1$s %2$s %3$s"
-msgstr ""
+msgstr "Saia %1$s %2$s %3$s"
 
 #. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
 #, c-format
 msgid "Take the exit %1$s %2$s%3$s"
-msgstr ""
+msgstr "Saia na saída %1$s %2$s%3$s"
 
 #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
 msgid "at interchange"
-msgstr ""
+msgstr "no trevo"
 
 msgid "at exit"
-msgstr ""
+msgstr "na saída"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then continue straight%1$s"
-msgstr ""
+msgstr "e avance%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Continue straight %1$s%2$s%3$s"
-msgstr ""
+msgstr "Avance %1$s%2$s%3$s"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then keep right%1$s"
-msgstr ""
+msgstr "e continue à direita%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Keep right %1$s%2$s%3$s"
-msgstr ""
+msgstr "Continue à direita %1$s%2$s%3$s"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then keep left%1$s"
-msgstr ""
+msgstr "e continue à esquerda%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Keep left %1$s%2$s%3$s"
-msgstr ""
+msgstr "Continue à esquerda %1$s%2$s%3$s"
 
 #. TRANSLATORS: "right" as in "turn right"
 msgid "right"
-msgstr "direita"
+msgstr "à direita"
 
 #. TRANSLATORS: "left" as in "turn left"
 msgid "left"
-msgstr "esquerda"
+msgstr "à esquerda"
 
 #. TRANSLATORS: as in "turn easily right"
 msgid "easily "
-msgstr "facilmente "
+msgstr "ligeiramente "
 
 #. TRANSLATORS: as in "turn strongly right"
 msgid "strongly "
-msgstr "veementemente "
+msgstr "apertadamente "
 
 #, c-format
 msgid "Take the %1$s road to the %2$s"
@@ -338,25 +331,25 @@ msgstr "depois de %i estradas"
 #. 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 ""
+msgstr "Vire %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "e dê meia-volta à esquerda"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Dê meia-volta à esquerda %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "e dê meia-volta à direita"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Dê meia-volta à direita %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -371,7 +364,7 @@ msgstr ""
 #. *
 #. 
 msgid "follow"
-msgstr ""
+msgstr "siga"
 
 msgid "then you have reached your destination."
 msgstr "depois chegou ao seu destino."
@@ -379,14 +372,14 @@ 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"
+msgstr "Chega ao seu destino %s"
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
-msgstr ""
+msgstr "Trevo"
 
 msgid "Exit"
-msgstr ""
+msgstr "Saída"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -408,20 +401,20 @@ msgid "Time"
 msgstr "Duração"
 
 msgid "Destination Length"
-msgstr "Distância do destino"
+msgstr "Distância ao destino"
 
 msgid "Destination Time"
 msgstr "Duração até ao destino"
 
 msgid "Roadbook"
-msgstr "Mapa"
+msgstr "Descrição da rota"
 
 #, c-format
 msgid "Waypoint %d"
 msgstr "Ponto %d"
 
 msgid "Visit before..."
-msgstr "Visite antes..."
+msgstr "Visitar antes..."
 
 msgid "Set as position"
 msgstr "Definir como posição"
@@ -446,7 +439,7 @@ msgstr "Andorra"
 
 #. 784
 msgid "United Arab Emirates"
-msgstr "Emiratos Árabes Unidos"
+msgstr "Emirados Árabes Unidos"
 
 #. 004
 msgid "Afghanistan"
@@ -1441,7 +1434,7 @@ msgid "Zimbabwe"
 msgstr "Zimbabué"
 
 msgid "* Unknown, add is_in tags to those cities"
-msgstr "* Desconhecido, adicione tags \"is_in\"  para estas cidades"
+msgstr "* Desconhecido, adicione tags \"is_in\" para estas cidades"
 
 msgid ""
 "navit usage:\n"
@@ -1454,6 +1447,16 @@ msgid ""
 "\t-h: print this usage info and exit.\n"
 "\t-v: print the version and exit.\n"
 msgstr ""
+"Utilização do Navit:\n"
+"navit [opções] [ficheiro de configuração]\n"
+"\t-c <ficheiro>: usar <ficheiro> como ficheiro de configuração, em vez de "
+"usar o ficheiro pré-definido.\n"
+"\t-d <n>: define o nível global de saída de depuração para <n> (0=erro, "
+"1=aviso, 2=informação, 3=depuração).\n"
+"\tDefinições do ficheiro de configuração irão ter efeito mesmo quando "
+"definiram um 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"
@@ -1470,6 +1473,7 @@ msgstr "Utilizando o ficheiro '%s'\n"
 #, c-format
 msgid "Error: No configuration found in config file '%s'\n"
 msgstr ""
+"Erro: Nenhuma configuração encontrada no ficheiro de configuração '%s'\n"
 
 msgid ""
 "Internal initialization failed, exiting. Check previous error messages.\n"
@@ -1545,16 +1549,16 @@ msgid "_Route"
 msgstr "_Rota"
 
 msgid "_Former Destinations"
-msgstr "Destinos an:teriores"
+msgstr "Destinos _anteriores"
 
 msgid "_Bookmarks"
-msgstr "Marca_dores"
+msgstr "Marcador_es"
 
 msgid "_Map"
 msgstr "_Mapa"
 
 msgid "_Layout"
-msgstr "Es_quema"
+msgstr "_Esquema"
 
 msgid "_Projection"
 msgstr "_Projeção"
@@ -1590,13 +1594,13 @@ msgid "Opens address search dialog"
 msgstr "Abre o diálogo de procura de destino"
 
 msgid "_POI search"
-msgstr ""
+msgstr "_Pesquisar POI"
 
 msgid "Opens POI search dialog"
-msgstr ""
+msgstr "Abre o diálogo de pesquisa de POI"
 
 msgid "_Stop Navigation"
-msgstr "Parar _navegação"
+msgstr "Parar _Navegação"
 
 msgid "Test"
 msgstr "Teste"
@@ -1614,13 +1618,13 @@ msgid "_Lock on Road"
 msgstr "B_loqueio na estrada"
 
 msgid "_Keep orientation to the North"
-msgstr "_Manter orientação ao Norte"
+msgstr "Manter orientação ao _Norte"
 
 msgid "Switches map orientation to the north or the vehicle"
 msgstr "Muda a orientação do mapa para o norte ou para o veículo"
 
 msgid "_Roadbook"
-msgstr "Ma_pa"
+msgstr "_Descrição da rota"
 
 msgid "Show/hide route description"
 msgstr "Mostrar/ocultar descrição da rota"
@@ -1632,104 +1636,104 @@ msgid "Enable/disable automatic zoom level changing"
 msgstr "Ativar/desativar tamanho automático da ampliação"
 
 msgid "_Fullscreen"
-msgstr "Ecrã co_mpleto"
+msgstr "_Ecrã completo"
 
 msgid "Data"
 msgstr "Dados"
 
 msgid "Pharmacy"
-msgstr ""
+msgstr "Farmácia"
 
 msgid "Restaurant"
-msgstr ""
+msgstr "Restaurante"
 
 msgid "Restaurant. Fast food"
-msgstr ""
+msgstr "Restaurante. Comida rápida"
 
 msgid "Hotel"
-msgstr ""
+msgstr "Hotel"
 
 msgid "Car parking"
-msgstr ""
+msgstr "Estacionamento para carros"
 
 msgid "Fuel station"
-msgstr ""
+msgstr "Posto de abastecimento"
 
 msgid "Bank"
-msgstr ""
+msgstr "Banco"
 
 msgid "Hospital"
-msgstr ""
+msgstr "Hospital"
 
 msgid "Cinema"
-msgstr ""
+msgstr "Cinema"
 
 msgid "Train station"
-msgstr ""
+msgstr "Estação de comboios"
 
 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 "Compras"
 
 msgid "Distance from screen center (km)"
-msgstr ""
+msgstr "Distância ao centro do ecrã (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 %ld, %ld \n"
 
 #, c-format
 msgid "Set next visit to %ld, %ld \n"
-msgstr ""
+msgstr "Definir próxima visita para %ld, %ld \n"
 
 msgid "POI search"
-msgstr ""
+msgstr "Pesquisar POIs"
 
 msgid "Select a category"
-msgstr ""
+msgstr "Selecione uma categoria"
 
 msgid "Select a distance to look for (km)"
-msgstr ""
+msgstr "Selecione a distância a 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"
@@ -1930,7 +1934,7 @@ msgstr "De"
 
 #. Contributors
 msgid "And all the Navit Team"
-msgstr "equipa Navit"
+msgstr "E toda a equipa do Navit"
 
 msgid "members and contributors."
 msgstr "membros e contribuidores."
@@ -1948,10 +1952,10 @@ msgstr "Introduzir 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 "Introduza as coordenadas. Por exemplo:"
+msgstr "Introduza as coordenadas, por exemplo:"
 
 msgid "Vehicle"
 msgstr "Veículo"
@@ -1990,7 +1994,7 @@ msgid "Former Destinations"
 msgstr "Destinos anteriores"
 
 msgid "- No former destinations available -"
-msgstr "-Não existem destinos anteriores-"
+msgstr "- Não existem destinos anteriores -"
 
 msgid "Message"
 msgstr "Mensagem"
@@ -2047,6 +2051,9 @@ msgid ""
 "Please restart Navit after you attach an SD card or select a different map "
 "location."
 msgstr ""
+"A atual localização %s no mapa não está disponível\n"
+"Por favor reinicie o Navit após introduzir um cartão SD ou selecionar uma "
+"localização diferente no mapa."
 
 msgid "Downloaded maps"
 msgstr "Mapas transferidos"
@@ -2055,17 +2062,21 @@ msgid ""
 "Sorry, we currently do not support maps above 3.8G on Android, please select "
 "a smaller one."
 msgstr ""
+"Infelizmente não suportamos mapas maiores que 3.8G no Android, por favor "
+"selecione um mais pequeno."
 
 msgid "Cancel"
 msgstr "Cancelar"
 
 msgid "filenamePath"
-msgstr ""
+msgstr "nomedoficheiroCaminho"
 
 msgid ""
 "New location set to %s\n"
 "Restart Navit to apply the changes."
 msgstr ""
+"Nova localização definida para %s\n"
+"Reinicie o Navit para aplicar as alterações."
 
 msgid "Whole Planet"
 msgstr "Planeta"
@@ -2431,14 +2442,14 @@ msgid "Guyane Francaise"
 msgstr "Guiana Francesa"
 
 msgid "downloading"
-msgstr "a transferir..."
+msgstr "a transferir"
 
 #. Android resource: @strings/map_download_ready
 msgid "ready"
 msgstr "pronto"
 
 msgid "Media selected for map storage is not available"
-msgstr ""
+msgstr "A unidade selecionada para armazenar mapas não está dispoível"
 
 #. Android resource: @strings/map_download_not_enough_free_space
 msgid "Not enough free space"
@@ -2455,11 +2466,11 @@ msgstr "Transferência interrompida!"
 
 #. Android resource: @strings/map_download_eta
 msgid "ETA"
-msgstr "ETA"
+msgstr "Duração estimada"
 
 #. Android resource: @strings/map_download_title
 msgid "Map download"
-msgstr "TransferÊncia de mapa"
+msgstr "Transferência do mapa"
 
 msgid "Vehicle Position"
 msgstr "Posição do veículo"
@@ -2497,7 +2508,7 @@ msgid ""
 "Destinations"
 msgstr ""
 "Destinos\n"
-"anteriores"
+"Anteriores"
 
 msgid "Coordinates"
 msgstr "Coordenadas"
@@ -2548,7 +2559,7 @@ msgid "car_avoid_tolls"
 msgstr "carro_evitar_portagens"
 
 msgid "car_pedantic"
-msgstr ""
+msgstr "carro_pedante"
 
 msgid "horse"
 msgstr "cavalo"
@@ -2586,9 +2597,9 @@ msgid ""
 msgstr ""
 "Obrigado por instalar o Navit!\n"
 "\n"
-"Para iniciar, deve selecionar a opção de menu \"Transferir mapas\" para "
-"transferir um mapa. Nota: o ficheiro de mapa pode ser bastante extenso "
-"(>50MB). Recomenda-se a utilização de uma rede sem fios.\n"
+"Para começar, selecione \"Transferir mapas\" no menu para transferir um "
+"mapa. Nota: o tamanho do ficheiro de mapa pode ser bastante grande (>50MB) - "
+"recomenda-se a utilização de uma rede wifi.\n"
 "\n"
 "Dados do mapa: (c) colaboradores OpenStreetMap\n"
 "\n"
@@ -2600,7 +2611,7 @@ msgstr "Sim"
 
 #. Android resource: @strings/initial_info_box_more_info
 msgid "More info"
-msgstr "Mais detalhes"
+msgstr "Mais informações"
 
 #. Android resource: @strings/optionsmenu_zoom_in
 msgid "Zoom in"
@@ -2616,7 +2627,7 @@ msgstr "Transferir mapas"
 
 #. Android resource: @strings/optionsmenu_toggle_poi
 msgid "Toggle POIs"
-msgstr "Alternar POIs"
+msgstr "Ativar POIs"
 
 #. Android resource: @strings/optionsmenu_exit_navit
 msgid "Exit Navit"
@@ -2624,11 +2635,11 @@ msgstr "Sair"
 
 #. Android resource: @strings/optionsmenu_backup_restore
 msgid "Backup / Restore"
-msgstr "Backup/Restauro"
+msgstr "Cópia seg. / Restauro"
 
 #. Android resource: @strings/optionsmenu_set_map_location
 msgid "Set map location"
-msgstr ""
+msgstr "Definir localização do mapa"
 
 #. Android resource: @strings/map_delete
 msgid "Delete this map?"
@@ -2636,7 +2647,7 @@ msgstr "Eliminar mapa?"
 
 #. Android resource: @strings/map_download_downloading
 msgid "Downloading:"
-msgstr "Transferência:"
+msgstr "A transferir:"
 
 #. Android resource: @strings/map_download_download_error
 msgid "Error downloading map."
@@ -2669,7 +2680,7 @@ msgstr "Ocorrências parciais"
 
 #. Android resource: @strings/address_search_searching
 msgid "Searching..."
-msgstr "Procura..."
+msgstr "A procurar..."
 
 #. Android resource: @strings/address_search_not_found
 msgid "Address not found"
@@ -2677,11 +2688,11 @@ msgstr "Endereço não encontrado"
 
 #. Android resource: @strings/address_search_getting_results
 msgid "Getting search results"
-msgstr "Obtenção dos resultados"
+msgstr "A obter resultados"
 
 #. Android resource: @strings/address_search_loading_results
 msgid "Loading search results"
-msgstr "Carregamento de resultados"
+msgstr "Carregando resultados"
 
 #. Android resource: @strings/address_search_no_results
 msgid "No results found"
@@ -2689,7 +2700,7 @@ msgstr "Nenhum resultado encontrado"
 
 #. Android resource: @strings/address_search_no_text_entered
 msgid "No text entered"
-msgstr "Texto não introduzido"
+msgstr "Nenhum texto introduzido"
 
 #. Android resource: @strings/address_search_set_destination
 msgid "Setting destination to:"
@@ -2701,27 +2712,27 @@ msgstr "Escolha uma ação"
 
 #. Android resource: @strings/please_insert_an_sd_card
 msgid "Please insert an SD Card"
-msgstr "Por favor insira o cartão SD"
+msgstr "Por favor insira um cartão SD"
 
 #. Android resource: @strings/backing_up
 msgid "Backing up..."
-msgstr "Backup..."
+msgstr "A criar cópia de segurança..."
 
 #. Android resource: @strings/restoring
 msgid "Restoring..."
-msgstr "Restauro..."
+msgstr "A restaurar..."
 
 #. Android resource: @strings/failed_to_create_backup_directory
 msgid "Failed to create backup directory"
-msgstr "Erro ao criar pasta de backup"
+msgstr "Falha ao criar o diretório da cópia de segurança"
 
 #. Android resource: @strings/backup_failed
 msgid "Backup failed"
-msgstr "Erro ao efetuar backup"
+msgstr "A cópia de segurança falhou"
 
 #. Android resource: @strings/no_backup_found
 msgid "No backup found"
-msgstr "Backup não encontrado"
+msgstr "Nenhuma cópia de segurança encontrada"
 
 #. Android resource: @strings/failed_to_restore
 msgid "Failed to restore"
@@ -2729,7 +2740,7 @@ msgstr "Falha ao restaurar"
 
 #. Android resource: @strings/backup_successful
 msgid "Backup successful"
-msgstr "Backup efetuado"
+msgstr "Cópia de segurança efetuada com sucesso"
 
 #. Android resource: @strings/restore_successful_please_restart_navit
 msgid ""
@@ -2741,7 +2752,7 @@ msgstr ""
 
 #. Android resource: @strings/backup_not_found
 msgid "Backup not found"
-msgstr "Backup não encontrado"
+msgstr "Cópia de segurança não encontrada"
 
 #. Android resource: @strings/restore_failed
 msgid "Restore failed"
@@ -2749,11 +2760,11 @@ msgstr "Erro ao restaurar"
 
 #. Android resource: @strings/select_backup
 msgid "Select backup"
-msgstr "Escolha o backup"
+msgstr "Escolha a cópia de segurança"
 
 #. Android resource: @strings/backup
 msgid "Backup"
-msgstr "Backup"
+msgstr "Cópia de segurança"
 
 #. Android resource: @strings/restore
 msgid "Restore"
@@ -2761,7 +2772,7 @@ msgstr "Restauro"
 
 #. Android resource: @strings/TTS_title_data_missing
 msgid "System text to speech engine data is missing"
-msgstr ""
+msgstr "Dados do motor de síntese de voz em falta no sistema"
 
 #. Android resource: @strings/TTS_qery_install_data
 msgid ""
@@ -2769,3 +2780,6 @@ msgid ""
 "currently selected engine reports it is unable to speak in your language. "
 "Should we ask the system to show voice download dialog?"
 msgstr ""
+"O Navit pode usar qualquer motor de síntese de voz no dispositivo. O motor "
+"atualmente selecionado reporta não suportar o seu idioma. Pedir ao sistema "
+"para exibir o diálogo de transferência de voz?"
diff --git a/po/pt_BR.po.in b/po/pt_BR.po.in
index 1553e310..cdb9438b 100644
--- a/po/pt_BR.po.in
+++ b/po/pt_BR.po.in
@@ -7,6 +7,7 @@
 # Gustavo Guidorizzi https://launchpad.net/~gguido
 # Helder Santana https://launchpad.net/~helder-bs-santana
 # Jairo Roberto Duarte https://launchpad.net/~jairo58
+# Julio Alexander Sieg https://launchpad.net/~julio-sieg
 # Leonardo Hamada https://launchpad.net/~leonardohamada
 # Luzemário https://launchpad.net/~luzemario
 # Matheus Cavalcante https://launchpad.net/~suetamac
@@ -23,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-04-03 01:58+0000\n"
-"Last-Translator: Jairo Roberto Duarte <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 04:00+0000\n"
+"Last-Translator: Helder Santana <helder.bs.santana@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -85,14 +86,6 @@ msgid "sixth exit"
 msgstr "sexta saída"
 
 #, c-format
-msgid "%d m"
-msgstr "%d metros"
-
-#, c-format
-msgid "in %d m"
-msgstr "em %d metros"
-
-#, c-format
 msgid "%d feet"
 msgstr "%d pés"
 
@@ -101,14 +94,6 @@ msgid "in %d feet"
 msgstr "em %d pés"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d metros"
-
-#, c-format
-msgid "in %d meters"
-msgstr "em %d metros"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr "%d.%d milhas"
 
@@ -117,14 +102,6 @@ msgid "in %d.%d miles"
 msgstr "em %d.%d milhas"
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d quilômetros"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "em %d.%d quilôtros"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] "uma milha"
@@ -137,6 +114,22 @@ msgstr[0] "em uma milha"
 msgstr[1] "em %d milhas"
 
 #, c-format
+msgid "%d meters"
+msgstr "%d metros"
+
+#, c-format
+msgid "in %d meters"
+msgstr "em %d metros"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d quilômetros"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "em %d.%d quilôtros"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "um quilômetro"
@@ -175,27 +168,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "na rampa"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sna %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sno %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sna %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sem %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -208,7 +201,7 @@ msgstr "Quando possível, favor retornar"
 #. TRANSLATORS: the argument is the destination to follow
 #, c-format
 msgid "towards %s"
-msgstr ""
+msgstr "em direção a %s"
 
 #, c-format
 msgid "Follow the road for the next %s"
@@ -220,17 +213,17 @@ msgstr "Entre na rotatória em seguida"
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
 msgid "Enter the roundabout %s"
-msgstr ""
+msgstr "Entre na rotatória %s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "então deixe a rotatória na %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Deixe a rotatória na %1$s %2$s"
 
 msgid "soon"
 msgstr "em breve"
@@ -239,7 +232,7 @@ msgid "now"
 msgstr "agora"
 
 msgid "then"
-msgstr ""
+msgstr "em seguida"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -254,65 +247,65 @@ msgstr ""
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "then merge%1$s|left"
-msgstr ""
+msgstr "em seguida vire a %1$s|esquerda"
 
 #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Merge %1$s%2$s|left"
-msgstr ""
+msgstr "Vire a %1$s%2$s|esquerda"
 
 msgid "on your left"
-msgstr ""
+msgstr "à sua esquerda"
 
 msgid "on your right"
-msgstr ""
+msgstr "à sua direita"
 
 #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance
 #, c-format
 msgid "Take exit %1$s %2$s %3$s"
-msgstr ""
+msgstr "Pegue a saída %1$s %2$s %3$s"
 
 #. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
 #, c-format
 msgid "Take the exit %1$s %2$s%3$s"
-msgstr ""
+msgstr "Pegue a saída %1$s %2$s %3$s"
 
 #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
 msgid "at interchange"
-msgstr ""
+msgstr "no cruzamento"
 
 msgid "at exit"
-msgstr ""
+msgstr "na saída"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then continue straight%1$s"
-msgstr ""
+msgstr "em seguinda, siga%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Continue straight %1$s%2$s%3$s"
-msgstr ""
+msgstr "Siga %1$s%2$s%3$s"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then keep right%1$s"
-msgstr ""
+msgstr "então mantenha a direita%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Keep right %1$s%2$s%3$s"
-msgstr ""
+msgstr "Mantenha a direita %1$s%2$s%3$s"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then keep left%1$s"
-msgstr ""
+msgstr "então mantenha a esquerda%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Keep left %1$s%2$s%3$s"
-msgstr ""
+msgstr "Mantenha a esquerda %1$s%2$s%3$s"
 
 #. TRANSLATORS: "right" as in "turn right"
 msgid "right"
@@ -342,25 +335,25 @@ msgstr "após %i vias"
 #. 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 ""
+msgstr "Vire a %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "então faça o retorno"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Faça o retorno a esquerda %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "então faça o retorno a direita"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Faça o retorno a direita %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -375,7 +368,7 @@ msgstr ""
 #. *
 #. 
 msgid "follow"
-msgstr ""
+msgstr "siga por"
 
 msgid "then you have reached your destination."
 msgstr "então você chegará ao destino."
@@ -387,10 +380,10 @@ msgstr "Você chegará ao destino %s"
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
-msgstr ""
+msgstr "Trevo"
 
 msgid "Exit"
-msgstr ""
+msgstr "Saída"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/ro.po.in b/po/ro.po.in
index f07d9b48..3b57b1cf 100644
--- a/po/ro.po.in
+++ b/po/ro.po.in
@@ -6,6 +6,7 @@
 # Eddy Petrisor https://launchpad.net/~eddy-petrisor-gmail
 # KaZeR https://launchpad.net/~kazer
 # Lucian Adrian Grijincu https://launchpad.net/~lucian.grijincu
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Nostriel https://launchpad.net/~nostriel
 # Ursache Dogariu Daniel https://launchpad.net/~danniel
 # dodobird https://launchpad.net/~dorinnirod
@@ -16,8 +17,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: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 04:00+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -79,14 +80,6 @@ msgid "sixth exit"
 msgstr "a șasea ieșire"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "în %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -95,14 +88,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d metri"
-
-#, c-format
-msgid "in %d meters"
-msgstr "în %d metri"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -111,14 +96,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d kilometri"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "în %d.%d kilometri"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -131,6 +108,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d metri"
+
+#, c-format
+msgid "in %d meters"
+msgstr "în %d metri"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d kilometri"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "în %d.%d kilometri"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "un kilometru"
@@ -171,32 +164,32 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "pe rampă"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%spe %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%spe %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%spe %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%spe %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
 msgid "%sinto the %s"
-msgstr "%s spre %s"
+msgstr "%sspre %s"
 
 msgid "When possible, please turn around"
 msgstr "Când este posibil, întoarceţi"
@@ -216,17 +209,17 @@ msgstr "Intrați în curând în giratoriu"
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
 msgid "Enter the roundabout %s"
-msgstr ""
+msgstr "Intrați în giratoriu %s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "apoi ieșiți din giratoriu la %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Ieșiți din giratoriu la %1$s %2$s"
 
 msgid "soon"
 msgstr "curând"
@@ -235,7 +228,7 @@ msgid "now"
 msgstr "acum"
 
 msgid "then"
-msgstr ""
+msgstr "apoi"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -338,25 +331,25 @@ msgstr "după %i străzi"
 #. 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 ""
+msgstr "Virați %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "apoi întoarceţi"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Întoarceţi %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "apoi întoarceţi"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Întoarceţi %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -383,10 +376,10 @@ msgstr "Ați ajuns la destinație %s"
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
-msgstr ""
+msgstr "Nod"
 
 msgid "Exit"
-msgstr ""
+msgstr "Ieșire"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/ru.po.in b/po/ru.po.in
index b6838a15..b0181c93 100644
--- a/po/ru.po.in
+++ b/po/ru.po.in
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-05-17 20:19+0000\n"
+"PO-Revision-Date: 2015-07-19 04:01+0000\n"
 "Last-Translator: tryagain <mdankov@yandex.ru>\n"
 "Language-Team: Rustam T. Usmanov\n"
 "MIME-Version: 1.0\n"
@@ -92,14 +92,6 @@ msgid "sixth exit"
 msgstr "шестой съезд"
 
 #, c-format
-msgid "%d m"
-msgstr "%d м"
-
-#, c-format
-msgid "in %d m"
-msgstr "через %d м"
-
-#, c-format
 msgid "%d feet"
 msgstr "%d футов"
 
@@ -108,14 +100,6 @@ msgid "in %d feet"
 msgstr "через %d футов"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d метров"
-
-#, c-format
-msgid "in %d meters"
-msgstr "через %d метров"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr "%d,%d миль"
 
@@ -124,14 +108,6 @@ msgid "in %d.%d miles"
 msgstr "через %d,%d миль"
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d,%d километров"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "через %d,%d километров"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] "%d миля"
@@ -146,6 +122,22 @@ msgstr[1] "через %d мили"
 msgstr[2] "через %d миль"
 
 #, c-format
+msgid "%d meters"
+msgstr "%d метров"
+
+#, c-format
+msgid "in %d meters"
+msgstr "через %d метров"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d,%d километров"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "через %d,%d километров"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d километр"
@@ -231,7 +223,7 @@ msgstr "Скоро круговое движение"
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
 msgid "Enter the roundabout %s"
-msgstr ""
+msgstr "%s круговое движение"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
@@ -255,22 +247,22 @@ msgstr "после чего"
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "then merge%1$s|right"
-msgstr ""
+msgstr "затем выезд вправо %1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Merge %1$s%2$s|right"
-msgstr ""
+msgstr "%1$s выезд вправо %2$s"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "then merge%1$s|left"
-msgstr ""
+msgstr "затем выезжайте влево %1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Merge %1$s%2$s|left"
-msgstr ""
+msgstr "%1$s выезд влево %2$s"
 
 msgid "on your left"
 msgstr "влево"
@@ -357,21 +349,21 @@ msgstr "%3$s сверните %1$s%2$s %4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "затем развернитесь влево"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "%1$s разворот налево"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "затем развернитесь вправо"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "%1$s разворот направо"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
diff --git a/po/sc.po.in b/po/sc.po.in
index 9d0e04b6..58b6fd78 100644
--- a/po/sc.po.in
+++ b/po/sc.po.in
@@ -2,14 +2,15 @@
 # Copyright (C) 2006-2015 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Rex Sanna https://launchpad.net/~rex-sanna
 
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2011-02-05 18:46+0000\n"
-"Last-Translator: Rex Sanna <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 04:00+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Sardinian <sc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,14 +70,6 @@ msgid "sixth exit"
 msgstr ""
 
 #, c-format
-msgid "%d m"
-msgstr "'%d' minutu"
-
-#, c-format
-msgid "in %d m"
-msgstr "in %d minutoso"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -85,14 +78,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d metroso"
-
-#, c-format
-msgid "in %d meters"
-msgstr "in %d metroso"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -101,14 +86,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d, %d chilometroso"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "in %d, %d chilometroso"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -121,6 +98,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d metroso"
+
+#, c-format
+msgid "in %d meters"
+msgstr "in %d metroso"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d, %d chilometroso"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "in %d, %d chilometroso"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "unu chilometru"
@@ -159,32 +152,32 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "in sa rampa"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sin s\\'istrada %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sin su %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sin sa %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sin su %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
 msgid "%sinto the %s"
-msgstr "%s in sa %s"
+msgstr "%sin sa %s"
 
 msgid "When possible, please turn around"
 msgstr "Commente possibile torra in daesecusu"
@@ -209,12 +202,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "tando lassa sa rotatoria a %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Lassa sa rotatoria a %1$s %2$s"
 
 msgid "soon"
 msgstr "prestu"
@@ -223,7 +216,7 @@ msgid "now"
 msgstr "como"
 
 msgid "then"
-msgstr ""
+msgstr "tando"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -326,25 +319,25 @@ msgstr "dopu %i istradasa"
 #. 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 ""
+msgstr "Zira %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "tando torra in daesecusu"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Torra in daesecusu %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "tando torra in daesecusu"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Torra in daesecusu %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -359,7 +352,7 @@ msgstr ""
 #. *
 #. 
 msgid "follow"
-msgstr ""
+msgstr "sichi"
 
 msgid "then you have reached your destination."
 msgstr "tando ses arribbau"
@@ -374,7 +367,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Essi"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/si.po.in b/po/si.po.in
index 7fd39583..028fd9e7 100644
--- a/po/si.po.in
+++ b/po/si.po.in
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-06-02 06:14+0000\n"
+"PO-Revision-Date: 2015-07-19 04:00+0000\n"
 "Last-Translator: සපුමල් බණ්ඩාර <sapumalbandaraucsc@gmail.com>\n"
 "Language-Team: Sinhalese <si@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"Language: \n"
+"Language: si\n"
 
 msgid "Running from source directory\n"
 msgstr "මූල ඩිරෙක්ටරියෙන් විචලනය වේ\n"
@@ -69,14 +69,6 @@ msgid "sixth exit"
 msgstr "සයවන පිටවුම"
 
 #, c-format
-msgid "%d m"
-msgstr "විනාඩි %d"
-
-#, c-format
-msgid "in %d m"
-msgstr "විනාඩි %d කින්"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -85,14 +77,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "මීටර %d"
-
-#, c-format
-msgid "in %d meters"
-msgstr "මීටර %d කින්"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -101,14 +85,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "කිලෝ මීටර %d.%d"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "කිලෝ මීටර %d.%d කින්"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -121,6 +97,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "මීටර %d"
+
+#, c-format
+msgid "in %d meters"
+msgstr "මීටර %d කින්"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "කිලෝ මීටර %d.%d"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "කිලෝ මීටර %d.%d කින්"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "කිලෝ මීටරයයි"
@@ -159,27 +151,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "රැම්පය තුළට"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%s %s %s %s තුළට"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%s %s %s %s තුළට"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%s %s %s %s තුළට"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%s %s %s %s තුළට"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -209,12 +201,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "එවිට %1$s %2$s හිදී වටරවුමෙන් ඉවත්වන්න."
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "%1$s %2$s හිදී වටරවුමෙන් ඉවත්වන්න."
 
 msgid "soon"
 msgstr "ලඟදීම"
@@ -326,7 +318,7 @@ msgstr "මාර්ග %i පසු"
 #. 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 ""
+msgstr "%1$s%2$s %3$s%4$s හරවන්න"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
@@ -374,7 +366,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "පිටවුම"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/sk.po.in b/po/sk.po.in
index afcaded7..627a8534 100644
--- a/po/sk.po.in
+++ b/po/sk.po.in
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-11-15 22:08+0000\n"
+"PO-Revision-Date: 2015-07-19 04:00+0000\n"
 "Last-Translator: GizmoSK <gizmosk@gmail.com>\n"
 "Language-Team: Slovenčina\n"
 "MIME-Version: 1.0\n"
@@ -77,14 +77,6 @@ msgid "sixth exit"
 msgstr "šiesty výjazd"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "o %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr "%d stôp"
 
@@ -93,14 +85,6 @@ msgid "in %d feet"
 msgstr "o %d stôp"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d metrov"
-
-#, c-format
-msgid "in %d meters"
-msgstr "o %d metrov"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr "%d.%d míľ"
 
@@ -109,14 +93,6 @@ msgid "in %d.%d miles"
 msgstr "o %d.%d míľ"
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d kilometrov"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "o %d.%d kilometrov"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] "%d míľa"
@@ -131,6 +107,22 @@ msgstr[1] "o %d míle"
 msgstr[2] "o %d míľ"
 
 #, c-format
+msgid "%d meters"
+msgstr "%d metrov"
+
+#, c-format
+msgid "in %d meters"
+msgstr "o %d metrov"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d kilometrov"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "o %d.%d kilometrov"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d kilometrov"
@@ -171,27 +163,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "na privádzač"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sdo %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sdo %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sdo %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sdo %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -221,12 +213,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "potom opustite kruhový objazd na %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Opustite kruhový objazd na %1$s %2$s"
 
 msgid "soon"
 msgstr "onedlho"
@@ -235,7 +227,7 @@ msgid "now"
 msgstr "teraz"
 
 msgid "then"
-msgstr ""
+msgstr "potom"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -338,25 +330,25 @@ msgstr "po %i cestách"
 #. 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 ""
+msgstr "Odbočte %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "potom otočte sa"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Otočte sa %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "potom otočte sa"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Otočte sa %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -383,10 +375,10 @@ msgstr "Dorazili ste do svojho cieľa %s"
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
-msgstr ""
+msgstr "Križovatka"
 
 msgid "Exit"
-msgstr ""
+msgstr "Výjazd"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/sl.po.in b/po/sl.po.in
index 5c4677a9..86edb051 100644
--- a/po/sl.po.in
+++ b/po/sl.po.in
@@ -4,14 +4,15 @@
 # Many thanks to the contributors of this translation:
 # Gregor Koporec https://launchpad.net/~gregork8
 # KaZeR https://launchpad.net/~kazer
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Štefan Baebler https://launchpad.net/~stefanba
 
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-09-28 01:42+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 04:00+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,14 +74,6 @@ msgid "sixth exit"
 msgstr "šesti izhod"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "Čez %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -89,14 +82,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d metrov"
-
-#, c-format
-msgid "in %d meters"
-msgstr "Čez %d metrov"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -105,14 +90,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d,%d kilometrov"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "Čez %d.%d kilometov"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -125,6 +102,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d metrov"
+
+#, c-format
+msgid "in %d meters"
+msgstr "Čez %d metrov"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d,%d kilometrov"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "Čez %d.%d kilometov"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d kilometrov"
@@ -172,22 +165,22 @@ msgstr ""
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sna %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sna %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sna %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sna %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -231,7 +224,7 @@ msgid "now"
 msgstr "sedaj"
 
 msgid "then"
-msgstr ""
+msgstr "nato"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -334,25 +327,25 @@ msgstr "čez %i cest"
 #. 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 ""
+msgstr "%3$s zavijte %1$s%2$s %4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "nato obrnite čim"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Obrnite čim %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "nato obrnite čim"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Obrnite čim %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -379,10 +372,10 @@ msgstr "%s ste na cilju"
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
-msgstr ""
+msgstr "Razcep"
 
 msgid "Exit"
-msgstr ""
+msgstr "Odcep"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/sr.po.in b/po/sr.po.in
index 9808275f..496f68b9 100644
--- a/po/sr.po.in
+++ b/po/sr.po.in
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-02-08 21:50+0000\n"
+"PO-Revision-Date: 2015-07-19 04:00+0000\n"
 "Last-Translator: Саша Петровић <salepetronije@gmail.com>\n"
 "Language-Team: српски <xfce4@xfce4.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgstr ""
 "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"
-"Language: sr\n"
+"Language: \n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -76,14 +76,6 @@ msgid "sixth exit"
 msgstr "шести излаз"
 
 #, c-format
-msgid "%d m"
-msgstr "%d м"
-
-#, c-format
-msgid "in %d m"
-msgstr "за %d м"
-
-#, c-format
 msgid "%d feet"
 msgstr "%d стопа"
 
@@ -92,14 +84,6 @@ msgid "in %d feet"
 msgstr "за %d стопе"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d метара"
-
-#, c-format
-msgid "in %d meters"
-msgstr "за %d метара"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr "%d.%d миља"
 
@@ -108,14 +92,6 @@ msgid "in %d.%d miles"
 msgstr "за %d.%d миља"
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d километара"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "за %d.%d километара"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] "%d миља"
@@ -130,6 +106,22 @@ msgstr[1] "кроз %d миље"
 msgstr[2] "кроз %d миља"
 
 #, c-format
+msgid "%d meters"
+msgstr "%d метара"
+
+#, c-format
+msgid "in %d meters"
+msgstr "за %d метара"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d километара"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "за %d.%d километара"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d километара"
@@ -170,27 +162,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "на нагибу"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sу %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sу %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sу %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sу %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -220,12 +212,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "потом напутстите обилазницу на %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Напуштање обилазнице за %1$s %2$s"
 
 msgid "soon"
 msgstr "ускоро"
@@ -234,7 +226,7 @@ msgid "now"
 msgstr "сад"
 
 msgid "then"
-msgstr ""
+msgstr "потом"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -337,25 +329,25 @@ msgstr "после %i путева"
 #. 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 ""
+msgstr "Скрени %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "потом променити смер"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Променити смер %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "потом променити смер"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Променити смер %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -385,7 +377,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Излаз"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/sv.po.in b/po/sv.po.in
index 6439c4ef..33448f5b 100644
--- a/po/sv.po.in
+++ b/po/sv.po.in
@@ -4,6 +4,7 @@
 # Many thanks to the contributors of this translation:
 # Erik Lundin https://launchpad.net/~erik-lundin
 # KaZeR https://launchpad.net/~kazer
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Mikael Olofsson https://launchpad.net/~michlos
 # Mikko Virkkilä https://launchpad.net/~virkkila
 # Squall Leonhart https://launchpad.net/~webmaster-square-one
@@ -14,8 +15,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: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 04:00+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,14 +77,6 @@ msgid "sixth exit"
 msgstr "sjätte avfarten"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "om %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -92,14 +85,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d meter"
-
-#, c-format
-msgid "in %d meters"
-msgstr "om %d meter"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -108,14 +93,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d,%d kilometer"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "om %d,%d kilometer"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -128,6 +105,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d meter"
+
+#, c-format
+msgid "in %d meters"
+msgstr "om %d meter"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d,%d kilometer"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "om %d,%d kilometer"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "en kilometer"
@@ -166,27 +159,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "ut på påfarten"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sin på %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sin på %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sin på %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sin på %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -216,12 +209,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "kör sedan ut ur rondellen mot %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Kör ut ur rondellen mot %1$s %2$s"
 
 msgid "soon"
 msgstr "snart"
@@ -230,7 +223,7 @@ msgid "now"
 msgstr "nu"
 
 msgid "then"
-msgstr ""
+msgstr "sedan"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -333,25 +326,25 @@ msgstr "efter %i vägar"
 #. 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 ""
+msgstr "Sväng %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "vänd sedan"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "Vänd %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "vänd sedan"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "Vänd %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -366,7 +359,7 @@ msgstr ""
 #. *
 #. 
 msgid "follow"
-msgstr ""
+msgstr "följ"
 
 msgid "then you have reached your destination."
 msgstr "sedan har du nått din destination."
@@ -378,10 +371,10 @@ msgstr "Du har nått din destination %s"
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
-msgstr ""
+msgstr "Korsning"
 
 msgid "Exit"
-msgstr ""
+msgstr "Avfart"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/sw.po.in b/po/sw.po.in
index 5b144296..fc3a30d7 100644
--- a/po/sw.po.in
+++ b/po/sw.po.in
@@ -4,13 +4,14 @@
 # Many thanks to the contributors of this translation:
 # HinzundKunz https://launchpad.net/~martin-tlustos
 # KaZeR https://launchpad.net/~kazer
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-08-08 23:15+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 04:00+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Swahili <sw@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -70,14 +71,6 @@ msgid "sixth exit"
 msgstr "exit ya sita"
 
 #, c-format
-msgid "%d m"
-msgstr "mita %d"
-
-#, c-format
-msgid "in %d m"
-msgstr "baada ya mita %d"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -86,14 +79,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "mita %d"
-
-#, c-format
-msgid "in %d meters"
-msgstr "baada ya mita %d"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -102,14 +87,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "kilomita %d.%d"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "baada ya kilomita %d.%d"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -122,6 +99,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "mita %d"
+
+#, c-format
+msgid "in %d meters"
+msgstr "baada ya mita %d"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "kilomita %d.%d"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "baada ya kilomita %d.%d"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "kilomita %d"
@@ -165,30 +158,30 @@ msgstr ""
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%skufuata %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%skufuata %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%skufuata %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%skufuata %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
 msgid "%sinto the %s"
-msgstr "%s kufuata %s"
+msgstr "%skufuata %s"
 
 msgid "When possible, please turn around"
-msgstr "geuka na kurudi nyuma inapowezekana"
+msgstr "Geuka na kurudi nyuma inapowezekana"
 
 #. TRANSLATORS: the argument is the destination to follow
 #, c-format
@@ -197,7 +190,7 @@ msgstr ""
 
 #, c-format
 msgid "Follow the road for the next %s"
-msgstr "buata barabara kwa %s"
+msgstr "Buata barabara kwa %s"
 
 msgid "Enter the roundabout soon"
 msgstr ""
@@ -210,12 +203,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "halafu toka kutoka kwenye kipilefti kwenye %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Toka kutoka kwenye kipilefti kwenye %1$s %2$s"
 
 msgid "soon"
 msgstr "karibuni"
@@ -224,7 +217,7 @@ msgid "now"
 msgstr "sasa"
 
 msgid "then"
-msgstr ""
+msgstr "halafu"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -327,7 +320,7 @@ msgstr "baada ya barabara %i"
 #. 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 ""
+msgstr "piga kona %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
@@ -375,7 +368,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Ondoka"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/ta.po.in b/po/ta.po.in
index ff7fbcac..945146c7 100644
--- a/po/ta.po.in
+++ b/po/ta.po.in
@@ -71,14 +71,6 @@ msgid "sixth exit"
 msgstr "ஐந்தாவது வெளியேற்றம்"
 
 #, c-format
-msgid "%d m"
-msgstr "%d நி"
-
-#, c-format
-msgid "in %d m"
-msgstr "%d நி.யில்"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -87,14 +79,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d மீட்டர்கள்"
-
-#, c-format
-msgid "in %d meters"
-msgstr "%d மீட்டருக்குள்"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -103,14 +87,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d கிலோமீட்டர்கள்."
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "%d.%d கிலோமீட்டருக்குள்"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -123,6 +99,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d மீட்டர்கள்"
+
+#, c-format
+msgid "in %d meters"
+msgstr "%d மீட்டருக்குள்"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d கிலோமீட்டர்கள்."
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "%d.%d கிலோமீட்டருக்குள்"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "ஒரு கிலோமீட்டர்"
diff --git a/po/te.po.in b/po/te.po.in
index 410255af..b2f92959 100644
--- a/po/te.po.in
+++ b/po/te.po.in
@@ -71,35 +71,39 @@ msgid "sixth exit"
 msgstr ""
 
 #, c-format
-msgid "%d m"
+msgid "%d feet"
 msgstr ""
 
 #, c-format
-msgid "in %d m"
+msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d feet"
+msgid "%d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "in %d feet"
+msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d మీటర్లు"
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "in %d meters"
-msgstr ""
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "%d.%d miles"
-msgstr ""
+msgid "%d meters"
+msgstr "%d మీటర్లు"
 
 #, c-format
-msgid "in %d.%d miles"
+msgid "in %d meters"
 msgstr ""
 
 #, c-format
@@ -111,18 +115,6 @@ msgid "in %d.%d kilometers"
 msgstr ""
 
 #, c-format
-msgid "one mile"
-msgid_plural "%d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
-msgid "in one mile"
-msgid_plural "in %d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "ఒక కిలోమీటరు"
diff --git a/po/th.po.in b/po/th.po.in
index 23f9bb55..e3aa8864 100644
--- a/po/th.po.in
+++ b/po/th.po.in
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-09-28 01:46+0000\n"
+"PO-Revision-Date: 2015-07-19 04:01+0000\n"
 "Last-Translator: mansv68 <mansv68@yahoo.co.th>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -70,14 +70,6 @@ msgid "sixth exit"
 msgstr ""
 
 #, c-format
-msgid "%d m"
-msgstr "%d เมตร"
-
-#, c-format
-msgid "in %d m"
-msgstr "อีก %d เมตร"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -86,14 +78,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d เมตร"
-
-#, c-format
-msgid "in %d meters"
-msgstr "อีก %d เมตร"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -102,14 +86,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr ""
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "อีก %d.%d กิโลเมตร"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -122,6 +98,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d เมตร"
+
+#, c-format
+msgid "in %d meters"
+msgstr "อีก %d เมตร"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "อีก %d.%d กิโลเมตร"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d กิโลเมตร"
@@ -163,22 +155,22 @@ msgstr ""
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sเข้าสู่ถนน %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sเข้าสู่ %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sเข้าสู %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sเข้าสู่ %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -373,7 +365,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "ทางออก"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/tr.po.in b/po/tr.po.in
index 9d2cba91..3d296574 100644
--- a/po/tr.po.in
+++ b/po/tr.po.in
@@ -7,6 +7,7 @@
 # Bawer Yekta https://launchpad.net/~e-peyam
 # Bekir DURAK https://launchpad.net/~bekir-durak
 # Koray Löker https://launchpad.net/~loker
+# Kudret EMRE https://launchpad.net/~kudretemre
 # ViZiT https://launchpad.net/~vizit
 # dentist76 https://launchpad.net/~pilatin
 # eMVP https://launchpad.net/~ercan-i
@@ -18,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-12-10 00:54+0000\n"
-"Last-Translator: seqizz (gurkanGur) <seqizz@gmail.com>\n"
+"PO-Revision-Date: 2015-07-19 04:01+0000\n"
+"Last-Translator: Kudret EMRE <kudretemre@hotmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,36 +81,40 @@ msgid "sixth exit"
 msgstr "altıncı çıkış"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
+msgid "%d feet"
+msgstr "%d feet"
 
 #, c-format
-msgid "in %d m"
-msgstr "%d m'de"
+msgid "in %d feet"
+msgstr "%d feet içinde"
 
 #, c-format
-msgid "%d feet"
-msgstr ""
+msgid "%d.%d miles"
+msgstr "%d.%d mil"
 
 #, c-format
-msgid "in %d feet"
-msgstr ""
+msgid "in %d.%d miles"
+msgstr "%d.%d mil içinde"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d metre"
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] "bir mil"
+msgstr[1] "%d mil"
 
 #, c-format
-msgid "in %d meters"
-msgstr "%d metrede"
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] "bir mil içinde"
+msgstr[1] "%d mil içinde"
 
 #, c-format
-msgid "%d.%d miles"
-msgstr ""
+msgid "%d meters"
+msgstr "%d metre"
 
 #, c-format
-msgid "in %d.%d miles"
-msgstr ""
+msgid "in %d meters"
+msgstr "%d metrede"
 
 #, c-format
 msgid "%d.%d kilometers"
@@ -120,18 +125,6 @@ msgid "in %d.%d kilometers"
 msgstr "%d.%d kilometrede"
 
 #, c-format
-msgid "one mile"
-msgid_plural "%d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
-msgid "in one mile"
-msgid_plural "in %d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d kilometre"
@@ -170,27 +163,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "rampada"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%scaddesine %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%scaddesine %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%scaddesine %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%scaddesine %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -220,12 +213,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "ardından %1$s'de kavşaktan çıkın %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "%1$s'de kavşaktan çıkın %2$s"
 
 msgid "soon"
 msgstr "yakında"
@@ -234,7 +227,7 @@ msgid "now"
 msgstr "şimdi"
 
 msgid "then"
-msgstr ""
+msgstr "sonra"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -257,7 +250,7 @@ msgid "Merge %1$s%2$s|left"
 msgstr ""
 
 msgid "on your left"
-msgstr ""
+msgstr "solunuzda"
 
 msgid "on your right"
 msgstr ""
@@ -274,10 +267,10 @@ msgstr ""
 
 #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
 msgid "at interchange"
-msgstr ""
+msgstr "kesişiminde"
 
 msgid "at exit"
-msgstr ""
+msgstr "çıkışta"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
@@ -337,7 +330,7 @@ msgstr "%i yol sonra"
 #. 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 ""
+msgstr "Dönüş %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
@@ -370,7 +363,7 @@ msgstr ""
 #. *
 #. 
 msgid "follow"
-msgstr ""
+msgstr "takip edin"
 
 msgid "then you have reached your destination."
 msgstr "ardından hedefinize ulaşacaksınız"
@@ -382,10 +375,10 @@ msgstr "Hedefinize ulaştınız, %s"
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
-msgstr ""
+msgstr "Kesişim"
 
 msgid "Exit"
-msgstr ""
+msgstr "Çıkış"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -985,7 +978,7 @@ msgstr "Letonya"
 
 #. 434
 msgid "Libya"
-msgstr ""
+msgstr "Libya"
 
 #. 504
 msgid "Morocco"
@@ -1273,7 +1266,7 @@ msgstr "Surinam"
 
 #. 728
 msgid "South Sudan"
-msgstr ""
+msgstr "Güney Sudan"
 
 #. 678
 msgid "Sao Tome and Principe"
@@ -1285,7 +1278,7 @@ msgstr "El Salvador"
 
 #. 534
 msgid "Sint Maarten (Dutch part)"
-msgstr ""
+msgstr "Sint Maarten (Hollanda bölümü)"
 
 #. 760
 msgid "Syrian Arab Republic"
@@ -1453,10 +1446,20 @@ msgid ""
 "\t-h: print this usage info and exit.\n"
 "\t-v: print the version and exit.\n"
 msgstr ""
+"navit kullanımı:\n"
+"navit [seçenekler] [yapılandırma dosyası]\n"
+"\t-c <dosya>: <dosya> argümanını varsayılan dosyayı kullanmak yerine "
+"yapılandırma dosyası olarak kullanabilirsiniz.\n"
+"\t-d <n>: hata ayıklama seviyesini ayarlayın <n> (0=hata, 1=uyarı, 2=bilgi, "
+"3=hata ayıklama).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
+"\t-h: bu kullanım bilgisini göster ve çık.\n"
+"\t-v: sürümü göster ve çık.\n"
 
 #. We have not found an existing config file from all possibilities
 msgid "No config file navit.xml, navit.xml.local found\n"
-msgstr ""
+msgstr "Hiçbir navit.xml, navit.xml.locak yapılandırma dosyası bulunamadı\n"
 
 #, c-format
 msgid "Error parsing config file '%s': %s\n"
@@ -1464,22 +1467,22 @@ msgstr ""
 
 #, c-format
 msgid "Using config file '%s'\n"
-msgstr ""
+msgstr "'%s' yapılandırma dosyası kullanılıyor\n"
 
 #, c-format
 msgid "Error: No configuration found in config file '%s'\n"
-msgstr ""
+msgstr "Hata: '%s' yapılandırma dosyasında hiçbir yapılandırma bulunamadı\n"
 
 msgid ""
 "Internal initialization failed, exiting. Check previous error messages.\n"
 msgstr ""
 
 msgid "unknown street"
-msgstr ""
+msgstr "bilinmeyen sokak"
 
 #. Safe cast: attr_generic_set_attr does not modify its parameter.
 msgid "Unnamed vehicle"
-msgstr ""
+msgstr "İsimsiz araç"
 
 msgid "Failed to write bookmarks file"
 msgstr ""
@@ -1589,10 +1592,10 @@ msgid "Opens address search dialog"
 msgstr "Adres aramayı açar"
 
 msgid "_POI search"
-msgstr ""
+msgstr "_POI arama"
 
 msgid "Opens POI search dialog"
-msgstr ""
+msgstr "POI arama penceresini açar"
 
 msgid "_Stop Navigation"
 msgstr "Dolaşmayı Durdur"
@@ -1628,7 +1631,7 @@ msgid "_Autozoom"
 msgstr "Oto-yaklaş"
 
 msgid "Enable/disable automatic zoom level changing"
-msgstr ""
+msgstr "Otomatik yakınlaştırmayı açar/kapatır"
 
 msgid "_Fullscreen"
 msgstr "Tam Ekran"
@@ -1637,95 +1640,95 @@ msgid "Data"
 msgstr "Veri"
 
 msgid "Pharmacy"
-msgstr ""
+msgstr "Eczane"
 
 msgid "Restaurant"
-msgstr ""
+msgstr "Restoran"
 
 msgid "Restaurant. Fast food"
-msgstr ""
+msgstr "Restoran. Hazır gıda"
 
 msgid "Hotel"
-msgstr ""
+msgstr "Otel"
 
 msgid "Car parking"
-msgstr ""
+msgstr "Otopark"
 
 msgid "Fuel station"
-msgstr ""
+msgstr "Akaryakıt istasyonu"
 
 msgid "Bank"
-msgstr ""
+msgstr "Banka"
 
 msgid "Hospital"
-msgstr ""
+msgstr "Hastane"
 
 msgid "Cinema"
-msgstr ""
+msgstr "Sinema"
 
 msgid "Train station"
-msgstr ""
+msgstr "Tren istasyonu"
 
 msgid "School"
-msgstr ""
+msgstr "Okul"
 
 msgid "Police"
-msgstr ""
+msgstr "Polis"
 
 msgid "Justice"
-msgstr ""
+msgstr "Adaley Sarayı"
 
 msgid "Taxi"
-msgstr ""
+msgstr "Taksi"
 
 msgid "Shopping"
-msgstr ""
+msgstr "Alışveriş"
 
 msgid "Distance from screen center (km)"
 msgstr ""
 
 #, c-format
 msgid "POI %s. %s"
-msgstr ""
+msgstr "POI %s. %s"
 
 #, c-format
 msgid "Set destination to %ld, %ld \n"
-msgstr ""
+msgstr "Hedefi buraya ayarla %ld, %ld \n"
 
 #, c-format
 msgid "Set map to %ld, %ld \n"
-msgstr ""
+msgstr "Haritayı buraya ayarla %ld, %ld \n"
 
 #, c-format
 msgid "Set next visit to %ld, %ld \n"
 msgstr ""
 
 msgid "POI search"
-msgstr ""
+msgstr "POI arama"
 
 msgid "Select a category"
-msgstr ""
+msgstr "Bir kategori seç"
 
 msgid "Select a distance to look for (km)"
 msgstr ""
 
 msgid "Select a POI"
-msgstr ""
+msgstr "Bir POI se."
 
 msgid " "
-msgstr ""
+msgstr " "
 
 msgid "Category"
-msgstr ""
+msgstr "Kategori"
 
 msgid "Direction"
-msgstr ""
+msgstr "Yön"
 
 msgid "Distance(m)"
-msgstr ""
+msgstr "Mesafe(m)"
 
 msgid "Name"
-msgstr ""
+msgstr "İsim"
 
 msgid "Visit Before"
 msgstr ""
@@ -1810,10 +1813,10 @@ msgid "View on map"
 msgstr "Haritada bak"
 
 msgid "Remove search results from the map"
-msgstr ""
+msgstr "Arama sonuçlarını haritadan sil"
 
 msgid "Show results on the map"
-msgstr ""
+msgstr "Sonuçları haritada göster"
 
 msgid "Cut Bookmark"
 msgstr "Yer İmini Kes"
@@ -1846,7 +1849,7 @@ msgid "Replace with waypoints"
 msgstr ""
 
 msgid "Delete Folder"
-msgstr ""
+msgstr "Dizini Sil"
 
 #. Adds the Bookmark folders
 msgid "Add Bookmark folder"
@@ -1862,16 +1865,16 @@ msgstr "Yerimi ata %s"
 
 #, c-format
 msgid "Download %s"
-msgstr ""
+msgstr "%s İndir"
 
 msgid "Map Download"
-msgstr ""
+msgstr "Harita İndirme"
 
 msgid "Active"
-msgstr ""
+msgstr "Etkin"
 
 msgid "Download Enabled"
-msgstr ""
+msgstr "İndirme Etkinleştirildi"
 
 msgid "Download completely"
 msgstr ""
@@ -1938,7 +1941,7 @@ msgid "Waypoints"
 msgstr ""
 
 msgid "Enter Coordinates"
-msgstr ""
+msgstr "Koordinat Gir"
 
 #. 
 #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
@@ -1947,10 +1950,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 "Enlem Boylam"
 
 msgid "Enter coordinates, for example:"
-msgstr ""
+msgstr "Koordinat gir, örneğin:"
 
 msgid "Vehicle"
 msgstr "Araç"
@@ -2007,28 +2010,28 @@ msgid "House number"
 msgstr "Ev no:"
 
 msgid "Next"
-msgstr ""
+msgstr "İleri"
 
 msgid "Prev"
-msgstr ""
+msgstr "Geri"
 
 msgid "Return to route!"
-msgstr ""
+msgstr "Rotaya dön!"
 
 #. warning told
 msgid "Look out! Camera!"
-msgstr ""
+msgstr "Dikkat! Kamera!"
 
 #. warning told
 msgid "Please decrease your speed"
-msgstr ""
+msgstr "Lütfen hızınızı düşürünüz"
 
 msgid "partial match"
 msgstr ""
 
 #. Android resource: @strings/address_search_button
 msgid "Search"
-msgstr ""
+msgstr "Ara"
 
 #. Android resource: @strings/address_search_towns
 msgid "Towns"
@@ -2039,16 +2042,19 @@ msgid "Route to here"
 msgstr ""
 
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
-msgstr ""
+msgstr "Harita verisi (c) OpenStreetMap destekçileri, ODBL"
 
 msgid ""
 "Current map location %s is not available\n"
 "Please restart Navit after you attach an SD card or select a different map "
 "location."
 msgstr ""
+"Geçerli harita konumu %s kullanılabilir değil\n"
+"Lütfen bir SD kart taktıktan sonra Navit'i yeniden başlatın veya başka bir "
+"harita konumu seçin."
 
 msgid "Downloaded maps"
-msgstr ""
+msgstr "İndirilen haritalar"
 
 msgid ""
 "Sorry, we currently do not support maps above 3.8G on Android, please select "
@@ -2056,7 +2062,7 @@ msgid ""
 msgstr ""
 
 msgid "Cancel"
-msgstr ""
+msgstr "İptal"
 
 msgid "filenamePath"
 msgstr ""
@@ -2067,82 +2073,82 @@ msgid ""
 msgstr ""
 
 msgid "Whole Planet"
-msgstr ""
+msgstr "Tüm Dünya"
 
 msgid "Africa"
-msgstr ""
+msgstr "Afrika"
 
 msgid "Canary Islands"
-msgstr ""
+msgstr "Kanarya Adaları"
 
 msgid "Asia"
-msgstr ""
+msgstr "Asya"
 
 msgid "Korea"
-msgstr ""
+msgstr "Kore"
 
 msgid "Taiwan"
-msgstr ""
+msgstr "Tayvan"
 
 msgid "UAE+Other"
-msgstr ""
+msgstr "UAE+Diğer"
 
 msgid "Oceania"
-msgstr ""
+msgstr "Okyanusya"
 
 msgid "Tasmania"
-msgstr ""
+msgstr "Tazmanya"
 
 msgid "Victoria"
-msgstr ""
+msgstr "Viktoria"
 
 msgid "New South Wales"
-msgstr ""
+msgstr "Yeni Güney Galler"
 
 msgid "Europe"
-msgstr ""
+msgstr "Avrupa"
 
 msgid "Western Europe"
-msgstr ""
+msgstr "Batı Avrupa"
 
 msgid "Azores"
-msgstr ""
+msgstr "Azorlar"
 
 msgid "BeNeLux"
-msgstr ""
+msgstr "BeNeLux"
 
 msgid "Alsace"
-msgstr ""
+msgstr "Alsas"
 
 msgid "Aquitaine"
-msgstr ""
+msgstr "Akitanya"
 
 msgid "Auvergne"
 msgstr ""
 
 msgid "Basse-Normandie"
-msgstr ""
+msgstr "Aşağı Normandiya"
 
 msgid "Bourgogne"
-msgstr ""
+msgstr "Burgonya"
 
 msgid "Bretagne"
-msgstr ""
+msgstr "Britanya"
 
 msgid "Centre"
-msgstr ""
+msgstr "Merkez"
 
 msgid "Champagne-Ardenne"
 msgstr ""
 
 msgid "Corse"
-msgstr ""
+msgstr "Korsika"
 
 msgid "Franche-Comte"
 msgstr ""
 
 msgid "Haute-Normandie"
-msgstr ""
+msgstr "Yukarı Normandiya"
 
 msgid "Ile-de-France"
 msgstr ""
@@ -2187,10 +2193,10 @@ msgid "Mittelfranken"
 msgstr ""
 
 msgid "Niederbayern"
-msgstr ""
+msgstr "Aşağı Bavyera"
 
 msgid "Oberbayern"
-msgstr ""
+msgstr "Yukarı Bavyera"
 
 msgid "Oberfranken"
 msgstr ""
@@ -2205,28 +2211,28 @@ msgid "Unterfranken"
 msgstr ""
 
 msgid "Berlin"
-msgstr ""
+msgstr "Berlin"
 
 msgid "Brandenburg"
 msgstr ""
 
 msgid "Bremen"
-msgstr ""
+msgstr "Bremen"
 
 msgid "Hamburg"
-msgstr ""
+msgstr "Hamburg"
 
 msgid "Hessen"
-msgstr ""
+msgstr "Hesse"
 
 msgid "Mecklenburg-Vorpommern"
 msgstr ""
 
 msgid "Niedersachsen"
-msgstr ""
+msgstr "Aşağı Saksonya"
 
 msgid "Nordrhein-westfalen"
-msgstr ""
+msgstr "Kuzey Ren-Vestfalya"
 
 msgid "Rheinland-Pfalz"
 msgstr ""
@@ -2238,7 +2244,7 @@ msgid "Sachsen-Anhalt"
 msgstr ""
 
 msgid "Sachsen"
-msgstr ""
+msgstr "Saksonya"
 
 msgid "Schleswig-Holstein"
 msgstr ""
@@ -2250,13 +2256,13 @@ msgid "Mallorca"
 msgstr ""
 
 msgid "Galicia"
-msgstr ""
+msgstr "Galiçya"
 
 msgid "Scandinavia"
-msgstr ""
+msgstr "İskandinavya"
 
 msgid "England"
-msgstr ""
+msgstr "İngiltere"
 
 msgid "Buckinghamshire"
 msgstr ""
@@ -2313,28 +2319,28 @@ msgid "Wiltshire"
 msgstr ""
 
 msgid "Scotland"
-msgstr ""
+msgstr "İskoçya"
 
 msgid "Wales"
-msgstr ""
+msgstr "Galler"
 
 msgid "Crete"
 msgstr ""
 
 msgid "North America"
-msgstr ""
+msgstr "Kuzey Amerika"
 
 msgid "Alaska"
-msgstr ""
+msgstr "Alaska"
 
 msgid "Hawaii"
-msgstr ""
+msgstr "Hawaii"
 
 msgid "USA"
-msgstr ""
+msgstr "ABD"
 
 msgid " (except Alaska and Hawaii)"
-msgstr ""
+msgstr " (Alaska ve Hawaii hariç)"
 
 msgid "Midwest"
 msgstr ""
@@ -2346,7 +2352,7 @@ msgid "Ohio"
 msgstr ""
 
 msgid "Northeast"
-msgstr ""
+msgstr "Kuzeydoğu"
 
 msgid "Massachusetts"
 msgstr ""
@@ -2358,7 +2364,7 @@ msgid "Pacific"
 msgstr ""
 
 msgid "South"
-msgstr ""
+msgstr "Güney"
 
 msgid "Arkansas"
 msgstr ""
@@ -2382,25 +2388,25 @@ msgid "Oklahoma"
 msgstr ""
 
 msgid "Texas"
-msgstr ""
+msgstr "Teksas"
 
 msgid "Virginia"
-msgstr ""
+msgstr "Virjinya"
 
 msgid "West Virginia"
-msgstr ""
+msgstr "Batı Virjinya"
 
 msgid "West"
-msgstr ""
+msgstr "Batı"
 
 msgid "Arizona"
 msgstr ""
 
 msgid "California"
-msgstr ""
+msgstr "Kaliforniya"
 
 msgid "Colorado"
-msgstr ""
+msgstr "Kolorado"
 
 msgid "Idaho"
 msgstr ""
@@ -2424,41 +2430,41 @@ msgid "Washington State"
 msgstr ""
 
 msgid "South+Middle America"
-msgstr ""
+msgstr "Güney+Orta Amerika"
 
 msgid "Guyane Francaise"
 msgstr ""
 
 msgid "downloading"
-msgstr ""
+msgstr "indiriliyor"
 
 #. Android resource: @strings/map_download_ready
 msgid "ready"
-msgstr ""
+msgstr "hazır"
 
 msgid "Media selected for map storage is not available"
-msgstr ""
+msgstr "Harita saklama için seçilen ortam kullanılabilir değil"
 
 #. Android resource: @strings/map_download_not_enough_free_space
 msgid "Not enough free space"
-msgstr ""
+msgstr "Yeterli boş alan yok"
 
 msgid "Error downloading map!"
-msgstr ""
+msgstr "Harita indirirken hata oluştu!"
 
 msgid "Error writing map!"
-msgstr ""
+msgstr "Harita yazılırken hata oluştu!"
 
 msgid "Map download aborted!"
-msgstr ""
+msgstr "Harita indirmesi iptal edildi!"
 
 #. Android resource: @strings/map_download_eta
 msgid "ETA"
-msgstr ""
+msgstr "Kalan Süre"
 
 #. Android resource: @strings/map_download_title
 msgid "Map download"
-msgstr ""
+msgstr "Harita indirme"
 
 msgid "Vehicle Position"
 msgstr "Araç Konumu"
@@ -2495,7 +2501,7 @@ msgid ""
 msgstr ""
 
 msgid "Coordinates"
-msgstr ""
+msgstr "Koordinatlar"
 
 msgid ""
 "Stop\n"
@@ -2527,10 +2533,10 @@ msgid ""
 msgstr ""
 
 msgid "Satellite Status"
-msgstr ""
+msgstr "Uydu Durumu"
 
 msgid "NMEA Data"
-msgstr ""
+msgstr "NMEA Verisi"
 
 msgid "car_shortest"
 msgstr ""
@@ -2545,24 +2551,24 @@ msgid "horse"
 msgstr "at"
 
 msgid "Truck"
-msgstr ""
+msgstr "Kamyon"
 
 #. Strings from android/res/values/strings.xml
 #. Android resource: @strings/yes
 msgid "Yes"
-msgstr ""
+msgstr "Evet"
 
 #. Android resource: @strings/notification_ticker
 msgid "Navit started"
-msgstr ""
+msgstr "Navit başladı"
 
 #. Android resource: @strings/notification_event_default
 msgid "Navit running"
-msgstr ""
+msgstr "Navit çalışıyor"
 
 #. Android resource: @strings/initial_info_box_title
 msgid "Welcome to Navit"
-msgstr ""
+msgstr "Navit'e Hoşgeldiniz"
 
 #. Android resource: @strings/initial_info_box_message
 msgid ""
@@ -2575,26 +2581,34 @@ msgid ""
 "\n"
 "Enjoy Navit!"
 msgstr ""
+"Navit'i yüklediğiniz için teşekkürler!\n"
+"\n"
+"Başlamak için menüden \"Harita indir\"i seçin. Not: Harita dosya boyutu "
+"büyük olabilir (>50MB) - kablosuz bağlantı önerilir.\n"
+"\n"
+"Harita verisi: (c) OpenStreetMap destekçileri\n"
+"\n"
+"Navit keyfini çıkarın!"
 
 #. Android resource: @strings/initial_info_box_OK
 msgid "OK"
-msgstr ""
+msgstr "Tamam"
 
 #. Android resource: @strings/initial_info_box_more_info
 msgid "More info"
-msgstr ""
+msgstr "Daha fazla bilgi"
 
 #. Android resource: @strings/optionsmenu_zoom_in
 msgid "Zoom in"
-msgstr ""
+msgstr "Yaklaştır"
 
 #. Android resource: @strings/optionsmenu_zoom_out
 msgid "Zoom out"
-msgstr ""
+msgstr "Uzaklaştır"
 
 #. Android resource: @strings/optionsmenu_download_maps
 msgid "Download maps"
-msgstr ""
+msgstr "Harita indir"
 
 #. Android resource: @strings/optionsmenu_toggle_poi
 msgid "Toggle POIs"
@@ -2602,47 +2616,47 @@ msgstr ""
 
 #. Android resource: @strings/optionsmenu_exit_navit
 msgid "Exit Navit"
-msgstr ""
+msgstr "Navit'ten Çık"
 
 #. Android resource: @strings/optionsmenu_backup_restore
 msgid "Backup / Restore"
-msgstr ""
+msgstr "Yedekle / Geri Yükle"
 
 #. Android resource: @strings/optionsmenu_set_map_location
 msgid "Set map location"
-msgstr ""
+msgstr "Harita konumunu ayarla"
 
 #. Android resource: @strings/map_delete
 msgid "Delete this map?"
-msgstr ""
+msgstr "Bu harita silinsin mi?"
 
 #. Android resource: @strings/map_download_downloading
 msgid "Downloading:"
-msgstr ""
+msgstr "İndiriliyor:"
 
 #. Android resource: @strings/map_download_download_error
 msgid "Error downloading map."
-msgstr ""
+msgstr "Harita indirilirken hata oluştu."
 
 #. Android resource: @strings/map_download_download_aborted
 msgid "Map download aborted"
-msgstr ""
+msgstr "Harita indirmesi iptal edildi"
 
 #. Android resource: @strings/map_no_fix
 msgid "No location. Reopen after location fix."
-msgstr ""
+msgstr "Konum yok. Konum alındıktan sonra tekrar açın."
 
 #. Android resource: @strings/maps_for_current_location
 msgid "Maps containing current location"
-msgstr ""
+msgstr "Geçerli konumu içeren haritalar"
 
 #. Android resource: @strings/address_search_title
 msgid "Address search"
-msgstr ""
+msgstr "Adres arama"
 
 #. Android resource: @strings/address_enter_destination
 msgid "Enter destination"
-msgstr ""
+msgstr "Hedef girin"
 
 #. Android resource: @strings/address_partial_match
 msgid "Match partial address"
@@ -2650,89 +2664,91 @@ msgstr ""
 
 #. Android resource: @strings/address_search_searching
 msgid "Searching..."
-msgstr ""
+msgstr "Arıyor..."
 
 #. Android resource: @strings/address_search_not_found
 msgid "Address not found"
-msgstr ""
+msgstr "Adres bulunamadı"
 
 #. Android resource: @strings/address_search_getting_results
 msgid "Getting search results"
-msgstr ""
+msgstr "Arama sonuçları alınıyor"
 
 #. Android resource: @strings/address_search_loading_results
 msgid "Loading search results"
-msgstr ""
+msgstr "Arama sonuçları yükleniyor"
 
 #. Android resource: @strings/address_search_no_results
 msgid "No results found"
-msgstr ""
+msgstr "Hiçbir sonuç bulunamadı"
 
 #. Android resource: @strings/address_search_no_text_entered
 msgid "No text entered"
-msgstr ""
+msgstr "Hiçbir metin girilmedi"
 
 #. Android resource: @strings/address_search_set_destination
 msgid "Setting destination to:"
-msgstr ""
+msgstr "Hedef buraya ayarlanıyor:"
 
 #. Android resource: @strings/choose_an_action
 msgid "Choose an action"
-msgstr ""
+msgstr "Bir eylem seçin"
 
 #. Android resource: @strings/please_insert_an_sd_card
 msgid "Please insert an SD Card"
-msgstr ""
+msgstr "Lütfen bir SD Kart takın"
 
 #. Android resource: @strings/backing_up
 msgid "Backing up..."
-msgstr ""
+msgstr "Yedekleniyor..."
 
 #. Android resource: @strings/restoring
 msgid "Restoring..."
-msgstr ""
+msgstr "Geri yükleniyor..."
 
 #. Android resource: @strings/failed_to_create_backup_directory
 msgid "Failed to create backup directory"
-msgstr ""
+msgstr "Yedekleme dizini oluşturulamadı"
 
 #. Android resource: @strings/backup_failed
 msgid "Backup failed"
-msgstr ""
+msgstr "Yedekleme başarısız"
 
 #. Android resource: @strings/no_backup_found
 msgid "No backup found"
-msgstr ""
+msgstr "Hiçbir yedek bulunamadı"
 
 #. Android resource: @strings/failed_to_restore
 msgid "Failed to restore"
-msgstr ""
+msgstr "Geri yükleme başarısız"
 
 #. Android resource: @strings/backup_successful
 msgid "Backup successful"
-msgstr ""
+msgstr "Yedekleme başarılı"
 
 #. Android resource: @strings/restore_successful_please_restart_navit
 msgid ""
 "Restore Successful\n"
 "Please restart Navit"
 msgstr ""
+"Geri yükleme başarılı\n"
+"Lütfen Navit'i yeniden başlatın"
 
 #. Android resource: @strings/backup_not_found
 msgid "Backup not found"
-msgstr ""
+msgstr "Yedek bulunamadı"
 
 #. Android resource: @strings/restore_failed
 msgid "Restore failed"
-msgstr ""
+msgstr "Geri yükleme başarısız"
 
 #. Android resource: @strings/select_backup
 msgid "Select backup"
-msgstr ""
+msgstr "Yedek seçin"
 
 #. Android resource: @strings/backup
 msgid "Backup"
-msgstr ""
+msgstr "Yedekle"
 
 #. Android resource: @strings/restore
 msgid "Restore"
diff --git a/po/uk.po.in b/po/uk.po.in
index e7872870..03346baf 100644
--- a/po/uk.po.in
+++ b/po/uk.po.in
@@ -4,6 +4,7 @@
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
 # Knedlyk https://launchpad.net/~yupadmin
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # andygol https://launchpad.net/~andygol
 # serg_stetsuk https://launchpad.net/~serg-stetsuk
 
@@ -11,8 +12,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: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 04:01+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -74,14 +75,6 @@ msgid "sixth exit"
 msgstr "шостий виїзд"
 
 #, c-format
-msgid "%d m"
-msgstr "%d м"
-
-#, c-format
-msgid "in %d m"
-msgstr "за %d м"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -90,14 +83,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d метрів"
-
-#, c-format
-msgid "in %d meters"
-msgstr "за %d метрів"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -106,14 +91,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d кілометрів"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "за %d.%d кілометрів"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -126,6 +103,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d метрів"
+
+#, c-format
+msgid "in %d meters"
+msgstr "за %d метрів"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d кілометрів"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "за %d.%d кілометрів"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d кілометр"
@@ -166,32 +159,32 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "з'їзд на"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sна %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sна %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sна %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sна %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
 msgid "%sinto the %s"
-msgstr "%s в %s"
+msgstr "%sв %s"
 
 msgid "When possible, please turn around"
 msgstr "Якщо це можливо, то розверніться"
@@ -216,12 +209,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "тоді виїдьте з кільця через %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Виїдьте з кільця через %1$s %2$s"
 
 msgid "soon"
 msgstr "скоро"
@@ -230,7 +223,7 @@ msgid "now"
 msgstr "зараз"
 
 msgid "then"
-msgstr ""
+msgstr "тоді"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -333,25 +326,25 @@ msgstr "після %i дороги"
 #. 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 ""
+msgstr "Поверніть на %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "тоді то розверніться"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|left"
-msgstr ""
+msgstr "То розверніться %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "тоді то розверніться"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Make a U-turn %1$s|right"
-msgstr ""
+msgstr "То розверніться %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -378,10 +371,10 @@ msgstr "Ви досягли місця призначення %s"
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
-msgstr ""
+msgstr "Розв'язка"
 
 msgid "Exit"
-msgstr ""
+msgstr "Виїзд"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/ur.po.in b/po/ur.po.in
index 3c776077..bc0820df 100644
--- a/po/ur.po.in
+++ b/po/ur.po.in
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # asghar https://launchpad.net/~asghar144
 
 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"
+"PO-Revision-Date: 2015-07-19 04:01+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Urdu <ur@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,10 +64,6 @@ msgid "sixth exit"
 msgstr "چھٹا اخراج"
 
 #, c-format
-msgid "%d m"
-msgstr "%d میٹر"
-
-#, c-format
 msgid "%d meters"
 msgstr "%d میٹر"
 
@@ -134,10 +131,6 @@ msgid "zeroth"
 msgstr "صفر سے"
 
 #, c-format
-msgid "in %d m"
-msgstr "%d میٹر میں"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -204,27 +197,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "ڈھلان میں"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sمیں سے %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%sمیں سے %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%sمیں سے %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%sمیں سے %s%s%s"
 
 #. TRANSLATORS: the argument is the destination to follow
 #, c-format
@@ -246,12 +239,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "پھر گول چوراہے کو  %1$s %2$s پے چھوڑ دیں"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "گول چوراہے کو %1$s %2$s پے چھوڑ دیں"
 
 msgid "soon"
 msgstr "جلد ہی"
@@ -347,7 +340,7 @@ msgstr "%i سڑکوں کے بعد"
 #. 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 ""
+msgstr "%1$s%2$s %3$s%4$s گومیں"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
@@ -395,7 +388,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "اخراج"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/vi.po.in b/po/vi.po.in
index b36d2b63..28c14a28 100644
--- a/po/vi.po.in
+++ b/po/vi.po.in
@@ -4,14 +4,15 @@
 # Many thanks to the contributors of this translation:
 # Hoàng Đỗ Can Trực https://launchpad.net/~truc294
 # Le Viet Thanh https://launchpad.net/~lethanhx2k
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Saki https://launchpad.net/~nhkhoi
 
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-09-28 01:43+0000\n"
-"Last-Translator: Nguyễn Hào Khôi <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 04:01+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -72,14 +73,6 @@ msgid "sixth exit"
 msgstr "Thoát thứ 6"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "trong %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -88,14 +81,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d mét"
-
-#, c-format
-msgid "in %d meters"
-msgstr "trong %d mét"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -104,14 +89,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d cây số"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "trong %d.%d km"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -124,6 +101,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d mét"
+
+#, c-format
+msgid "in %d meters"
+msgstr "trong %d mét"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d cây số"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "trong %d.%d km"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d km"
@@ -160,27 +153,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "vào dốc"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%svào %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%svào %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%svào %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%svào %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -210,12 +203,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "sau đó ra khỏi đường vòng tại %1$s %2$s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "Ra khỏi đường vòng tại %1$s %2$s"
 
 msgid "soon"
 msgstr "ngay"
@@ -224,7 +217,7 @@ msgid "now"
 msgstr "bây giờ"
 
 msgid "then"
-msgstr ""
+msgstr "sau đó"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -327,7 +320,7 @@ msgstr "sau %i đường"
 #. 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 ""
+msgstr "Rẽ %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
@@ -375,7 +368,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Thoát"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/zh_CN.po.in b/po/zh_CN.po.in
index c10e6d39..4c3d2efa 100644
--- a/po/zh_CN.po.in
+++ b/po/zh_CN.po.in
@@ -14,14 +14,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-09-28 01:46+0000\n"
+"PO-Revision-Date: 2015-07-19 04:01+0000\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"Language: \n"
+"Language: zh_CN\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -76,14 +76,6 @@ msgid "sixth exit"
 msgstr "第六个退出"
 
 #, c-format
-msgid "%d m"
-msgstr "%d米"
-
-#, c-format
-msgid "in %d m"
-msgstr "距离%d米"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -92,14 +84,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d米"
-
-#, c-format
-msgid "in %d meters"
-msgstr "距离%d米"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -108,14 +92,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d千米"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "距离%d.%d千米"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -128,6 +104,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d米"
+
+#, c-format
+msgid "in %d meters"
+msgstr "距离%d米"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d千米"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "距离%d.%d千米"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d千米"
@@ -164,32 +156,32 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "进入坡道"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%s到达 %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%s到达 %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%s到达 %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%s到达 %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
 msgid "%sinto the %s"
-msgstr "%s 到达 %s"
+msgstr "%s到达 %s"
 
 msgid "When possible, please turn around"
 msgstr "当遇到路口的时候，请转弯"
@@ -214,12 +206,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "然后在%1$s %2$s处驶出环形区"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "还有%1$s %2$s就将驶离环形区"
 
 msgid "soon"
 msgstr "不久"
@@ -228,7 +220,7 @@ msgid "now"
 msgstr "现在"
 
 msgid "then"
-msgstr ""
+msgstr "然后"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -331,7 +323,7 @@ msgstr "之后有 %i 条道路"
 #. 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 ""
+msgstr "转向 %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
@@ -376,10 +368,10 @@ msgstr "您已经抵达您的目的地 %s"
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
-msgstr ""
+msgstr "交流道"
 
 msgid "Exit"
-msgstr ""
+msgstr "退出"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
diff --git a/po/zh_HK.po.in b/po/zh_HK.po.in
index f7f7b896..d1d6eba1 100644
--- a/po/zh_HK.po.in
+++ b/po/zh_HK.po.in
@@ -4,14 +4,15 @@
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
 # Kyle https://launchpad.net/~kylelover
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Walter Cheuk https://launchpad.net/~wwycheuk
 
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-09-28 01:45+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 04:01+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -72,14 +73,6 @@ msgid "sixth exit"
 msgstr "第六個出口"
 
 #, c-format
-msgid "%d m"
-msgstr "%d 米"
-
-#, c-format
-msgid "in %d m"
-msgstr "在 %d 米內"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -88,14 +81,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d 米"
-
-#, c-format
-msgid "in %d meters"
-msgstr "在 %d 米內"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -104,14 +89,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d 千米"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "在 %d.%d 千米內"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -124,6 +101,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d 米"
+
+#, c-format
+msgid "in %d meters"
+msgstr "在 %d 米內"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d 千米"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "在 %d.%d 千米內"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d 千米"
@@ -160,27 +153,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "進入斜路"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%s進入 %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%s進入 %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%s進入 %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%s進入 %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -210,12 +203,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "然後在 %1$s %2$s 離開迴旋處"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "在 %1$s %2$s 離開迴旋處"
 
 msgid "soon"
 msgstr "即將"
@@ -224,7 +217,7 @@ msgid "now"
 msgstr "現在"
 
 msgid "then"
-msgstr ""
+msgstr "然後"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -327,7 +320,7 @@ msgstr "%i 條路之後"
 #. 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 ""
+msgstr "%1$s转向%2$s %3$s至%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
@@ -375,7 +368,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "退出"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"